http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
index 45b30e8..3c190e4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
@@ -53,6 +53,9 @@ import 
org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import java.util.concurrent.ConcurrentHashMap;
+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.CacheAtomicityMode.TRANSACTIONAL;
@@ -63,6 +66,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Continuous queries counter tests.
  */
+@RunWith(JUnit4.class)
 public abstract class CacheContinuousQueryCounterAbstractTest extends 
GridCommonAbstractTest
     implements Serializable {
     /** */
@@ -177,6 +181,7 @@ public abstract class 
CacheContinuousQueryCounterAbstractTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAllEntries() throws Exception {
         IgniteCache<Integer, Integer> cache = grid(0).cache(CACHE_NAME);
 
@@ -248,6 +253,7 @@ public abstract class 
CacheContinuousQueryCounterAbstractTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTwoQueryListener() throws Exception {
         if (cacheMode() == LOCAL)
             return;
@@ -384,6 +390,7 @@ public abstract class 
CacheContinuousQueryCounterAbstractTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRestartQuery() throws Exception {
         IgniteCache<Integer, Integer> cache = grid(0).cache(CACHE_NAME);
 
@@ -442,6 +449,7 @@ public abstract class 
CacheContinuousQueryCounterAbstractTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEntriesByFilter() throws Exception {
         IgniteCache<Integer, Integer> cache = grid(0).cache(CACHE_NAME);
 
@@ -537,6 +545,7 @@ public abstract class 
CacheContinuousQueryCounterAbstractTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLoadCache() throws Exception {
         IgniteCache<Integer, Integer> cache = grid(0).cache(CACHE_NAME);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBufferTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBufferTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBufferTest.java
index 382f166..c86ac65 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBufferTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBufferTest.java
@@ -28,15 +28,20 @@ import java.util.concurrent.CyclicBarrier;
 import javax.cache.event.EventType;
 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;
 
 /**
  *
  */
 @SuppressWarnings("unchecked")
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryEventBufferTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBuffer1() throws Exception {
         testBuffer(1);
     }
@@ -44,6 +49,7 @@ public class CacheContinuousQueryEventBufferTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBuffer2() throws Exception {
         for (int i = 0; i < 10; i++) {
             log.info("Iteration: " + i);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
index 3395f26..58f4f2c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
@@ -46,6 +46,9 @@ import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+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.CacheAtomicityMode.ATOMIC;
@@ -59,6 +62,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Continuous queries execute in primary node tests.
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryExecuteInPrimaryTest extends 
GridCommonAbstractTest
     implements Serializable {
 
@@ -99,6 +103,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLocalCache() throws Exception {
         CacheConfiguration<Integer, String> ccfg = cacheConfiguration(ATOMIC, 
LOCAL);
 
@@ -109,6 +114,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReplicatedCache() throws Exception {
         CacheConfiguration<Integer, String> ccfg = cacheConfiguration(ATOMIC, 
REPLICATED);
 
@@ -119,6 +125,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionedCache() throws Exception {
         CacheConfiguration<Integer, String> ccfg = cacheConfiguration(ATOMIC, 
PARTITIONED);
 
@@ -129,6 +136,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTransactionLocalCache() throws Exception {
         CacheConfiguration<Integer, String> ccfg = 
cacheConfiguration(TRANSACTIONAL, LOCAL);
 
@@ -139,6 +147,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTransactionReplicatedCache() throws Exception {
         CacheConfiguration<Integer, String> ccfg = 
cacheConfiguration(TRANSACTIONAL, REPLICATED);
 
@@ -149,6 +158,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTransactionPartitionedCache() throws Exception {
         CacheConfiguration<Integer, String> ccfg = 
cacheConfiguration(TRANSACTIONAL, PARTITIONED);
 
@@ -159,6 +169,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTransactionLocalCache() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-9530";);
 
@@ -171,6 +182,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTransactionReplicatedCache() throws Exception {
         CacheConfiguration<Integer, String> ccfg = 
cacheConfiguration(TRANSACTIONAL_SNAPSHOT, REPLICATED);
 
@@ -181,6 +193,7 @@ public class CacheContinuousQueryExecuteInPrimaryTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTransactionPartitionedCache() throws Exception {
         CacheConfiguration<Integer, String> ccfg = 
cacheConfiguration(TRANSACTIONAL_SNAPSHOT, PARTITIONED);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
index d216d4f..e0dcf2e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterRandomOperationTest.java
@@ -58,6 +58,9 @@ import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.NotNull;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -75,6 +78,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryFactoryFilterRandomOperationTest extends 
CacheContinuousQueryRandomOperationsTest {
     /** */
     private static final int NODES = 5;
@@ -91,6 +95,7 @@ public class 
CacheContinuousQueryFactoryFilterRandomOperationTest extends CacheC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInternalQuery() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             1,

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index e7c2261..abe6e9d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -106,6 +106,9 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionRollbackException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -119,6 +122,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -215,6 +219,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFirstFilteredEvent() throws Exception {
         this.backups = 2;
 
@@ -259,6 +264,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRebalanceVersion() throws Exception {
         Ignite ignite0 = startGrid(0);
 
@@ -311,6 +317,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
      *
      * @throws Exception If fail.
      */
+    @Test
     public void testRebalance() throws Exception {
         for (int iter = 0; iter < 5; iter++) {
             log.info("Iteration: " + iter);
@@ -426,6 +433,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOneBackup() throws Exception {
         checkBackupQueue(1, false);
     }
@@ -433,6 +441,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOneBackupClientUpdate() throws Exception {
         checkBackupQueue(1, true);
     }
@@ -440,6 +449,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUpdatePartitionCounter() throws Exception {
         this.backups = 2;
 
@@ -540,6 +550,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartStopQuery() throws Exception {
         this.backups = 1;
 
@@ -644,6 +655,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLeftPrimaryAndBackupNodes() throws Exception {
         if (cacheMode() == REPLICATED)
             return;
@@ -814,6 +826,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRemoteFilter() throws Exception {
         this.backups = 2;
 
@@ -926,6 +939,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testThreeBackups() throws Exception {
         if (cacheMode() == REPLICATED)
             return;
@@ -1352,6 +1366,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBackupQueueCleanupClientQuery() throws Exception {
         startGridsMultiThreaded(2);
 
@@ -1425,6 +1440,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBackupQueueEvict() throws Exception {
         startGridsMultiThreaded(2);
 
@@ -1497,6 +1513,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBackupQueueCleanupServerQuery() throws Exception {
         Ignite qryClient = startGridsMultiThreaded(2);
 
@@ -1573,6 +1590,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFailoverStartStopBackup() throws Exception {
         failoverStartStopFilter(2);
     }
@@ -1580,6 +1598,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartStop() throws Exception {
         this.backups = 2;
 
@@ -1899,6 +1918,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiThreadedFailover() throws Exception {
         this.backups = 2;
 
@@ -2106,6 +2126,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiThreaded() throws Exception {
         this.backups = 2;
 
@@ -2299,6 +2320,7 @@ public abstract class 
CacheContinuousQueryFailoverAbstractSelfTest extends GridC
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNoEventLossOnTopologyChange() throws Exception {
         final int batchLoadSize = 2000;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
index df27087..b9972ee 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverMvccTxSelfTest.java
@@ -18,6 +18,9 @@ package 
org.apache.ignite.internal.processors.cache.query.continuous;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static 
org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -25,6 +28,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryFailoverMvccTxSelfTest extends 
CacheContinuousQueryFailoverAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode cacheMode() {
@@ -37,12 +41,14 @@ public class CacheContinuousQueryFailoverMvccTxSelfTest 
extends CacheContinuousQ
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testBackupQueueEvict() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7311";);
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testFailoverStartStopBackup() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10391";);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java
index a8b895f..c040332 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java
@@ -34,6 +34,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 javax.cache.configuration.FactoryBuilder.factoryOf;
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -46,6 +49,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC
 /**
  * Test from https://issues.apache.org/jira/browse/IGNITE-2384.
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryLostPartitionTest extends 
GridCommonAbstractTest {
     /** */
     public static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -80,6 +84,7 @@ public class CacheContinuousQueryLostPartitionTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxEvent() throws Exception {
         testEvent(TX_CACHE_NAME, false);
     }
@@ -87,6 +92,7 @@ public class CacheContinuousQueryLostPartitionTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxEvent() throws Exception {
         testEvent(MVCC_TX_CACHE_NAME, false);
     }
@@ -94,6 +100,7 @@ public class CacheContinuousQueryLostPartitionTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicEvent() throws Exception {
         testEvent(CACHE_NAME, false);
     }
@@ -101,6 +108,7 @@ public class CacheContinuousQueryLostPartitionTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxClientEvent() throws Exception {
         testEvent(TX_CACHE_NAME, true);
     }
@@ -108,6 +116,7 @@ public class CacheContinuousQueryLostPartitionTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxClientEvent() throws Exception {
         testEvent(MVCC_TX_CACHE_NAME, true);
     }
@@ -115,6 +124,7 @@ public class CacheContinuousQueryLostPartitionTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicClientEvent() throws Exception {
         testEvent(CACHE_NAME, true);
     }
@@ -123,6 +133,7 @@ public class CacheContinuousQueryLostPartitionTest extends 
GridCommonAbstractTes
      * @param cacheName Cache name.
      * @throws Exception If failed.
      */
+    @Test
     public void testEvent(String cacheName, boolean client) throws Exception {
         IgniteCache<Integer, String> cache1 = 
grid(0).getOrCreateCache(cacheName);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
index a9e3d43..3f8e34f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
@@ -60,6 +60,9 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 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.CacheAtomicityMode.TRANSACTIONAL;
@@ -71,6 +74,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryOperationFromCallbackTest extends 
GridCommonAbstractTest {
     /** */
     public static final int KEYS = 10;
@@ -136,6 +140,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicOneBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 1, ATOMIC, FULL_SYNC);
 
@@ -145,6 +150,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOneBackupFilter() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, FULL_SYNC);
 
@@ -154,6 +160,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOneBackupFilterPrimary() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, PRIMARY_SYNC);
 
@@ -163,6 +170,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOneBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, FULL_SYNC);
 
@@ -172,6 +180,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicTwoBackups() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, ATOMIC, FULL_SYNC);
 
@@ -181,6 +190,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxTwoBackupsFilter() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, FULL_SYNC);
 
@@ -190,6 +200,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxTwoBackupsFilterPrimary() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, PRIMARY_SYNC);
 
@@ -199,6 +210,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedFilter() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED, 0, TRANSACTIONAL, FULL_SYNC);
 
@@ -208,6 +220,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxTwoBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, FULL_SYNC);
 
@@ -217,6 +230,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicated() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED, 2, TRANSACTIONAL, FULL_SYNC);
 
@@ -226,6 +240,7 @@ public class CacheContinuousQueryOperationFromCallbackTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedPrimary() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED, 2, TRANSACTIONAL, PRIMARY_SYNC);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
index 6f5de39..7ec7ad2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.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.CacheAtomicityMode.TRANSACTIONAL;
@@ -50,6 +53,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -93,6 +97,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -105,6 +110,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomic() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -117,6 +123,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicReplicated() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -129,6 +136,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicReplicatedClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -141,6 +149,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTx() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -152,6 +161,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -164,6 +174,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicated() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -176,6 +187,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -188,6 +200,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTx() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -199,6 +212,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -211,6 +225,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxReplicated() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -223,6 +238,7 @@ public class CacheContinuousQueryOperationP2PTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxReplicatedClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
index 1ad45dd..c8acff1 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
@@ -59,6 +59,9 @@ import 
org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi;
 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;
@@ -73,6 +76,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTest {
     /** */
     public static final int LISTENER_CNT = 3;
@@ -133,6 +137,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicOnheapTwoBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, ATOMIC, PRIMARY_SYNC);
 
@@ -142,6 +147,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOnheapTwoBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, FULL_SYNC);
 
@@ -151,6 +157,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOnheapWithoutBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, PRIMARY_SYNC);
 
@@ -160,6 +167,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOnheapWithoutBackupFullSync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, FULL_SYNC);
 
@@ -169,6 +177,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxOnheapTwoBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT, FULL_SYNC);
 
@@ -178,6 +187,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxOnheapWithoutBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL_SNAPSHOT, PRIMARY_SYNC);
 
@@ -187,6 +197,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxOnheapWithoutBackupFullSync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL_SNAPSHOT, FULL_SYNC);
 
@@ -198,6 +209,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicOnheapTwoBackupAsync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, ATOMIC, PRIMARY_SYNC);
 
@@ -207,6 +219,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicOnheapTwoBackupAsyncFullSync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, ATOMIC, FULL_SYNC);
 
@@ -216,6 +229,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicReplicatedAsync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED, 0, ATOMIC, PRIMARY_SYNC);
 
@@ -225,6 +239,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicReplicatedAsyncFullSync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED, 0, ATOMIC, FULL_SYNC);
 
@@ -234,6 +249,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicOnheapWithoutBackupAsync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, ATOMIC, PRIMARY_SYNC);
 
@@ -243,6 +259,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOnheapTwoBackupAsync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL, PRIMARY_SYNC);
 
@@ -252,6 +269,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOnheapAsync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, PRIMARY_SYNC);
 
@@ -261,6 +279,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxOnheapAsyncFullSync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, FULL_SYNC);
 
@@ -270,6 +289,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxOnheapTwoBackupAsync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT, PRIMARY_SYNC);
 
@@ -279,6 +299,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxOnheapAsync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL_SNAPSHOT, PRIMARY_SYNC);
 
@@ -288,6 +309,7 @@ public class CacheContinuousQueryOrderingEventTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxOnheapAsyncFullSync() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL_SNAPSHOT, FULL_SYNC);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index af92c31..7a73579 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -76,6 +76,9 @@ import 
org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -99,6 +102,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryRandomOperationsTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -144,6 +148,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFilterAndFactoryProvided() throws Exception {
         final CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -188,6 +193,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -200,6 +206,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomic() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -212,6 +219,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicAllNodes() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -224,6 +232,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicReplicated() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -236,6 +245,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicReplicatedAllNodes() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -248,6 +258,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicReplicatedClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -260,6 +271,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicNoBackups() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -272,6 +284,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicNoBackupsAllNodes() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -284,6 +297,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicNoBackupsClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -296,6 +310,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTx() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -308,6 +323,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxAllNodes() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -320,6 +336,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxExplicit() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -332,6 +349,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTx() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -344,6 +362,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxAllNodes() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -356,6 +375,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxExplicit() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -368,6 +388,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveAtomicWithoutBackup() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -380,6 +401,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveAtomicWithoutBackupWithStore() throws 
Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -392,6 +414,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveAtomic() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -404,6 +427,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveAtomicWithStore() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -416,6 +440,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveTx() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -428,6 +453,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveTxWithStore() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -440,6 +466,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveReplicatedTx() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -452,6 +479,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveReplicatedTxWithStore() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -464,6 +492,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveMvccTx() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -476,6 +505,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveMvccTxWithStore() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-8582";);
 
@@ -490,6 +520,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveReplicatedMvccTx() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -502,6 +533,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveReplicatedMvccTxWithStore() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-8582";);
 
@@ -516,6 +548,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveReplicatedAtomic() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -528,6 +561,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleRemoveReplicatedAtomicWithStore() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -823,6 +857,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -835,6 +870,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxClientExplicit() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -847,6 +883,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicated() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -859,6 +896,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -871,6 +909,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxNoBackups() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -883,6 +922,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxNoBackupsAllNodes() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -895,6 +935,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxNoBackupsExplicit() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -907,6 +948,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxNoBackupsClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -919,6 +961,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -931,6 +974,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxClientExplicit() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             1,
@@ -943,6 +987,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxReplicated() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -955,6 +1000,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxReplicatedClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(REPLICATED,
             0,
@@ -967,6 +1013,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxNoBackups() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -979,6 +1026,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxNoBackupsAllNodes() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -991,6 +1039,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxNoBackupsExplicit() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,
@@ -1003,6 +1052,7 @@ public class CacheContinuousQueryRandomOperationsTest 
extends GridCommonAbstract
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxNoBackupsClient() throws Exception {
         CacheConfiguration<Object, Object> ccfg = 
cacheConfiguration(PARTITIONED,
             0,

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
index fc86a35..44d51d0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
@@ -65,6 +65,9 @@ import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -80,6 +83,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariationsAbstractTest {
     /** */
     private static final int ITERATION_CNT = 20;
@@ -105,6 +109,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationJCacheApiKeepBinary() throws Exception {
         testRandomOperation(true, false, false, false, true);
     }
@@ -112,6 +117,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationJCacheApiAsyncCallback() throws Exception {
         testRandomOperation(true, false, false, true, false);
     }
@@ -119,6 +125,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationJCacheApiWithFilter() throws Exception {
         testRandomOperation(true, false, true, false, false);
     }
@@ -126,6 +133,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationJCacheApiWithFilterAsyncCallback() throws 
Exception {
         testRandomOperation(true, false, true, true, false);
     }
@@ -133,6 +141,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationJCacheApiSyncWithFilter() throws Exception {
         testRandomOperation(true, true, true, false, false);
     }
@@ -140,6 +149,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperation() throws Exception {
         testRandomOperation(true, true, false, false, false);
     }
@@ -147,6 +157,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationWithKeepBinary() throws Exception {
         testRandomOperation(true, true, false, false, true);
     }
@@ -154,6 +165,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationWithAsyncCallback() throws Exception {
         testRandomOperation(true, true, false, true, false);
     }
@@ -161,6 +173,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationWithFilter() throws Exception {
         testRandomOperation(true, true, true, false, false);
     }
@@ -168,6 +181,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationWithFilterWithKeepBinary() throws Exception 
{
         testRandomOperation(true, true, true, false, true);
     }
@@ -175,6 +189,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperationWithFilterAsyncCallback() throws Exception {
         testRandomOperation(true, true, true, true, false);
     }
@@ -623,6 +638,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRemoveRemoveScenario() throws Exception {
         runInAllDataModes(new TestRunnable() {
             @Override public void run() throws Exception {
@@ -717,7 +733,7 @@ public class CacheContinuousQueryVariationsTest extends 
IgniteCacheConfigVariati
                         while (evts.size() != 10) {
                             Thread.sleep(100);
                         }
-                        
+
                         evts.clear();
 
                         log.info("Finish iteration: " + i);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerFailoverTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerFailoverTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerFailoverTest.java
index 241dc2a..46edec8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerFailoverTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerFailoverTest.java
@@ -40,6 +40,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 java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -48,6 +51,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousWithTransformerFailoverTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -83,6 +87,7 @@ public class CacheContinuousWithTransformerFailoverTest 
extends GridCommonAbstra
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerNodeLeft() throws Exception {
         startGrids(3);
 
@@ -150,6 +155,7 @@ public class CacheContinuousWithTransformerFailoverTest 
extends GridCommonAbstra
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTransformerException() throws Exception {
         try {
             startGrids(1);
@@ -204,6 +210,7 @@ public class CacheContinuousWithTransformerFailoverTest 
extends GridCommonAbstra
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testCrossCallback() throws Exception {
         startGrids(2);
         try {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
index 3768aad..5c83126 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
@@ -47,11 +47,15 @@ import org.apache.ignite.lang.IgniteAsyncCallback;
 import org.apache.ignite.lang.IgniteClosure;
 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 java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  */
+@RunWith(JUnit4.class)
 public class CacheContinuousWithTransformerReplicatedSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final int DFLT_ENTRY_CNT = 10;
@@ -144,6 +148,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformer() throws Exception {
         runContinuousQueryWithTransformer(SKIP_EVT_FILTER, DFLT_ENTRY_CNT, 
SKIP_KEEP_BINARY, false);
     }
@@ -151,6 +156,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerAsync() throws Exception {
         runContinuousQueryWithTransformer(SKIP_EVT_FILTER, DFLT_ENTRY_CNT, 
SKIP_KEEP_BINARY, true);
     }
@@ -158,6 +164,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerAndRegularListener() throws 
Exception {
         runContinuousQueryWithTransformer(SKIP_EVT_FILTER, DFLT_ENTRY_CNT, 
SKIP_KEEP_BINARY, false);
     }
@@ -165,6 +172,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerAndRegularListenerAsync() throws 
Exception {
         runContinuousQueryWithTransformer(SKIP_EVT_FILTER, DFLT_ENTRY_CNT, 
SKIP_KEEP_BINARY, true);
     }
@@ -172,6 +180,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerWithFilter() throws Exception {
         runContinuousQueryWithTransformer(ADD_EVT_FILTER, DFLT_ENTRY_CNT / 2, 
SKIP_KEEP_BINARY, false);
     }
@@ -179,6 +188,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerWithFilterAsync() throws 
Exception {
         runContinuousQueryWithTransformer(ADD_EVT_FILTER, DFLT_ENTRY_CNT / 2, 
SKIP_KEEP_BINARY, true);
     }
@@ -186,6 +196,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerAndRegularListenerWithFilter() 
throws Exception {
         runContinuousQueryWithTransformer(ADD_EVT_FILTER, DFLT_ENTRY_CNT / 2, 
KEEP_BINARY, false);
     }
@@ -193,6 +204,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void 
testContinuousWithTransformerAndRegularListenerWithFilterAsync() throws 
Exception {
         runContinuousQueryWithTransformer(ADD_EVT_FILTER, DFLT_ENTRY_CNT / 2, 
KEEP_BINARY, true);
     }
@@ -200,6 +212,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerKeepBinary() throws Exception {
         runContinuousQueryWithTransformer(SKIP_EVT_FILTER, DFLT_ENTRY_CNT, 
KEEP_BINARY, false);
     }
@@ -207,6 +220,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerKeepBinaryAsync() throws 
Exception {
         runContinuousQueryWithTransformer(SKIP_EVT_FILTER, DFLT_ENTRY_CNT, 
KEEP_BINARY, true);
     }
@@ -214,6 +228,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerAndRegularListenerKeepBinary() 
throws Exception {
         runContinuousQueryWithTransformer(SKIP_EVT_FILTER, DFLT_ENTRY_CNT, 
KEEP_BINARY, false);
     }
@@ -221,6 +236,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void 
testContinuousWithTransformerAndRegularListenerKeepBinaryAsync() throws 
Exception {
         runContinuousQueryWithTransformer(SKIP_EVT_FILTER, DFLT_ENTRY_CNT, 
KEEP_BINARY, true);
     }
@@ -228,6 +244,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerWithFilterKeepBinary() throws 
Exception {
         runContinuousQueryWithTransformer(ADD_EVT_FILTER, DFLT_ENTRY_CNT / 2, 
KEEP_BINARY, false);
     }
@@ -235,6 +252,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContinuousWithTransformerWithFilterKeepBinaryAsync() 
throws Exception {
         runContinuousQueryWithTransformer(ADD_EVT_FILTER, DFLT_ENTRY_CNT / 2, 
KEEP_BINARY, true);
     }
@@ -242,6 +260,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void 
testContinuousWithTransformerAndRegularListenerWithFilterKeepBinary() throws 
Exception {
         runContinuousQueryWithTransformer(ADD_EVT_FILTER, DFLT_ENTRY_CNT / 2, 
KEEP_BINARY, false);
     }
@@ -249,6 +268,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void 
testContinuousWithTransformerAndRegularListenerWithFilterKeepBinaryAsync() 
throws Exception {
         runContinuousQueryWithTransformer(ADD_EVT_FILTER, DFLT_ENTRY_CNT / 2, 
KEEP_BINARY, true);
     }
@@ -256,6 +276,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTransformerReturnNull() throws Exception {
         Ignite ignite = gridToRunQuery();
 
@@ -305,6 +326,7 @@ public class 
CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExpired() throws Exception {
         Ignite ignite = gridToRunQuery();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
index 6e4a9e5..9c15958 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
@@ -43,6 +43,9 @@ import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.jetbrains.annotations.NotNull;
+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.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
@@ -57,6 +60,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheEntryProcessorExternalizableFailedTest extends 
GridCommonAbstractTest {
     /** */
     private static final int EXPECTED_VALUE = 42;
@@ -122,6 +126,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticFullSync() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2);
 
@@ -143,6 +148,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimistic() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2);
 
@@ -164,6 +170,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticWithNearCache() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2)
             .setNearConfiguration(new NearCacheConfiguration<>());
@@ -186,6 +193,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticFullSyncWithNearCache() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2)
             .setNearConfiguration(new NearCacheConfiguration<>());
@@ -208,6 +216,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticOnePhaseCommit() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1);
 
@@ -229,6 +238,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticOnePhaseCommitWithNearCache() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1)
             .setNearConfiguration(new NearCacheConfiguration<>());
@@ -251,6 +261,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticOnePhaseCommitFullSync() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1);
 
@@ -272,6 +283,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticOnePhaseCommitFullSyncWithNearCache() throws 
Exception {
         CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1)
             .setNearConfiguration(new NearCacheConfiguration<>());
@@ -294,6 +306,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticOnePhaseCommit() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1);
 
@@ -315,6 +328,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticOnePhaseCommitWithNearCache() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1)
             .setNearConfiguration(new NearCacheConfiguration<>());
@@ -337,6 +351,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticOnePhaseCommitFullSync() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1);
 
@@ -358,6 +373,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticOnePhaseCommitFullSyncWithNearCache() throws 
Exception {
         CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1)
             .setNearConfiguration(new NearCacheConfiguration<>());
@@ -380,6 +396,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimistic() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2);
 
@@ -401,6 +418,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticWithNearCache() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2)
             .setNearConfiguration(new NearCacheConfiguration<>());
@@ -423,6 +441,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticFullSync() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2);
 
@@ -444,6 +463,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticFullSyncWithNearCache() throws Exception {
         CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2)
             .setNearConfiguration(new NearCacheConfiguration<>());
@@ -466,6 +486,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccPessimisticOnePhaseCommit() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10483";);
 
@@ -481,6 +502,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccPessimisticOnePhaseCommitWithNearCache() throws 
Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7187";);
 
@@ -497,6 +519,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccPessimisticOnePhaseCommitFullSync() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10483";);
 
@@ -512,6 +535,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccPessimisticOnePhaseCommitFullSyncWithNearCache() 
throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7187";);
 
@@ -528,6 +552,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccPessimistic() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10483";);
 
@@ -543,6 +568,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccPessimisticWithNearCache() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7187";);
 
@@ -559,6 +585,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccPessimisticFullSync() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10483";);
 
@@ -574,6 +601,7 @@ public class CacheEntryProcessorExternalizableFailedTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccPessimisticFullSyncWithNearCache() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7187";);
 

Reply via email to