http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
index 8cb0885..863c396 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
@@ -46,6 +46,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 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 org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -65,6 +68,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
  * Test for TRANSFORM events recording.
  */
 @SuppressWarnings("ConstantConditions")
+@RunWith(JUnit4.class)
 public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest {
     /** Nodes count. */
     private static final int GRID_CNT = 3;
@@ -279,6 +283,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxLocalOptimisticRepeatableRead() throws Exception {
         checkTx(LOCAL, OPTIMISTIC, REPEATABLE_READ);
     }
@@ -288,6 +293,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxLocalOptimisticReadCommitted() throws Exception {
         checkTx(LOCAL, OPTIMISTIC, READ_COMMITTED);
     }
@@ -297,6 +303,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxLocalOptimisticSerializable() throws Exception {
         checkTx(LOCAL, OPTIMISTIC, SERIALIZABLE);
     }
@@ -306,6 +313,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxLocalPessimisticRepeatableRead() throws Exception {
         checkTx(LOCAL, PESSIMISTIC, REPEATABLE_READ);
     }
@@ -315,6 +323,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxLocalPessimisticReadCommitted() throws Exception {
         checkTx(LOCAL, PESSIMISTIC, READ_COMMITTED);
     }
@@ -324,6 +333,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxLocalPessimisticSerializable() throws Exception {
         checkTx(LOCAL, PESSIMISTIC, SERIALIZABLE);
     }
@@ -333,6 +343,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxLocalPessimisticRepeatableRead() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-9530";);
 
@@ -344,6 +355,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxPartitionedOptimisticRepeatableRead() throws Exception {
         checkTx(PARTITIONED, OPTIMISTIC, REPEATABLE_READ);
     }
@@ -353,6 +365,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxPartitionedOptimisticReadCommitted() throws Exception {
         checkTx(PARTITIONED, OPTIMISTIC, READ_COMMITTED);
     }
@@ -362,6 +375,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxPartitionedOptimisticSerializable() throws Exception {
         checkTx(PARTITIONED, OPTIMISTIC, SERIALIZABLE);
     }
@@ -371,6 +385,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxPartitionedPessimisticRepeatableRead() throws Exception {
         checkTx(PARTITIONED, PESSIMISTIC, REPEATABLE_READ);
     }
@@ -380,6 +395,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxPartitionedPessimisticReadCommitted() throws Exception {
         checkTx(PARTITIONED, PESSIMISTIC, READ_COMMITTED);
     }
@@ -389,6 +405,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxPartitionedPessimisticSerializable() throws Exception {
         checkTx(PARTITIONED, PESSIMISTIC, SERIALIZABLE);
     }
@@ -398,6 +415,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxPartitionedPessimisticRepeatableRead() throws 
Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-9321";);
 
@@ -410,6 +428,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedOptimisticRepeatableRead() throws Exception {
         checkTx(REPLICATED, OPTIMISTIC, REPEATABLE_READ);
     }
@@ -419,6 +438,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedOptimisticReadCommitted() throws Exception {
         checkTx(REPLICATED, OPTIMISTIC, READ_COMMITTED);
     }
@@ -428,6 +448,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedOptimisticSerializable() throws Exception {
         checkTx(REPLICATED, OPTIMISTIC, SERIALIZABLE);
     }
@@ -437,6 +458,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedPessimisticRepeatableRead() throws Exception {
         checkTx(REPLICATED, PESSIMISTIC, REPEATABLE_READ);
     }
@@ -446,6 +468,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedPessimisticReadCommitted() throws Exception {
         checkTx(REPLICATED, PESSIMISTIC, READ_COMMITTED);
     }
@@ -455,6 +478,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTxReplicatedPessimisticSerializable() throws Exception {
         checkTx(REPLICATED, PESSIMISTIC, SERIALIZABLE);
     }
@@ -464,6 +488,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccTxReplicatedPessimisticRepeatableRead() throws 
Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-9321";);
 
@@ -475,6 +500,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicLocal() throws Exception {
         checkAtomic(LOCAL);
     }
@@ -484,6 +510,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicPartitioned() throws Exception {
         checkAtomic(PARTITIONED);
     }
@@ -493,6 +520,7 @@ public class GridCacheTransformEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicReplicated() throws Exception {
         checkAtomic(REPLICATED);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
index edfeb96..68c7068 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
@@ -51,11 +51,15 @@ 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;
 
 /**
  * Tests specific scenario when binary metadata should be updated from a 
system thread
  * and topology has been already changed since the original transaction start.
  */
+@RunWith(JUnit4.class)
 public class IgniteBinaryMetadataUpdateChangingTopologySelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -92,6 +96,7 @@ public class 
IgniteBinaryMetadataUpdateChangingTopologySelfTest extends GridComm
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNoDeadlockOptimistic() throws Exception {
         int key1 = primaryKey(ignite(1).cache("cache"));
         int key2 = primaryKey(ignite(2).cache("cache"));
@@ -131,6 +136,7 @@ public class 
IgniteBinaryMetadataUpdateChangingTopologySelfTest extends GridComm
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNoDeadlockInvoke() throws Exception {
         int key1 = primaryKey(ignite(1).cache("cache"));
         int key2 = primaryKey(ignite(2).cache("cache"));

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
index b95ad4a..197dc6a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
@@ -41,6 +41,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.CacheAtomicityMode.TRANSACTIONAL;
@@ -50,6 +53,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteBinaryMetadataUpdateNodeRestartTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -81,7 +85,7 @@ public class IgniteBinaryMetadataUpdateNodeRestartTest 
extends GridCommonAbstrac
 
         CacheConfiguration ccfg1 = cacheConfiguration(TX_CACHE, TRANSACTIONAL);
         CacheConfiguration ccfg2 = cacheConfiguration(ATOMIC_CACHE, ATOMIC);
-        
+
         cfg.setCacheConfiguration(ccfg1, ccfg2);
 
         cfg.setClientMode(client);
@@ -121,6 +125,7 @@ public class IgniteBinaryMetadataUpdateNodeRestartTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeRestart() 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/distributed/IgniteCache150ClientsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
index 6230501..eab5e1a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.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.CacheMode.PARTITIONED;
 import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
@@ -44,6 +47,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCache150ClientsTest extends GridCommonAbstractTest {
     /** */
     protected static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -111,6 +115,7 @@ public class IgniteCache150ClientsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void test150Clients() throws Exception {
         Ignite srv = startGrid(0);
 
@@ -196,4 +201,4 @@ public class IgniteCache150ClientsTest extends 
GridCommonAbstractTest {
                 ignite.cluster().nodes().size());
         }
     }
-}
\ 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/distributed/IgniteCacheAtomicNodeRestartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index 6b62912..66e7b3e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -19,12 +19,16 @@ package 
org.apache.ignite.internal.processors.cache.distributed;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import 
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNodeRestartTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheAtomicNodeRestartTest extends 
GridCachePartitionedNodeRestartTest {
     /** {@inheritDoc} */
     @Override protected CacheAtomicityMode atomicityMode() {
@@ -32,7 +36,8 @@ public class IgniteCacheAtomicNodeRestartTest extends 
GridCachePartitionedNodeRe
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testRestartWithPutFourNodesNoBackups() {
         fail("https://issues.apache.org/jira/browse/IGNITE-1587";);
     }
-}
\ 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/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
index 7711bbb..c27bb20 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
@@ -38,6 +38,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.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC;
@@ -48,6 +51,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheClientMultiNodeUpdateTopologyLockTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -78,6 +82,7 @@ public class IgniteCacheClientMultiNodeUpdateTopologyLockTest 
extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTx() throws Exception {
         startGrids(3);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index dd6e36e..13d83d4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -92,6 +92,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 org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -106,6 +109,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheClientNodeChangingTopologyTest extends 
GridCommonAbstractTest {
     /** */
     protected static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -141,10 +145,8 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     }
 
     /** {@inheritDoc} */
-    @Override public void beforeTestsStarted() throws Exception {
+    @Override public void beforeTest() throws Exception {
         
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.ENTRY_LOCK);
-
-        super.beforeTestsStarted();
     }
 
     /** {@inheritDoc} */
@@ -157,6 +159,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicPutAllPrimaryMode() throws Exception {
         atomicPut(true, null);
     }
@@ -164,6 +167,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicPutAllNearEnabledPrimaryMode() throws Exception {
         atomicPut(true, new NearCacheConfiguration());
     }
@@ -171,6 +175,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicPutPrimaryMode() throws Exception {
         atomicPut(false, null);
     }
@@ -296,6 +301,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicNoRemapPrimaryMode() throws Exception {
         atomicNoRemap();
     }
@@ -383,6 +389,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicGetAndPutPrimaryMode() throws Exception {
         atomicGetAndPut();
     }
@@ -450,6 +457,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxPutAll() throws Exception {
         ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 
@@ -517,6 +525,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTx() throws Exception {
         pessimisticTx(null);
     }
@@ -524,6 +533,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTxNearEnabled() throws Exception {
         pessimisticTx(new NearCacheConfiguration());
     }
@@ -742,6 +752,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTx2() throws Exception {
         ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 
@@ -835,6 +846,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTxNearEnabledNoRemap() throws Exception {
         pessimisticTxNoRemap(new NearCacheConfiguration());
     }
@@ -842,6 +854,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTxNoRemap() throws Exception {
         pessimisticTxNoRemap(null);
     }
@@ -956,6 +969,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTx3() throws Exception {
         for (int iter = 0; iter < 5; iter++) {
             info("Iteration: " + iter);
@@ -1021,6 +1035,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticSerializableTx() throws Exception {
         optimisticSerializableTx(null);
     }
@@ -1028,6 +1043,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticSerializableTxNearEnabled() throws Exception {
         optimisticSerializableTx(new NearCacheConfiguration());
     }
@@ -1173,6 +1189,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLock() throws Exception {
         lock(null);
     }
@@ -1180,6 +1197,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockNearEnabled() throws Exception {
         lock(new NearCacheConfiguration());
     }
@@ -1310,6 +1328,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTxMessageClientFirstFlag() throws Exception {
         ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 
@@ -1410,6 +1429,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticTxMessageClientFirstFlag() throws Exception {
         ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 
@@ -1505,6 +1525,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockRemoveAfterClientFailed() throws Exception {
         ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 
@@ -1563,6 +1584,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockFromClientBlocksExchange() throws Exception {
         ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 
@@ -1738,6 +1760,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicPrimaryPutAllMultinode() throws Exception {
         multinode(ATOMIC, TestType.PUT_ALL);
     }
@@ -1745,6 +1768,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticTxPutAllMultinode() throws Exception {
         multinode(TRANSACTIONAL, TestType.OPTIMISTIC_TX);
     }
@@ -1752,6 +1776,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimisticSerializableTxPutAllMultinode() throws Exception 
{
         multinode(TRANSACTIONAL, TestType.OPTIMISTIC_SERIALIZABLE_TX);
     }
@@ -1759,6 +1784,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPessimisticTxPutAllMultinode() throws Exception {
         multinode(TRANSACTIONAL, TestType.PESSIMISTIC_TX);
     }
@@ -1766,6 +1792,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockAllMultinode() throws Exception {
         multinode(TRANSACTIONAL, TestType.LOCK);
     }
@@ -2001,6 +2028,7 @@ public class IgniteCacheClientNodeChangingTopologyTest 
extends GridCommonAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServersLeaveOnStart() throws Exception {
         ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
index cdb6913..333cdbc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java
@@ -27,12 +27,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.CacheRebalanceMode.SYNC;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheClientNodeConcurrentStart extends 
GridCommonAbstractTest {
     /** */
     protected static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -76,6 +80,7 @@ public class IgniteCacheClientNodeConcurrentStart extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentStart() throws Exception {
         ThreadLocalRandom rnd = ThreadLocalRandom.current();
 
@@ -111,4 +116,4 @@ public class IgniteCacheClientNodeConcurrentStart extends 
GridCommonAbstractTest
             }
         }
     }
-}
\ 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/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
index 5101402..a2e9458 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java
@@ -57,12 +57,16 @@ 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.internal.processors.cache.ExchangeContext.IGNITE_EXCHANGE_COMPATIBILITY_VER_1;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheClientNodePartitionsExchangeTest extends 
GridCommonAbstractTest {
     /** */
     protected static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -97,6 +101,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerNodeLeave() throws Exception {
         Ignite ignite0 = startGrid(0);
 
@@ -146,6 +151,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSkipPreload() throws Exception {
         Ignite ignite0 = startGrid(0);
 
@@ -198,6 +204,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionsExchange() throws Exception {
         partitionsExchange(false);
     }
@@ -205,6 +212,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionsExchangeCompatibilityMode() throws Exception {
         System.setProperty(IGNITE_EXCHANGE_COMPATIBILITY_VER_1, "true");
 
@@ -474,6 +482,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientOnlyCacheStart() throws Exception {
         clientOnlyCacheStart(false, false);
     }
@@ -481,6 +490,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNearOnlyCacheStart() throws Exception {
         clientOnlyCacheStart(true, false);
     }
@@ -488,6 +498,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientOnlyCacheStartFromServerNode() throws Exception {
         clientOnlyCacheStart(false, true);
     }
@@ -495,6 +506,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNearOnlyCacheStartFromServerNode() throws Exception {
         clientOnlyCacheStart(true, true);
     }
@@ -691,4 +703,4 @@ public class IgniteCacheClientNodePartitionsExchangeTest 
extends GridCommonAbstr
         }
     }
 
-}
\ 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/distributed/IgniteCacheClientReconnectTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java
index a0796a3..39aad05 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java
@@ -40,6 +40,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 java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -49,6 +52,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Test for customer scenario.
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheClientReconnectTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -129,6 +133,7 @@ public class IgniteCacheClientReconnectTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed
      */
+    @Test
     public void testClientReconnectOnExchangeHistoryExhaustion() throws 
Exception {
         
System.setProperty(IgniteSystemProperties.IGNITE_EXCHANGE_HISTORY_SIZE, "1");
 
@@ -161,6 +166,7 @@ public class IgniteCacheClientReconnectTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed
      */
+    @Test
     public void testClientInForceServerModeStopsOnExchangeHistoryExhaustion() 
throws Exception {
         
System.setProperty(IgniteSystemProperties.IGNITE_EXCHANGE_HISTORY_SIZE, "1");
 
@@ -268,6 +274,7 @@ public class IgniteCacheClientReconnectTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientReconnect() throws Exception {
         startGrids(SRV_CNT);
 
@@ -342,4 +349,4 @@ public class IgniteCacheClientReconnectTest extends 
GridCommonAbstractTest {
             assertEquals(key, cache.get(key));
         }
     }
-}
\ 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/distributed/IgniteCacheConnectionRecoveryTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
index cc92ec1..51d09f1 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
@@ -40,6 +40,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 java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -50,6 +53,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheConnectionRecoveryTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -95,6 +99,7 @@ public class IgniteCacheConnectionRecoveryTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     @SuppressWarnings("unchecked")
     public void testConnectionRecovery() throws Exception {
         final Map<Integer, Integer> data = new TreeMap<>();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
index 0b021a8..70f3d0c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
@@ -36,10 +36,14 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.MvccFeatureChecker;
 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 IgniteCacheCreatePutMultiNodeSelfTest extends 
GridCommonAbstractTest {
     /** Grid count. */
     private static final int GRID_CNT = 4;
@@ -69,6 +73,7 @@ public class IgniteCacheCreatePutMultiNodeSelfTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartNodes() throws Exception {
         try {
             Collection<IgniteInternalFuture<?>> futs = new 
ArrayList<>(GRID_CNT);
@@ -156,4 +161,4 @@ public class IgniteCacheCreatePutMultiNodeSelfTest extends 
GridCommonAbstractTes
 
         return grid.getOrCreateCache(ccfg);
     }
-}
\ 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/distributed/IgniteCacheCreatePutTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
index 5d6e895..3ab7e0e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.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 org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -46,6 +49,7 @@ import static 
org.apache.ignite.testframework.MvccFeatureChecker.assertMvccWrite
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheCreatePutTest extends GridCommonAbstractTest {
     /** Grid count. */
     private static final int GRID_CNT = 3;
@@ -100,6 +104,7 @@ public class IgniteCacheCreatePutTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartNodes() throws Exception {
         long stopTime = System.currentTimeMillis() + 2 * 60_000;
 
@@ -142,6 +147,7 @@ public class IgniteCacheCreatePutTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUpdatesAndCacheStart() throws Exception {
         final int NODES = 4;
 
@@ -257,4 +263,4 @@ public class IgniteCacheCreatePutTest extends 
GridCommonAbstractTest {
 
         return ccfg;
     }
-}
\ 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/distributed/IgniteCacheFailedUpdateResponseTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheFailedUpdateResponseTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheFailedUpdateResponseTest.java
index cf7489f..57b1c8c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheFailedUpdateResponseTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheFailedUpdateResponseTest.java
@@ -42,6 +42,9 @@ import 
org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 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.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
@@ -55,6 +58,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  * Checks that no future hangs on non-serializable exceptions and values.
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheFailedUpdateResponseTest extends 
GridCommonAbstractTest {
     /** Atomic cache. */
     private static final String ATOMIC_CACHE = "atomic";
@@ -115,6 +119,7 @@ public class IgniteCacheFailedUpdateResponseTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInvokeAtomic() throws Exception {
         testInvoke(atomicCache);
         testInvokeAll(atomicCache);
@@ -123,6 +128,7 @@ public class IgniteCacheFailedUpdateResponseTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInvokeTx() throws Exception {
         testInvoke(txCache);
         testInvokeAll(txCache);
@@ -149,6 +155,7 @@ public class IgniteCacheFailedUpdateResponseTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInvokeMvccTx() throws Exception {
         testInvoke(mvccTxCache);
         testInvokeAll(mvccTxCache);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
index ba22048..18039dc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
@@ -40,6 +40,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.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -49,6 +52,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheGetRestartTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -119,6 +123,7 @@ public class IgniteCacheGetRestartTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetRestartReplicated() throws Exception {
         CacheConfiguration<Object, Object> cache = 
cacheConfiguration(REPLICATED, 0, false);
 
@@ -128,6 +133,7 @@ public class IgniteCacheGetRestartTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetRestartPartitioned1() throws Exception {
         CacheConfiguration<Object, Object> cache = 
cacheConfiguration(PARTITIONED, 1, false);
 
@@ -137,6 +143,7 @@ public class IgniteCacheGetRestartTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetRestartPartitioned2() throws Exception {
         CacheConfiguration<Object, Object> cache = 
cacheConfiguration(PARTITIONED, 2, false);
 
@@ -146,6 +153,7 @@ public class IgniteCacheGetRestartTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetRestartPartitionedNearEnabled() throws Exception {
         CacheConfiguration<Object, Object> cache = 
cacheConfiguration(PARTITIONED, 1, true);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGroupsPartitionLossPolicySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGroupsPartitionLossPolicySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGroupsPartitionLossPolicySelfTest.java
index 1862553..9d3ee2e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGroupsPartitionLossPolicySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGroupsPartitionLossPolicySelfTest.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.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -48,6 +51,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheGroupsPartitionLossPolicySelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -100,6 +104,7 @@ public class IgniteCacheGroupsPartitionLossPolicySelfTest 
extends GridCommonAbst
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadOnlySafe() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_ONLY_SAFE;
 
@@ -109,6 +114,7 @@ public class IgniteCacheGroupsPartitionLossPolicySelfTest 
extends GridCommonAbst
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadOnlyAll() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_ONLY_ALL;
 
@@ -118,6 +124,7 @@ public class IgniteCacheGroupsPartitionLossPolicySelfTest 
extends GridCommonAbst
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafe() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -127,6 +134,7 @@ public class IgniteCacheGroupsPartitionLossPolicySelfTest 
extends GridCommonAbst
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteAll() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_ALL;
 
@@ -136,6 +144,7 @@ public class IgniteCacheGroupsPartitionLossPolicySelfTest 
extends GridCommonAbst
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testIgnore() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-5078";);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
index 1e7b32a..6482fbf 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
@@ -41,6 +41,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi;
 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.PARTITIONED;
@@ -49,6 +52,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheManyClientsTest extends GridCommonAbstractTest {
     /** */
     protected static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -114,6 +118,7 @@ public class IgniteCacheManyClientsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testManyClientsClientDiscovery() throws Throwable {
         clientDiscovery = true;
 
@@ -123,6 +128,7 @@ public class IgniteCacheManyClientsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testManyClientsSequentiallyClientDiscovery() throws Exception {
         clientDiscovery = true;
 
@@ -132,6 +138,7 @@ public class IgniteCacheManyClientsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testManyClientsForceServerMode() throws Throwable {
         manyClientsPutGet();
     }
@@ -331,4 +338,4 @@ public class IgniteCacheManyClientsTest extends 
GridCommonAbstractTest {
             stop.set(true);
         }
     }
-}
\ 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/distributed/IgniteCacheMessageRecoveryAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
index 8b75695..944f86f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
@@ -38,6 +38,9 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 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.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -45,6 +48,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Tests message delivery after reconnection.
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteCacheMessageRecoveryAbstractTest extends 
GridCommonAbstractTest {
     /** Grid count. */
     public static final int GRID_CNT = 3;
@@ -107,6 +111,7 @@ public abstract class 
IgniteCacheMessageRecoveryAbstractTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMessageRecovery() throws Exception {
         final Ignite ignite = grid(0);
 
@@ -195,4 +200,4 @@ public abstract class 
IgniteCacheMessageRecoveryAbstractTest extends GridCommonA
 
         return closed;
     }
-}
\ 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/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
index 7689bc6..805e005 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
@@ -34,6 +34,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;
@@ -44,6 +47,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheMessageRecoveryIdleConnectionTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -85,6 +89,7 @@ public class IgniteCacheMessageRecoveryIdleConnectionTest 
extends GridCommonAbst
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCacheOperationsIdleConnectionCloseTx() throws Exception {
         cacheOperationsIdleConnectionClose(TRANSACTIONAL);
     }
@@ -92,6 +97,7 @@ public class IgniteCacheMessageRecoveryIdleConnectionTest 
extends GridCommonAbst
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCacheOperationsIdleConnectionCloseMvccTx() throws 
Exception {
         cacheOperationsIdleConnectionClose(TRANSACTIONAL_SNAPSHOT);
     }
@@ -99,6 +105,7 @@ public class IgniteCacheMessageRecoveryIdleConnectionTest 
extends GridCommonAbst
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCacheOperationsIdleConnectionCloseAtomic() throws 
Exception {
         cacheOperationsIdleConnectionClose(ATOMIC);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
index 3ba319b..fa1488c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
@@ -31,10 +31,14 @@ 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;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheMessageWriteTimeoutTest extends GridCommonAbstractTest 
{
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -74,6 +78,7 @@ public class IgniteCacheMessageWriteTimeoutTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMessageQueueLimit() throws Exception {
         for (int i = 0; i < 3; 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/distributed/IgniteCacheNearRestartRollbackSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
index d9a8e58..8e1179a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
@@ -49,6 +49,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 
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
 import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -56,6 +59,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheNearRestartRollbackSelfTest extends 
GridCommonAbstractTest {
     /** Shared IP finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -128,6 +132,7 @@ public class IgniteCacheNearRestartRollbackSelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRestarts() throws Exception {
         startGrids(4);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
index 002a28d..b34da81 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNodeJoinAbstractTest.java
@@ -28,12 +28,16 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
 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.cache.CacheMode.PARTITIONED;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteCacheNodeJoinAbstractTest extends 
IgniteCacheAbstractTest {
     /** {@inheritDoc} */
     @Override protected CacheMode cacheMode() {
@@ -57,6 +61,7 @@ public abstract class IgniteCacheNodeJoinAbstractTest extends 
IgniteCacheAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGet() throws Exception {
         final IgniteCache<Integer, Integer> cache = jcache(0);
 
@@ -111,6 +116,7 @@ public abstract class IgniteCacheNodeJoinAbstractTest 
extends IgniteCacheAbstrac
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testScanQuery() throws Exception {
         final IgniteCache<Integer, Integer> cache = jcache(0);
 
@@ -148,4 +154,4 @@ public abstract class IgniteCacheNodeJoinAbstractTest 
extends IgniteCacheAbstrac
             stopGrid(1);
         }
     }
-}
\ 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/distributed/IgniteCachePartitionLossPolicySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
index 226ae22..3855c39 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
@@ -60,6 +60,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 java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -69,6 +72,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -163,6 +167,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadOnlySafe() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_ONLY_SAFE;
 
@@ -172,6 +177,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadOnlySafeWithPersistence() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_ONLY_SAFE;
 
@@ -183,6 +189,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadOnlyAll() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_ONLY_ALL;
 
@@ -192,6 +199,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadOnlyAllWithPersistence() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10041";);
 
@@ -205,6 +213,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafe() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -214,6 +223,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeWithPersistence() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -225,6 +235,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteAll() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_ALL;
 
@@ -234,6 +245,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteAllWithPersistence() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10041";);
 
@@ -247,6 +259,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeAfterKillTwoNodes() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -256,6 +269,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeAfterKillTwoNodesWithPersistence() throws 
Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -267,6 +281,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeAfterKillTwoNodesWithDelay() throws Exception 
{
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -276,6 +291,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeAfterKillTwoNodesWithDelayWithPersistence() 
throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -287,6 +303,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeWithBackupsAfterKillThreeNodes() throws 
Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -298,6 +315,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void 
testReadWriteSafeWithBackupsAfterKillThreeNodesWithPersistence() throws 
Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -311,6 +329,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeAfterKillCrd() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -320,6 +339,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeAfterKillCrdWithPersistence() throws 
Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -331,6 +351,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeWithBackups() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -342,6 +363,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeWithBackupsWithPersistence() throws Exception 
{
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -355,6 +377,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeWithBackupsAfterKillCrd() throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -366,6 +389,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadWriteSafeWithBackupsAfterKillCrdWithPersistence() 
throws Exception {
         partLossPlc = PartitionLossPolicy.READ_WRITE_SAFE;
 
@@ -379,6 +403,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testIgnore() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-5078";);
 
@@ -390,6 +415,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testIgnoreWithPersistence() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-5078";);
 
@@ -405,6 +431,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testIgnoreKillThreeNodes() throws Exception {
         partLossPlc = PartitionLossPolicy.IGNORE;
 
@@ -419,6 +446,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testIgnoreKillThreeNodesWithPersistence() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10041";);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
index 2482a8e..5e3f874 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
@@ -33,6 +33,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 org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -47,6 +50,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCachePrimarySyncTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -110,6 +114,7 @@ public class IgniteCachePrimarySyncTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPutGet() throws Exception {
         if (MvccFeatureChecker.forcedMvcc())
             fail("https://issues.apache.org/jira/browse/IGNITE-10520";);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePutGetRestartAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePutGetRestartAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePutGetRestartAbstractTest.java
index 5c3265f..0650ea0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePutGetRestartAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePutGetRestartAbstractTest.java
@@ -35,6 +35,9 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.testframework.GridTestUtils;
 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.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -45,6 +48,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  * Test for specific user scenario.
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteCachePutGetRestartAbstractTest extends 
IgniteCacheAbstractTest {
     /** */
     private static final int ENTRY_CNT = 1000;
@@ -104,6 +108,7 @@ public abstract class IgniteCachePutGetRestartAbstractTest 
extends IgniteCacheAb
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxPutGetRestart() throws Exception {
         int clientGrid = gridCount() - 1;
 
@@ -240,4 +245,4 @@ public abstract class IgniteCachePutGetRestartAbstractTest 
extends IgniteCacheAb
             log.error("Update failed: " + e, e);
         }
     }
-}
\ 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/distributed/IgniteCacheReadFromBackupTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java
index 652aba0..b68ed96 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java
@@ -47,6 +47,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;
@@ -57,6 +60,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheReadFromBackupTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -87,6 +91,7 @@ public class IgniteCacheReadFromBackupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetFromBackupStoreReadThroughEnabled() throws Exception {
         checkGetFromBackupStoreReadThroughEnabled(cacheConfigurations());
     }
@@ -94,6 +99,7 @@ public class IgniteCacheReadFromBackupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccGetFromBackupStoreReadThroughEnabled() throws 
Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10274";);
 
@@ -147,6 +153,7 @@ public class IgniteCacheReadFromBackupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetFromBackupStoreReadThroughDisabled() throws Exception {
         checkGetFromBackupStoreReadThroughDisabled(cacheConfigurations());
     }
@@ -154,6 +161,7 @@ public class IgniteCacheReadFromBackupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccGetFromBackupStoreReadThroughDisabled() throws 
Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10274";);
 
@@ -191,6 +199,7 @@ public class IgniteCacheReadFromBackupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetFromPrimaryPreloadInProgress() throws Exception {
         checkGetFromPrimaryPreloadInProgress(cacheConfigurations());
     }
@@ -198,6 +207,7 @@ public class IgniteCacheReadFromBackupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccGetFromPrimaryPreloadInProgress() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10274";);
 
@@ -293,6 +303,7 @@ public class IgniteCacheReadFromBackupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNoPrimaryReadPreloadFinished() throws Exception {
         checkNoPrimaryReadPreloadFinished(cacheConfigurations());
     }
@@ -300,6 +311,7 @@ public class IgniteCacheReadFromBackupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccNoPrimaryReadPreloadFinished() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10274";);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
index 0b5280d..7ac3874 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
@@ -24,6 +24,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;
@@ -32,6 +35,7 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheServerNodeConcurrentStart extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -81,6 +85,7 @@ public class IgniteCacheServerNodeConcurrentStart extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentStart() throws Exception {
         for (int i = 0; i < ITERATIONS; i++) {
             log.info("Iteration: " + i);
@@ -98,4 +103,4 @@ public class IgniteCacheServerNodeConcurrentStart extends 
GridCommonAbstractTest
             log.info("Iteration finished, time: " + 
(System.currentTimeMillis() - start) / 1000f);
         }
     }
-}
\ 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/distributed/IgniteCacheSingleGetMessageTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.java
index df6100b..3e8f113 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.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.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;
@@ -47,6 +50,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheSingleGetMessageTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -88,6 +92,7 @@ public class IgniteCacheSingleGetMessageTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSingleGetMessage() throws Exception {
         checkSingleGetMessage(cacheConfigurations());
     }
@@ -95,6 +100,7 @@ public class IgniteCacheSingleGetMessageTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMvccSingleGetMessage() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7371";);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
index cd85950..da955c9 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
@@ -31,6 +31,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.PARTITIONED;
@@ -39,6 +42,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteCacheSizeFailoverTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -73,6 +77,7 @@ public class IgniteCacheSizeFailoverTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSize() throws Exception {
         startGrids(2);
 
@@ -123,4 +128,4 @@ public class IgniteCacheSizeFailoverTest extends 
GridCommonAbstractTest {
 
         fut.get();
     }
-}
\ No newline at end of file
+}

Reply via email to