http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
index e239353..11afcf9 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
@@ -41,12 +41,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -185,6 +189,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testObjectArgument() throws Exception {
         testKeyQuery(OBJECT_CACHE, new TestKey(1), new TestKey(2));
     }
@@ -192,6 +197,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPrimitiveObjectArgument() throws Exception {
         testKeyValQuery(PRIM_CACHE, 1, 2);
     }
@@ -199,6 +205,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStringObjectArgument() throws Exception {
         testKeyValQuery(STR_CACHE, "str1", "str2");
     }
@@ -206,6 +213,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEnumObjectArgument() throws Exception {
        testKeyValQuery(ENUM_CACHE, EnumKey.KEY1, EnumKey.KEY2);
     }
@@ -213,6 +221,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUuidObjectArgument() throws Exception {
         final UUID uuid1 = UUID.randomUUID();
         UUID uuid2 = UUID.randomUUID();
@@ -226,6 +235,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDateObjectArgument() throws Exception {
         testKeyValQuery(DATE_CACHE, new Date(0), new Date(1));
     }
@@ -233,6 +243,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTimestampArgument() throws Exception {
         testKeyValQuery(TIMESTAMP_CACHE, new Timestamp(0), new Timestamp(1));
     }
@@ -241,6 +252,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBigDecimalArgument() throws Exception {
         final ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
@@ -353,6 +365,7 @@ public class IgniteBinaryObjectQueryArgumentsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFieldSearch() throws Exception {
         final IgniteCache<Integer, SearchValue> cache = 
ignite(0).cache(FIELD_CACHE);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java
index bff725c..8313e74 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryWrappedObjectFieldsQuerySelfTest.java
@@ -23,7 +23,7 @@ package org.apache.ignite.internal.processors.cache;
 public class
 IgniteBinaryWrappedObjectFieldsQuerySelfTest extends 
IgniteBinaryObjectFieldsQuerySelfTest {
     /** {@inheritDoc} */
-    protected String getPersonClassName() {
+    @Override protected String getPersonClassName() {
         return "org.apache.ignite.tests.p2p.cache.PersonWrapper$Person";
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index dbae093..ceb6e12 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -61,6 +61,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -69,6 +72,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  * Tests for fields queries.
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends 
GridCommonAbstractTest {
     /** IP finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -221,6 +225,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     protected abstract int gridCount();
 
     /** @throws Exception If failed. */
+    @Test
     public void testCacheMetaData() throws Exception {
         // Put internal key to test filtering of internal objects.
 
@@ -364,6 +369,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     /**
      *
      */
+    @Test
     public void testExplain() {
         List<List<?>> res = 
grid(0).cache(personCache.getName()).query(sqlFieldsQuery(
             String.format("explain select p.age, p.name, o.name " +
@@ -384,6 +390,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
 
     /** @throws Exception If failed. */
     @SuppressWarnings("unchecked")
+    @Test
     public void testExecuteWithMetaDataAndPrecision() throws Exception {
         QueryEntity qeWithPrecision = new QueryEntity()
             .setKeyType("java.lang.Long")
@@ -422,6 +429,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
         }
     }
 
+    @Test
     public void testExecuteWithMetaDataAndCustomKeyPrecision() throws 
Exception {
         QueryEntity qeWithPrecision = new QueryEntity()
             .setKeyType("java.lang.String")
@@ -479,6 +487,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testExecuteWithMetaData() throws Exception {
         QueryCursorImpl<List<?>> cursor = 
(QueryCursorImpl<List<?>>)personCache.query(sqlFieldsQuery(
             String.format("select p._KEY, p.name, p.age, o.name " +
@@ -579,11 +588,13 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testExecute() throws Exception {
         doTestExecute(personCache, sqlFieldsQuery("select _KEY, name, age from 
Person"));
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testExecuteNoOpCache() throws Exception {
         doTestExecute(noOpCache, sqlFieldsQuery("select _KEY, name, age from 
\"AffinityKey-Person\".Person"));
     }
@@ -639,6 +650,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testExecuteWithArguments() throws Exception {
         QueryCursor<List<?>> qry = personCache
             .query(sqlFieldsQuery("select _KEY, name, age from Person where 
age > ?").setArgs(30));
@@ -691,6 +703,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testSelectAllJoined() throws Exception {
         QueryCursor<List<?>> qry =
             personCache.query(sqlFieldsQuery(
@@ -755,6 +768,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testEmptyResult() throws Exception {
         QueryCursor<List<?>> qry =
             personCache.query(sqlFieldsQuery("select name from Person where 
age = 0"));
@@ -771,6 +785,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSingleResultUsesFindOne() throws Exception {
         QueryCursor<List<?>> qry =
             intCache.query(sqlFieldsQuery("select _val from Integer where _key 
= 25"));
@@ -790,6 +805,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testEmptyResultUsesFindOne() throws Exception {
         QueryCursor<List<?>> qry =
             intCache.query(sqlFieldsQuery("select _val from Integer where _key 
= -10"));
@@ -801,6 +817,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testQueryString() throws Exception {
         QueryCursor<List<?>> qry = strCache.query(sqlFieldsQuery("select * 
from String"));
 
@@ -818,6 +835,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testQueryIntegersWithJoin() throws Exception {
         QueryCursor<List<?>> qry = intCache.query(sqlFieldsQuery(
             "select i._KEY, i._VAL, j._KEY, j._VAL from Integer i join Integer 
j where i._VAL >= 100"));
@@ -840,6 +858,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testPagination() throws Exception {
         // Query with page size 20.
         QueryCursor<List<?>> qry =
@@ -862,6 +881,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testNamedCache() throws Exception {
         try {
             IgniteCache<Integer, Integer> cache = jcache("tmp_int", 
Integer.class, Integer.class);
@@ -882,6 +902,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testNoPrimitives() throws Exception {
         try {
             final IgniteCache<Object, Object> cache = 
grid(0).getOrCreateCache("tmp_without_index");
@@ -900,6 +921,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testComplexKeys() throws Exception {
         IgniteCache<PersonKey, Person> cache = jcache(PersonKey.class, 
Person.class);
 
@@ -941,6 +963,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPaginationIterator() throws Exception {
         QueryCursor<List<?>> qry =
             intCache.query(sqlFieldsQuery("select _key, _val from 
Integer").setPageSize(10));
@@ -961,6 +984,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testPaginationIteratorKeepAll() throws Exception {
         QueryCursor<List<?>> qry =
             intCache.query(sqlFieldsQuery("select _key, _val from 
Integer").setPageSize(10));
@@ -1002,6 +1026,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPaginationGet() throws Exception {
         QueryCursor<List<?>> qry =
             intCache.query(sqlFieldsQuery("select _key, _val from 
Integer").setPageSize(10));
@@ -1025,6 +1050,7 @@ public abstract class 
IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testEmptyGrid() throws Exception {
         QueryCursor<List<?>> qry = personCache
             .query(sqlFieldsQuery("select name, age from Person where age = 
25"));

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
index 2b3076c..8038798 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
@@ -34,12 +34,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheCollocatedQuerySelfTest extends GridCommonAbstractTest 
{
     /** */
     private static final String QRY =
@@ -113,6 +117,7 @@ public class IgniteCacheCollocatedQuerySelfTest extends 
GridCommonAbstractTest {
     /**
      * Correct affinity.
      */
+    @Test
     public void testColocatedQueryRight() {
         IgniteCache<AffinityUuid,Purchase> c = 
ignite(0).cache(DEFAULT_CACHE_NAME);
 
@@ -140,6 +145,7 @@ public class IgniteCacheCollocatedQuerySelfTest extends 
GridCommonAbstractTest {
     /**
      * Correct affinity.
      */
+    @Test
     public void testColocatedQueryWrong() {
         IgniteCache<AffinityUuid,Purchase> c = 
ignite(0).cache(DEFAULT_CACHE_NAME);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java
index 152a325..7b6a07f 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsQueryTest.java
@@ -38,6 +38,9 @@ import org.apache.ignite.events.Event;
 import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.lang.IgnitePredicate;
 import 
org.apache.ignite.testframework.junits.IgniteCacheConfigVariationsAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -49,6 +52,7 @@ import static 
org.apache.ignite.internal.processors.cache.query.CacheQueryType.S
 /**
  * Config Variations query tests.
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheConfigVariationsQueryTest extends 
IgniteCacheConfigVariationsAbstractTest {
     /** */
     public static final int CNT = 50;
@@ -75,6 +79,7 @@ public class IgniteCacheConfigVariationsQueryTest extends 
IgniteCacheConfigVaria
      * @throws Exception If failed.
      */
     @SuppressWarnings("serial")
+    @Test
     public void testScanQuery() throws Exception {
         runInAllDataModes(new TestRunnable() {
             @Override public void run() throws Exception {
@@ -106,6 +111,7 @@ public class IgniteCacheConfigVariationsQueryTest extends 
IgniteCacheConfigVaria
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testScanPartitionQuery() throws Exception {
         runInAllDataModes(new TestRunnable() {
             @Override public void run() throws Exception {
@@ -164,6 +170,7 @@ public class IgniteCacheConfigVariationsQueryTest extends 
IgniteCacheConfigVaria
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testScanFilters() throws Exception {
         runInAllDataModes(new TestRunnable() {
             @Override public void run() throws Exception {
@@ -207,6 +214,7 @@ public class IgniteCacheConfigVariationsQueryTest extends 
IgniteCacheConfigVaria
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLocalScanQuery() throws Exception {
         runInAllDataModes(new TestRunnable() {
             @Override public void run() throws Exception {
@@ -244,6 +252,7 @@ public class IgniteCacheConfigVariationsQueryTest extends 
IgniteCacheConfigVaria
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testScanQueryLocalFilter() throws Exception {
         runInAllDataModes(new TestRunnable() {
             @Override public void run() throws Exception {
@@ -290,6 +299,7 @@ public class IgniteCacheConfigVariationsQueryTest extends 
IgniteCacheConfigVaria
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testScanQueryPartitionFilter() throws Exception {
         runInAllDataModes(new TestRunnable() {
             @Override public void run() throws Exception {

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationPrimitiveTypesSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationPrimitiveTypesSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationPrimitiveTypesSelfTest.java
index 10fc58e..eaa4420 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationPrimitiveTypesSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigurationPrimitiveTypesSelfTest.java
@@ -26,10 +26,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheConfigurationPrimitiveTypesSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -55,6 +59,7 @@ public class IgniteCacheConfigurationPrimitiveTypesSelfTest 
extends GridCommonAb
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPrimitiveTypes() throws Exception {
         Ignite ignite = startGrid(1);
 
@@ -95,4 +100,4 @@ public class IgniteCacheConfigurationPrimitiveTypesSelfTest 
extends GridCommonAb
         assertEquals(cacheDouble.query(new SqlQuery<>(Double.class, "1 = 
1")).getAll().size(), 1);
         assertEquals(cacheBoolean.query(new SqlQuery<>(Boolean.class, "1 = 
1")).getAll().size(), 1);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
index 3ebb3b4..a34d33c 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
@@ -42,6 +42,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -51,6 +54,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheCrossCacheJoinRandomTest extends 
AbstractH2CompareQueryTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -195,6 +199,7 @@ public class IgniteCacheCrossCacheJoinRandomTest extends 
AbstractH2CompareQueryT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin2Caches() throws Exception {
         testJoin(2, MODES_1);
     }
@@ -202,6 +207,7 @@ public class IgniteCacheCrossCacheJoinRandomTest extends 
AbstractH2CompareQueryT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin3Caches() throws Exception {
         testJoin(3, MODES_1);
     }
@@ -209,6 +215,7 @@ public class IgniteCacheCrossCacheJoinRandomTest extends 
AbstractH2CompareQueryT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin4Caches() throws Exception {
         testJoin(4, MODES_2);
     }
@@ -216,6 +223,7 @@ public class IgniteCacheCrossCacheJoinRandomTest extends 
AbstractH2CompareQueryT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin5Caches() throws Exception {
         testJoin(5, MODES_2);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDeleteSqlQuerySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDeleteSqlQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDeleteSqlQuerySelfTest.java
index 92c40b8..1baedf8 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDeleteSqlQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDeleteSqlQuerySelfTest.java
@@ -22,15 +22,20 @@ import java.util.List;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.query.QueryCursor;
 import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
 @SuppressWarnings("unchecked")
+@RunWith(JUnit4.class)
 public class IgniteCacheDeleteSqlQuerySelfTest extends 
IgniteCacheAbstractSqlDmlQuerySelfTest {
     /**
      *
      */
+    @Test
     public void testDeleteSimple() {
         IgniteCache p = cache();
 
@@ -55,6 +60,7 @@ public class IgniteCacheDeleteSqlQuerySelfTest extends 
IgniteCacheAbstractSqlDml
     /**
      *
      */
+    @Test
     public void testDeleteSingle() {
         IgniteCache p = cache();
 
@@ -83,6 +89,7 @@ public class IgniteCacheDeleteSqlQuerySelfTest extends 
IgniteCacheAbstractSqlDml
      * In binary mode, this test checks that inner forcing of keepBinary works 
- without it, EntryProcessors
      * inside DML engine would compare binary and non-binary objects with the 
same keys and thus fail.
      */
+    @Test
     public void testDeleteSimpleWithoutKeepBinary() {
         IgniteCache p = ignite(0).cache("S2P");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
index f53f263..80923a7 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
@@ -39,6 +39,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -46,6 +49,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheDistributedJoinCollocatedAndNotTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -156,6 +160,7 @@ public class IgniteCacheDistributedJoinCollocatedAndNotTest 
extends GridCommonAb
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin() throws Exception {
         Ignite client = grid(2);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
index b8aa4cb..ab0605f 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
@@ -37,6 +37,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -45,6 +48,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheDistributedJoinCustomAffinityMapper extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -156,6 +160,7 @@ public class IgniteCacheDistributedJoinCustomAffinityMapper 
extends GridCommonAb
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinCustomAffinityMapper() throws Exception {
         Ignite ignite = ignite(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
index f8bc088..abff110 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
@@ -39,6 +39,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -46,6 +49,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheDistributedJoinNoIndexTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -132,6 +136,7 @@ public class IgniteCacheDistributedJoinNoIndexTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin() throws Exception {
         Ignite client = grid(2);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
index 462a008..145b076 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
@@ -38,6 +38,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -47,6 +50,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheDistributedJoinPartitionedAndReplicatedTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -179,6 +183,7 @@ public class 
IgniteCacheDistributedJoinPartitionedAndReplicatedTest extends Grid
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin1() throws Exception {
         join(true, REPLICATED, PARTITIONED, PARTITIONED);
     }
@@ -186,6 +191,7 @@ public class 
IgniteCacheDistributedJoinPartitionedAndReplicatedTest extends Grid
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin2() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-5956";);
 
@@ -195,6 +201,7 @@ public class 
IgniteCacheDistributedJoinPartitionedAndReplicatedTest extends Grid
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin3() throws Exception {
         join(true, PARTITIONED, PARTITIONED, REPLICATED);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
index 6f20923..88ea094 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
@@ -36,6 +36,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -43,6 +46,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheDistributedJoinQueryConditionsTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -86,6 +90,7 @@ public class IgniteCacheDistributedJoinQueryConditionsTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery1() throws Exception {
         joinQuery1(true);
     }
@@ -173,6 +178,7 @@ public class IgniteCacheDistributedJoinQueryConditionsTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery2() throws Exception {
         Ignite client = grid(2);
 
@@ -283,6 +289,7 @@ public class IgniteCacheDistributedJoinQueryConditionsTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery4() throws Exception {
         Ignite client = grid(2);
 
@@ -334,6 +341,7 @@ public class IgniteCacheDistributedJoinQueryConditionsTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery5() throws Exception {
         Ignite client = grid(2);
 
@@ -375,6 +383,7 @@ public class IgniteCacheDistributedJoinQueryConditionsTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery6() throws Exception {
         Ignite client = grid(2);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
index dee8e64..1d438e4 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
@@ -39,9 +39,13 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -200,6 +204,7 @@ public class IgniteCacheDistributedJoinTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoins() throws Exception {
         Ignite ignite = ignite(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
index d5c0f0a..8947b08 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
@@ -26,10 +26,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheDuplicateEntityConfigurationSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -55,6 +59,7 @@ public class IgniteCacheDuplicateEntityConfigurationSelfTest 
extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClassDuplicatesQueryEntity() throws Exception {
         String cacheName = "duplicate";
 
@@ -86,6 +91,7 @@ public class IgniteCacheDuplicateEntityConfigurationSelfTest 
extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClassDuplicatesQueryReverse() throws Exception {
         String cacheName = "duplicate";
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
index 75c0cd4..ccea5b6 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
@@ -26,6 +26,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -33,6 +36,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Test for local query on partitioned cache without data.
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheFieldsQueryNoDataSelfTest extends 
GridCommonAbstractTest {
     /** IP finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -69,6 +73,7 @@ public class IgniteCacheFieldsQueryNoDataSelfTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testQuery() throws Exception {
         Collection<Cache.Entry<Object, Object>> res = 
grid().cache(DEFAULT_CACHE_NAME)
             .query(new SqlQuery("Integer", "from Integer")).getAll();
@@ -76,4 +81,4 @@ public class IgniteCacheFieldsQueryNoDataSelfTest extends 
GridCommonAbstractTest
         assert res != null;
         assert res.isEmpty();
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
index 162b1e5..a356f8b 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java
@@ -36,6 +36,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -44,6 +47,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Tests cache in-place modification logic with iterative value increment.
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheFullTextQueryNodeJoiningSelfTest extends 
GridCommonAbstractTest {
     /** IP finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -105,6 +109,7 @@ public class IgniteCacheFullTextQueryNodeJoiningSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFullTextQueryNodeJoin() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-2229";);
 
@@ -145,4 +150,4 @@ public class IgniteCacheFullTextQueryNodeJoiningSelfTest 
extends GridCommonAbstr
             this.val = val;
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsSqlTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsSqlTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsSqlTest.java
index 617909d..dee50e0 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsSqlTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsSqlTest.java
@@ -40,6 +40,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -50,6 +53,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheGroupsSqlTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -86,6 +90,7 @@ public class IgniteCacheGroupsSqlTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSqlQuery() throws Exception {
         Ignite node = ignite(0);
 
@@ -112,6 +117,7 @@ public class IgniteCacheGroupsSqlTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery1() throws Exception {
         joinQuery(GROUP1, GROUP2, REPLICATED, PARTITIONED, TRANSACTIONAL, 
TRANSACTIONAL);
     }
@@ -119,6 +125,7 @@ public class IgniteCacheGroupsSqlTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery2() throws Exception {
         GridTestUtils.assertThrows(log, new Callable<Void>() {
             @Override public Void call() throws Exception {
@@ -131,6 +138,7 @@ public class IgniteCacheGroupsSqlTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery3() throws Exception {
         joinQuery(GROUP1, GROUP1, PARTITIONED, PARTITIONED, TRANSACTIONAL, 
ATOMIC);
     }
@@ -138,6 +146,7 @@ public class IgniteCacheGroupsSqlTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery4() throws Exception {
         joinQuery(GROUP1, GROUP1, REPLICATED, REPLICATED, ATOMIC, 
TRANSACTIONAL);
     }
@@ -145,6 +154,7 @@ public class IgniteCacheGroupsSqlTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery5() throws Exception {
         joinQuery(GROUP1, null, REPLICATED, PARTITIONED, TRANSACTIONAL, 
TRANSACTIONAL);
     }
@@ -152,6 +162,7 @@ public class IgniteCacheGroupsSqlTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery6() throws Exception {
         joinQuery(GROUP1, null, PARTITIONED, PARTITIONED, TRANSACTIONAL, 
ATOMIC);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java
index bc5686d..55eac7d 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java
@@ -29,6 +29,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static 
org.apache.ignite.internal.processors.cache.IgniteCacheUpdateSqlQuerySelfTest.AllTypes;
 
@@ -36,6 +39,7 @@ import static 
org.apache.ignite.internal.processors.cache.IgniteCacheUpdateSqlQu
  *
  */
 @SuppressWarnings("unchecked")
+@RunWith(JUnit4.class)
 public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsertSqlQuerySelfTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -58,6 +62,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testInsertWithExplicitKey() {
         IgniteCache<String, Person> p = 
ignite(0).cache("S2P").withKeepBinary();
 
@@ -72,6 +77,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testInsertFromSubquery() {
         IgniteCache p = ignite(0).cache("S2P").withKeepBinary();
 
@@ -92,6 +98,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testInsertWithExplicitPrimitiveKey() {
         IgniteCache<Integer, Person> p = 
ignite(0).cache("I2P").withKeepBinary();
 
@@ -107,6 +114,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testInsertWithDynamicKeyInstantiation() {
         IgniteCache<Key, Person> p = ignite(0).cache("K2P").withKeepBinary();
 
@@ -121,6 +129,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      * Test insert with implicit column names.
      */
+    @Test
     public void testImplicitColumnNames() {
         IgniteCache<Key, Person> p = ignite(0).cache("K2P").withKeepBinary();
 
@@ -139,6 +148,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testFieldsCaseSensitivity() {
         IgniteCache<Key2, Person> p = ignite(0).cache("K22P").withKeepBinary();
 
@@ -153,6 +163,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testPrimitives() {
         IgniteCache<Integer, Integer> p = ignite(0).cache("I2I");
 
@@ -167,6 +178,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testDuplicateKeysException() {
         final IgniteCache<Integer, Integer> p = ignite(0).cache("I2I");
 
@@ -192,6 +204,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testUuidHandling() {
         IgniteCache<UUID, Integer> p = ignite(0).cache("U2I");
 
@@ -205,6 +218,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      *
      */
+    @Test
     public void testNestedFieldsHandling() {
         IgniteCache<Integer, AllTypes> p = ignite(0).cache("I2AT");
 
@@ -230,6 +244,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends 
IgniteCacheAbstractInsert
     /**
      * Check that few sequential start-stops of the cache do not affect work 
of DML.
      */
+    @Test
     public void testCacheRestartHandling() {
         for (int i = 0; i < 4; i++) {
             IgniteCache<Integer, IgniteCacheUpdateSqlQuerySelfTest.AllTypes> p 
=

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
index 3d3f27b..1e87c85 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
@@ -37,6 +37,9 @@ import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -45,6 +48,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheJoinPartitionedAndReplicatedCollocationTest extends 
AbstractH2CompareQueryTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -176,6 +180,7 @@ public class 
IgniteCacheJoinPartitionedAndReplicatedCollocationTest extends Abst
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin() throws Exception {
         Ignite client = grid(SRVS);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
index 4f080e6..2cfc6a4 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
@@ -37,6 +37,9 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -46,6 +49,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheJoinPartitionedAndReplicatedTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -171,6 +175,7 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoin() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-5016";);
 
@@ -224,6 +229,7 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest 
extends GridCommonAbstr
 
     /**
      */
+    @Test
     public void testReplicatedToPartitionedLeftJoin() {
         fail("https://issues.apache.org/jira/browse/IGNITE-5016";);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
index be11153..e0cd542 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
@@ -41,6 +41,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -50,6 +53,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
  *
  */
 @SuppressWarnings("unchecked")
+@RunWith(JUnit4.class)
 public class IgniteCacheJoinQueryWithAffinityKeyTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -95,6 +99,7 @@ public class IgniteCacheJoinQueryWithAffinityKeyTest extends 
GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQuery() throws Exception {
         testJoinQuery(PARTITIONED, 0, false, true);
 
@@ -106,6 +111,7 @@ public class IgniteCacheJoinQueryWithAffinityKeyTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQueryEscapeAll() throws Exception {
         escape = true;
 
@@ -115,6 +121,7 @@ public class IgniteCacheJoinQueryWithAffinityKeyTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQueryWithAffinityKey() throws Exception {
         testJoinQuery(PARTITIONED, 0, true, true);
 
@@ -126,6 +133,7 @@ public class IgniteCacheJoinQueryWithAffinityKeyTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQueryWithAffinityKeyEscapeAll() throws Exception {
         escape = true;
 
@@ -135,6 +143,7 @@ public class IgniteCacheJoinQueryWithAffinityKeyTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQueryWithAffinityKeyNotQueryField() throws Exception {
         testJoinQuery(PARTITIONED, 0, true, false);
 
@@ -146,6 +155,7 @@ public class IgniteCacheJoinQueryWithAffinityKeyTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinQueryWithAffinityKeyNotQueryFieldEscapeAll() throws 
Exception {
         escape = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
index bac8d1d..9e5cc52 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
@@ -29,12 +29,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheLargeResultSelfTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -71,6 +75,7 @@ public class IgniteCacheLargeResultSelfTest extends 
GridCommonAbstractTest {
 
     /**
      */
+    @Test
     public void testLargeResult() {
         // Fill cache.
         try (IgniteDataStreamer<Integer, Integer> streamer = 
ignite(0).dataStreamer(DEFAULT_CACHE_NAME)) {
@@ -103,4 +108,4 @@ public class IgniteCacheLargeResultSelfTest extends 
GridCommonAbstractTest {
 
         // Currently we have no ways to do multiple passes through a merge 
table.
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
index a4f398f..c9002f9 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.java
@@ -34,10 +34,14 @@ import org.apache.ignite.lang.IgniteRunnable;
 import org.apache.ignite.resources.IgniteInstanceResource;
 import org.apache.ignite.resources.LoggerResource;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test to validate https://issues.apache.org/jira/browse/IGNITE-2310
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest extends 
IgniteCacheLockPartitionOnAffinityRunAbstractTest {
     /** Atomic cache. */
     private static final String ATOMIC_CACHE = "atomic";
@@ -137,6 +141,7 @@ public class 
IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest extends Igni
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNotReservedAtomicCacheOp() throws Exception {
         notReservedCacheOp(ATOMIC_CACHE);
     }
@@ -144,6 +149,7 @@ public class 
IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest extends Igni
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNotReservedTxCacheOp() throws Exception {
         notReservedCacheOp(TRANSACT_CACHE);
     }
@@ -202,6 +208,7 @@ public class 
IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest extends Igni
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReservedPartitionCacheOp() throws Exception {
         // Workaround for initial update job metadata.
         grid(0).cache(Person.class.getSimpleName()).clear();

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java
index d0cfbd9..af0154c 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java
@@ -45,10 +45,14 @@ import org.apache.ignite.lang.IgniteRunnable;
 import org.apache.ignite.resources.IgniteInstanceResource;
 import org.apache.ignite.resources.LoggerResource;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test to validate https://issues.apache.org/jira/browse/IGNITE-2310
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheLockPartitionOnAffinityRunTest extends 
IgniteCacheLockPartitionOnAffinityRunAbstractTest {
     /**
      * @param ignite Ignite.
@@ -290,6 +294,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSingleCache() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7692";);
 
@@ -346,6 +351,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultipleCaches() throws Exception {
         final PersonsCountGetter personsCntGetter = new PersonsCountGetter() {
             @Override public int getPersonsCount(IgniteEx ignite, IgniteLogger 
log, int orgId) throws Exception {
@@ -404,6 +410,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCheckReservePartitionException() throws Exception {
         int orgId = 
primaryKey(grid(1).cache(Organization.class.getSimpleName()));
 
@@ -426,6 +433,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePartitionJobCompletesNormally() throws Exception {
         final int orgId = 
primaryKey(grid(1).cache(Organization.class.getSimpleName()));
 
@@ -474,6 +482,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePartitionJobThrowsException() throws Exception {
         final int orgId = 
primaryKey(grid(1).cache(Organization.class.getSimpleName()));
 
@@ -534,6 +543,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePartitionJobThrowsError() throws Exception {
         final int orgId = 
primaryKey(grid(1).cache(Organization.class.getSimpleName()));
 
@@ -593,6 +603,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePartitionJobUnmarshalingFails() throws Exception {
         final int orgId = 
primaryKey(grid(1).cache(Organization.class.getSimpleName()));
 
@@ -611,6 +622,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePartitionJobMasterLeave() throws Exception {
         final int orgId = 
primaryKey(grid(0).cache(Organization.class.getSimpleName()));
 
@@ -700,6 +712,7 @@ public class IgniteCacheLockPartitionOnAffinityRunTest 
extends IgniteCacheLockPa
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePartitionJobImplementMasterLeave() throws Exception 
{
         final int orgId = 
primaryKey(grid(0).cache(Organization.class.getSimpleName()));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java
index a05e10e..73b467a 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java
@@ -35,10 +35,14 @@ import 
org.apache.ignite.spi.collision.CollisionExternalListener;
 import org.apache.ignite.spi.collision.CollisionJobContext;
 import org.apache.ignite.spi.collision.CollisionSpi;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test to validate https://issues.apache.org/jira/browse/IGNITE-2310
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest
     extends IgniteCacheLockPartitionOnAffinityRunAbstractTest {
 
@@ -58,6 +62,7 @@ public class 
IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionReservation() throws Exception {
         int orgId = 0;
         cancelAllJobs = true;
@@ -81,6 +86,7 @@ public class 
IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJobFinishing() throws Exception {
         final AtomicInteger jobNum = new AtomicInteger(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java
index c92c7dc..cab0119 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java
@@ -21,6 +21,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static 
org.apache.ignite.internal.processors.cache.IgniteCacheUpdateSqlQuerySelfTest.AllTypes;
 
@@ -28,10 +31,12 @@ import static 
org.apache.ignite.internal.processors.cache.IgniteCacheUpdateSqlQu
  *
  */
 @SuppressWarnings("unchecked")
+@RunWith(JUnit4.class)
 public class IgniteCacheMergeSqlQuerySelfTest extends 
IgniteCacheAbstractInsertSqlQuerySelfTest {
     /**
      *
      */
+    @Test
     public void testMergeWithExplicitKey() {
         IgniteCache<String, Person> p = 
ignite(0).cache("S2P").withKeepBinary();
 
@@ -46,6 +51,7 @@ public class IgniteCacheMergeSqlQuerySelfTest extends 
IgniteCacheAbstractInsertS
     /**
      *
      */
+    @Test
     public void testMergeFromSubquery() {
         IgniteCache p = ignite(0).cache("S2P").withKeepBinary();
 
@@ -66,6 +72,7 @@ public class IgniteCacheMergeSqlQuerySelfTest extends 
IgniteCacheAbstractInsertS
     /**
      *
      */
+    @Test
     public void testMergeWithExplicitPrimitiveKey() {
         IgniteCache<Integer, Person> p = 
ignite(0).cache("I2P").withKeepBinary();
 
@@ -81,6 +88,7 @@ public class IgniteCacheMergeSqlQuerySelfTest extends 
IgniteCacheAbstractInsertS
     /**
      *
      */
+    @Test
     public void testMergeWithDynamicKeyInstantiation() {
         IgniteCache<Key, Person> p = ignite(0).cache("K2P").withKeepBinary();
 
@@ -95,6 +103,7 @@ public class IgniteCacheMergeSqlQuerySelfTest extends 
IgniteCacheAbstractInsertS
     /**
      *
      */
+    @Test
     public void testFieldsCaseSensitivity() {
         IgniteCache<Key2, Person> p = ignite(0).cache("K22P").withKeepBinary();
 
@@ -109,6 +118,7 @@ public class IgniteCacheMergeSqlQuerySelfTest extends 
IgniteCacheAbstractInsertS
     /**
      *
      */
+    @Test
     public void testPrimitives() {
         IgniteCache<Integer, Integer> p = 
ignite(0).cache("I2I").withKeepBinary();
 
@@ -123,6 +133,7 @@ public class IgniteCacheMergeSqlQuerySelfTest extends 
IgniteCacheAbstractInsertS
     /**
      *
      */
+    @Test
     public void testNestedFieldsHandling() {
         IgniteCache<Integer, AllTypes> p = ignite(0).cache("I2AT");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMultipleIndexedTypesTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMultipleIndexedTypesTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMultipleIndexedTypesTest.java
index 0614a05..b3d410f 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMultipleIndexedTypesTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMultipleIndexedTypesTest.java
@@ -29,10 +29,14 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheMultipleIndexedTypesTest extends 
GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
@@ -49,6 +53,7 @@ public class IgniteCacheMultipleIndexedTypesTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultipleIndexedTypes() throws Exception {
         CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
index 4dc9116..558a0c3 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
@@ -29,6 +29,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -37,6 +40,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheNoClassQuerySelfTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -91,6 +95,7 @@ public class IgniteCacheNoClassQuerySelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNoClass() throws Exception {
         try {
             startGrid();

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
index 2865767..e9766f1 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
@@ -28,10 +28,14 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test index behavior when key is of plain Object type per indexing settings.
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheObjectKeyIndexingSelfTest extends 
GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
@@ -52,6 +56,7 @@ public class IgniteCacheObjectKeyIndexingSelfTest extends 
GridCommonAbstractTest
     }
 
     /** */
+    @Test
     public void testObjectKeyHandling() throws Exception {
         Ignite ignite = grid();
 
@@ -92,7 +97,7 @@ public class IgniteCacheObjectKeyIndexingSelfTest extends 
GridCommonAbstractTest
                 Arrays.asList(uid, "C")
             )
         );
-        
+
         cache.remove(uid);
 
         // Removal has worked for both keys although the table was the same 
and keys were of different type
@@ -107,7 +112,7 @@ public class IgniteCacheObjectKeyIndexingSelfTest extends 
GridCommonAbstractTest
         assertEquals(num, grid().cache(DEFAULT_CACHE_NAME).query(new 
SqlFieldsQuery("select count(*) from TestObject")).getAll()
             .get(0).get(0));
     }
-    
+
     /** */
     private static class TestObject {
         /** */

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
index 6a22f05..be47260 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java
@@ -39,12 +39,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -87,6 +91,7 @@ public class IgniteCacheOffheapEvictQueryTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEvictAndRemove() throws Exception {
         final int KEYS_CNT = 3000;
         final int THREADS_CNT = 250;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
index c0cc46d..f9d68ef 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
@@ -30,12 +30,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheMode.LOCAL;
 
 /**
  * Based scanCount with offheap index issue.
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheOffheapIndexScanTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -75,6 +79,7 @@ public class IgniteCacheOffheapIndexScanTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testQueryPlan() throws Exception {
         for (int i = 0 ; i < 1000; i++)
             cache.put(i, new Person(i, "firstName" + i, "lastName" + i, i % 
100));
@@ -184,4 +189,4 @@ public class IgniteCacheOffheapIndexScanTest extends 
GridCommonAbstractTest {
                 ']';
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index a2f1d1d..fbf5adb 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -25,10 +25,14 @@ import org.apache.ignite.cache.query.ScanQuery;
 import org.apache.ignite.cache.query.SqlQuery;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.lang.IgniteBiPredicate;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Checks behavior on exception while unmarshalling key.
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheP2pUnmarshallingQueryErrorTest extends 
IgniteCacheP2pUnmarshallingErrorTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String 
igniteInstanceName) throws Exception {
@@ -41,6 +45,7 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest 
extends IgniteCacheP2pUnm
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testResponseMessageOnUnmarshallingFailed() {
         readCnt.set(Integer.MAX_VALUE);
 
@@ -62,6 +67,7 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest 
extends IgniteCacheP2pUnm
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testResponseMessageOnRequestUnmarshallingFailed() throws 
Exception {
         readCnt.set(Integer.MAX_VALUE);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
index dc8f8d3..0b118d9 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
@@ -45,6 +45,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -52,6 +55,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  * Tests for partitioned cache queries.
  */
+@RunWith(JUnit4.class)
 public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final boolean TEST_INFO = true;
@@ -123,6 +127,7 @@ public class 
IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon
      * @throws Exception If failed.
      */
     @SuppressWarnings({"TooBroadScope"})
+    @Test
     public void testLuceneAndSqlMultithreaded() throws Exception {
         // ---------- Test parameters ---------- //
         int luceneThreads = 10;
@@ -292,4 +297,4 @@ public class 
IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon
             return S.toString(PersonObj.class, this);
         }
     }
-}
\ No newline at end of file
+}

Reply via email to