http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
index 211e9bc..297d2d2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
@@ -79,6 +79,9 @@ import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 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.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -88,6 +91,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTest {
     /** Default cache entries count. */
     private static final int DFLT_CACHE_ENTRIES_CNT = 2 * 1024;
@@ -353,6 +357,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testCreateCacheAtomicPartitioned() throws Exception {
         testCreateCacheTransactionalReplicated();
     }
@@ -361,6 +366,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testCreateCacheAtomicReplicated() throws Exception {
         testCreateCacheTransactionalReplicated();
     }
@@ -369,6 +375,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED)
+    @Test
     public void testCreateCacheTransactionalPartitioned() throws Exception {
         testCreateCacheTransactionalReplicated();
     }
@@ -377,6 +384,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = REPLICATED)
+    @Test
     public void testCreateCacheTransactionalReplicated() throws Exception {
         doTest(
             
asMessagePredicate(CacheBlockOnReadAbstractTest::createCachePredicate),
@@ -388,6 +396,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(timeout = 5000L, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testDestroyCacheAtomicPartitioned() throws Exception {
         testDestroyCacheTransactionalReplicated();
     }
@@ -396,6 +405,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(timeout = 5000L, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testDestroyCacheAtomicReplicated() throws Exception {
         testDestroyCacheTransactionalReplicated();
     }
@@ -404,6 +414,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(timeout = 5000L, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     public void testDestroyCacheTransactionalPartitioned() throws Exception {
         testDestroyCacheTransactionalReplicated();
     }
@@ -412,6 +423,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(timeout = 5000L, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     public void testDestroyCacheTransactionalReplicated() throws Exception {
         List<String> cacheNames = new ArrayList<>(Arrays.asList(
             UUID.randomUUID().toString(),
@@ -432,6 +444,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testStartServerAtomicPartitioned() throws Exception {
         testStartServerTransactionalReplicated();
     }
@@ -440,6 +453,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testStartServerAtomicReplicated() throws Exception {
         testStartServerTransactionalReplicated();
     }
@@ -448,6 +462,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED)
+    @Test
     public void testStartServerTransactionalPartitioned() throws Exception {
         testStartServerTransactionalReplicated();
     }
@@ -456,6 +471,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = REPLICATED)
+    @Test
     public void testStartServerTransactionalReplicated() throws Exception {
         startNodesInClientMode(false);
 
@@ -469,6 +485,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(servers = 4, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testStopServerAtomicPartitioned() throws Exception {
         testStopServerTransactionalReplicated();
     }
@@ -477,6 +494,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(servers = 4, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testStopServerAtomicReplicated() throws Exception {
         testStopServerTransactionalReplicated();
     }
@@ -485,6 +503,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(servers = 4, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     public void testStopServerTransactionalPartitioned() throws Exception {
         testStopServerTransactionalReplicated();
     }
@@ -493,6 +512,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(servers = 4, atomicityMode = TRANSACTIONAL, cacheMode = REPLICATED)
+    @Test
     public void testStopServerTransactionalReplicated() throws Exception {
         doTest(
             asMessagePredicate(discoEvt -> discoEvt.type() == 
EventType.EVT_NODE_LEFT),
@@ -504,6 +524,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(baseline = 4, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testRestartBaselineAtomicPartitioned() throws Exception {
         testRestartBaselineTransactionalReplicated();
     }
@@ -512,6 +533,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(baseline = 4, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testRestartBaselineAtomicReplicated() throws Exception {
         testRestartBaselineTransactionalReplicated();
     }
@@ -520,6 +542,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(baseline = 4, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     public void testRestartBaselineTransactionalPartitioned() throws Exception 
{
         testRestartBaselineTransactionalReplicated();
     }
@@ -528,6 +551,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(baseline = 4, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     public void testRestartBaselineTransactionalReplicated() throws Exception {
         doTest(
             asMessagePredicate(discoEvt -> discoEvt.type() == 
EventType.EVT_NODE_JOINED),
@@ -550,6 +574,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(timeout = 5000L, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testUpdateBaselineTopologyAtomicPartitioned() throws Exception 
{
         testUpdateBaselineTopologyTransactionalReplicated();
     }
@@ -558,6 +583,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(timeout = 5000L, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testUpdateBaselineTopologyAtomicReplicated() throws Exception {
         testUpdateBaselineTopologyTransactionalReplicated();
     }
@@ -566,6 +592,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(timeout = 5000L, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     public void testUpdateBaselineTopologyTransactionalPartitioned() throws 
Exception {
         testUpdateBaselineTopologyTransactionalReplicated();
     }
@@ -574,6 +601,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(timeout = 5000L, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     public void testUpdateBaselineTopologyTransactionalReplicated() throws 
Exception {
         doTest(
             asMessagePredicate(discoEvt -> {
@@ -603,6 +631,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(baseline = 9, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testStopBaselineAtomicPartitioned() throws Exception {
         testStopBaselineTransactionalReplicated();
     }
@@ -611,6 +640,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(baseline = 9, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testStopBaselineAtomicReplicated() throws Exception {
         testStopBaselineTransactionalReplicated();
     }
@@ -619,6 +649,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(baseline = 9, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     public void testStopBaselineTransactionalPartitioned() throws Exception {
         testStopBaselineTransactionalReplicated();
     }
@@ -627,6 +658,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(baseline = 9, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     public void testStopBaselineTransactionalReplicated() throws Exception {
         AtomicInteger cntDownCntr = new AtomicInteger(0);
 
@@ -651,6 +683,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testStartClientAtomicPartitioned() throws Exception {
         testStartClientTransactionalReplicated();
     }
@@ -659,6 +692,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testStartClientAtomicReplicated() throws Exception {
         testStartClientTransactionalReplicated();
     }
@@ -667,6 +701,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED)
+    @Test
     public void testStartClientTransactionalPartitioned() throws Exception {
         testStartClientTransactionalReplicated();
     }
@@ -675,6 +710,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = REPLICATED)
+    @Test
     public void testStartClientTransactionalReplicated() throws Exception {
         doTest(
             TcpDiscoveryNodeAddFinishedMessage.class,
@@ -700,6 +736,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     public void testStopClientAtomicPartitioned() throws Exception {
         testStopClientTransactionalReplicated();
     }
@@ -708,6 +745,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     public void testStopClientAtomicReplicated() throws Exception {
         testStopClientTransactionalReplicated();
     }
@@ -716,6 +754,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED)
+    @Test
     public void testStopClientTransactionalPartitioned() throws Exception {
         testStopClientTransactionalReplicated();
     }
@@ -724,6 +763,7 @@ public abstract class CacheBlockOnReadAbstractTest extends 
GridCommonAbstractTes
      * @throws Exception If failed.
      */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = REPLICATED, timeout = 
5_000L)
+    @Test
     public void testStopClientTransactionalReplicated() throws Exception {
         startNodesInClientMode(true);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnScanTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnScanTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnScanTest.java
index dfe6808..2b0289b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnScanTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnScanTest.java
@@ -21,6 +21,9 @@ import java.util.Objects;
 import java.util.Random;
 import org.apache.ignite.cache.query.ScanQuery;
 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.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -30,6 +33,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheBlockOnScanTest extends CacheBlockOnReadAbstractTest {
 
     /** {@inheritDoc} */
@@ -49,72 +53,84 @@ public class CacheBlockOnScanTest extends 
CacheBlockOnReadAbstractTest {
 
     /** {@inheritDoc} */
     @Params(baseline = 9, atomicityMode = ATOMIC, cacheMode = PARTITIONED, 
allowException = true)
+    @Test
     @Override public void testStopBaselineAtomicPartitioned() throws Exception 
{
         super.testStopBaselineAtomicPartitioned();
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 9, atomicityMode = ATOMIC, cacheMode = REPLICATED, 
allowException = true)
+    @Test
     @Override public void testStopBaselineAtomicReplicated() throws Exception {
         super.testStopBaselineAtomicReplicated();
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 9, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED, allowException = true)
+    @Test
     @Override public void testStopBaselineTransactionalPartitioned() throws 
Exception {
         super.testStopBaselineTransactionalPartitioned();
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 9, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED, allowException = true)
+    @Test
     @Override public void testStopBaselineTransactionalReplicated() throws 
Exception {
         super.testStopBaselineTransactionalReplicated();
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testStartClientAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testStartClientTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testStopClientAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testStopClientTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStartClientAtomicPartitioned() throws Exception {
         super.testStartClientTransactionalReplicated();
     }
 
     /** {@inheritDoc} */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStartClientTransactionalPartitioned() throws 
Exception {
         super.testStartClientTransactionalReplicated();
     }
 
     /** {@inheritDoc} */
     @Params(atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStopClientAtomicPartitioned() throws Exception {
         super.testStopClientTransactionalReplicated();
     }
 
     /** {@inheritDoc} */
     @Params(atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStopClientTransactionalPartitioned() throws 
Exception {
         super.testStopClientTransactionalReplicated();
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSingleGetTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSingleGetTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSingleGetTest.java
index e5d1fe1..08c15b4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSingleGetTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSingleGetTest.java
@@ -19,6 +19,9 @@ package 
org.apache.ignite.internal.processors.cache.distributed;
 
 import java.util.Random;
 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.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -28,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheBlockOnSingleGetTest extends CacheBlockOnReadAbstractTest {
 
     /** {@inheritDoc} */
@@ -46,192 +50,224 @@ public class CacheBlockOnSingleGetTest extends 
CacheBlockOnReadAbstractTest {
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStopBaselineAtomicPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9915";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testStopBaselineAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9915";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     @Override public void testStopBaselineTransactionalPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9915";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testStopBaselineTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9915";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testCreateCacheAtomicPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testCreateCacheAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     @Override public void testCreateCacheTransactionalPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testCreateCacheTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testDestroyCacheAtomicPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testDestroyCacheAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     @Override public void testDestroyCacheTransactionalPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testDestroyCacheTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStartServerAtomicPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testStartServerAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     @Override public void testStartServerTransactionalPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testStartServerTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStopServerAtomicPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testStopServerAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     @Override public void testStopServerTransactionalPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testStopServerTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testUpdateBaselineTopologyAtomicPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testUpdateBaselineTopologyAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     @Override public void testUpdateBaselineTopologyTransactionalPartitioned() 
{
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testUpdateBaselineTopologyTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9883";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStartClientAtomicPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testStartClientAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     @Override public void testStartClientTransactionalPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testStartClientTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED)
+    @Test
     @Override public void testStopClientAtomicPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = REPLICATED)
+    @Test
     @Override public void testStopClientAtomicReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
PARTITIONED)
+    @Test
     @Override public void testStopClientTransactionalPartitioned() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }
 
     /** {@inheritDoc} */
     @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = 
REPLICATED)
+    @Test
     @Override public void testStopClientTransactionalReplicated() {
         fail("https://issues.apache.org/jira/browse/IGNITE-9987";);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
index 3f84cd6..13d5a0a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
@@ -47,6 +47,9 @@ import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
@@ -54,6 +57,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheClientsConcurrentStartTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -122,6 +126,7 @@ public class CacheClientsConcurrentStartTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartNodes() throws Exception {
         for (int i = 0; i < ITERATIONS; i++) {
             try {
@@ -242,4 +247,4 @@ public class CacheClientsConcurrentStartTest 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/CacheDataLossOnPartitionMoveTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
index acbfa8c..89ad7c6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
@@ -46,6 +46,9 @@ import org.apache.ignite.testframework.GridTestNode;
 import org.apache.ignite.testframework.MvccFeatureChecker;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static 
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState.EVICTED;
 import static 
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState.OWNING;
@@ -53,6 +56,7 @@ import static 
org.apache.ignite.internal.processors.cache.distributed.dht.topolo
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheDataLossOnPartitionMoveTest extends GridCommonAbstractTest {
     /** */
     public static final long MB = 1024 * 1024L;
@@ -119,6 +123,7 @@ public class CacheDataLossOnPartitionMoveTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testDataLossOnPartitionMove() throws Exception {
         if (MvccFeatureChecker.forcedMvcc())
             fail("https://issues.apache.org/jira/browse/IGNITE-10421";);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDiscoveryDataConcurrentJoinTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDiscoveryDataConcurrentJoinTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDiscoveryDataConcurrentJoinTest.java
index 44e04eb..1a3d754 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDiscoveryDataConcurrentJoinTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDiscoveryDataConcurrentJoinTest.java
@@ -37,12 +37,16 @@ import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
 import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheDiscoveryDataConcurrentJoinTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -119,6 +123,7 @@ public class CacheDiscoveryDataConcurrentJoinTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentJoin() throws Exception {
         for (int iter = 0; iter < ITERATIONS; iter++) {
             log.info("Iteration: " + iter);
@@ -169,6 +174,7 @@ public class CacheDiscoveryDataConcurrentJoinTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentJoinCacheWithGroup() throws Exception {
         withCacheGrp = true;
 
@@ -211,4 +217,4 @@ public class CacheDiscoveryDataConcurrentJoinTest extends 
GridCommonAbstractTest
     private void checkCache(Ignite node, final String cacheName) {
         assertNotNull(((IgniteKernal)node).context().cache().cache(cacheName));
     }
-}
\ 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/CacheExchangeMergeTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
index 9cd2489..2ab762d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
@@ -75,6 +75,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 
org.apache.ignite.IgniteSystemProperties.IGNITE_EXCHANGE_HISTORY_SIZE;
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -89,6 +92,7 @@ import static 
org.apache.ignite.testframework.GridTestUtils.mergeExchangeWaitVer
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheExchangeMergeTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -209,6 +213,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayExchangeMessages() throws Exception {
         testDelaySpi = true;
 
@@ -281,6 +286,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeStartRandomClientsServers() throws Exception {
         for (int iter = 0; iter < 3; iter++) {
             ThreadLocalRandom rnd = ThreadLocalRandom.current();
@@ -337,6 +343,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeStartStopRandomClientsServers() throws Exception {
         for (int iter = 0; iter < 3; iter++) {
             log.info("Iteration: " + iter);
@@ -409,6 +416,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentStartServers() throws Exception {
         concurrentStart(false);
     }
@@ -416,6 +424,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentStartServersAndClients() throws Exception {
         concurrentStart(true);
     }
@@ -464,6 +473,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeServerAndClientJoin1() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10186";);
 
@@ -504,6 +514,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartCacheOnJoinAndJoinMerge_2_nodes() throws Exception {
         startCacheOnJoinAndJoinMerge1(2, false);
     }
@@ -511,6 +522,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartCacheOnJoinAndJoinMerge_4_nodes() throws Exception {
         startCacheOnJoinAndJoinMerge1(4, false);
     }
@@ -518,6 +530,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartCacheOnJoinAndJoinMerge_WithClients() throws 
Exception {
         startCacheOnJoinAndJoinMerge1(5, true);
     }
@@ -554,6 +567,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeAndHistoryCleanup() throws Exception {
         final int histSize = 5;
 
@@ -618,6 +632,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartCacheOnJoinAndMergeWithFail() throws Exception {
         cfgCache = false;
 
@@ -643,6 +658,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartCacheOnJoinAndCoordinatorFailed1() throws Exception {
         cfgCache = false;
 
@@ -664,6 +680,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartCacheOnJoinAndCoordinatorFailed2() throws Exception {
         cfgCache = false;
 
@@ -685,6 +702,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeServersJoin1() throws Exception {
         IgniteEx srv0 = startGrid(0);
 
@@ -712,6 +730,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeServerJoin1ClientsInTopology() throws Exception {
         IgniteEx srv0 = startGrid(0);
 
@@ -749,6 +768,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeAndNewCoordinator() throws Exception {
         final Ignite srv0 = startGrids(3);
 
@@ -768,6 +788,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeServersFail1_1() throws Exception {
         mergeServersFail1(false);
     }
@@ -775,6 +796,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeServersFail1_2() throws Exception {
         mergeServersFail1(true);
     }
@@ -820,6 +842,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeServersAndClientsFail1() throws Exception {
         mergeServersAndClientsFail(false);
     }
@@ -827,6 +850,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeServersAndClientsFail2() throws Exception {
         mergeServersAndClientsFail(true);
     }
@@ -868,6 +892,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinExchangeCoordinatorChange_NoMerge_1() throws Exception 
{
         for (CoordinatorChangeMode mode : CoordinatorChangeMode.values()) {
             exchangeCoordinatorChangeNoMerge(4, true, mode);
@@ -879,6 +904,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinExchangeCoordinatorChange_NoMerge_2() throws Exception 
{
         for (CoordinatorChangeMode mode : CoordinatorChangeMode.values()) {
             exchangeCoordinatorChangeNoMerge(8, true, mode);
@@ -890,6 +916,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFailExchangeCoordinatorChange_NoMerge_1() throws Exception 
{
         for (CoordinatorChangeMode mode : CoordinatorChangeMode.values()) {
             exchangeCoordinatorChangeNoMerge(5, false, mode);
@@ -901,6 +928,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFailExchangeCoordinatorChange_NoMerge_2() throws Exception 
{
         for (CoordinatorChangeMode mode : CoordinatorChangeMode.values()) {
             exchangeCoordinatorChangeNoMerge(8, false, mode);
@@ -912,6 +940,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeJoinExchangesCoordinatorChange1_4_servers() throws 
Exception {
         for (CoordinatorChangeMode mode : CoordinatorChangeMode.values()) {
             mergeJoinExchangesCoordinatorChange1(4, mode);
@@ -923,6 +952,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeJoinExchangesCoordinatorChange1_8_servers() throws 
Exception {
         for (CoordinatorChangeMode mode : CoordinatorChangeMode.values()) {
             mergeJoinExchangesCoordinatorChange1(8, mode);
@@ -962,6 +992,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeJoinExchangesCoordinatorChange2_4_servers() throws 
Exception {
         mergeJoinExchangeCoordinatorChange2(4, 2, F.asList(1, 2, 3, 4), 
F.asList(5));
 
@@ -1005,6 +1036,7 @@ public class CacheExchangeMergeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMergeExchangeCoordinatorChange4() throws Exception {
         testSpi = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
index 34c3eb9..054c1a4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
@@ -39,12 +39,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.junits.common.GridCommonAbstractTest;
 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.CacheWriteSynchronizationMode.PRIMARY_SYNC;
 
 /**
  * Test for reproducing problems during simultaneously Ignite instances 
stopping and cache requests executing.
  */
+@RunWith(JUnit4.class)
 public class CacheGetFutureHangsSelfTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -89,6 +93,7 @@ public class CacheGetFutureHangsSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testContainsKeyFailover() throws Exception {
         int cnt = 3;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
index 80aa9ee..b8dd5aa 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
@@ -44,6 +44,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.TransactionConcurrency;
+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;
@@ -56,6 +59,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheGetInsideLockChangingTopologyTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -155,6 +159,7 @@ public class CacheGetInsideLockChangingTopologyTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxGetInsideLockStopPrimary() throws Exception {
         getInsideLockStopPrimary(ignite(SRVS), TX_CACHE1);
         getInsideLockStopPrimary(ignite(SRVS + 1), TX_CACHE1);
@@ -166,6 +171,7 @@ public class CacheGetInsideLockChangingTopologyTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicGetInsideLockStopPrimary() throws Exception {
         getInsideLockStopPrimary(ignite(SRVS), ATOMIC_CACHE);
 
@@ -175,6 +181,7 @@ public class CacheGetInsideLockChangingTopologyTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicGetInsideTxStopPrimary() throws Exception {
         getInsideTxStopPrimary(ignite(SRVS), ATOMIC_CACHE);
 
@@ -184,6 +191,7 @@ public class CacheGetInsideLockChangingTopologyTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReadCommittedPessimisticStopPrimary() throws Exception {
         getReadCommittedStopPrimary(ignite(SRVS), TX_CACHE1, PESSIMISTIC);
         getReadCommittedStopPrimary(ignite(SRVS + 1), TX_CACHE1, PESSIMISTIC);
@@ -195,6 +203,7 @@ public class CacheGetInsideLockChangingTopologyTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReadCommittedOptimisticStopPrimary() throws Exception {
         getReadCommittedStopPrimary(ignite(SRVS), TX_CACHE1, OPTIMISTIC);
         getReadCommittedStopPrimary(ignite(SRVS + 1), TX_CACHE1, OPTIMISTIC);
@@ -363,6 +372,7 @@ public class CacheGetInsideLockChangingTopologyTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultithreaded() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-2204";);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGroupsPreloadTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGroupsPreloadTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGroupsPreloadTest.java
index af223f4..53e4e9f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGroupsPreloadTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGroupsPreloadTest.java
@@ -26,10 +26,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheGroupsPreloadTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -90,6 +94,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreload1() throws Exception {
         cachePreloadTest();
     }
@@ -97,6 +102,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreload2() throws Exception {
         atomicityMode = CacheAtomicityMode.TRANSACTIONAL;
 
@@ -106,6 +112,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreloadMvcc2() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7187";);
 
@@ -117,6 +124,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreload3() throws Exception {
         cacheMode = CacheMode.REPLICATED;
 
@@ -126,6 +134,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreload4() throws Exception {
         cacheMode = CacheMode.REPLICATED;
         atomicityMode = CacheAtomicityMode.TRANSACTIONAL;
@@ -136,6 +145,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreloadMvcc4() throws Exception {
         cacheMode = CacheMode.REPLICATED;
         atomicityMode = CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
@@ -146,6 +156,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreload5() throws Exception {
         sameGrp = false;
 
@@ -155,6 +166,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreload6() throws Exception {
         sameGrp = false;
         atomicityMode = CacheAtomicityMode.TRANSACTIONAL;
@@ -165,6 +177,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreloadMvcc6() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7187";);
 
@@ -177,6 +190,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreload7() throws Exception {
         sameGrp = false;
         cacheMode = CacheMode.REPLICATED;
@@ -187,6 +201,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreload8() throws Exception {
         sameGrp = false;
         cacheMode = CacheMode.REPLICATED;
@@ -198,6 +213,7 @@ public class CacheGroupsPreloadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCachePreloadMvcc8() throws Exception {
         sameGrp = false;
         cacheMode = CacheMode.REPLICATED;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentNodeJoinValidationTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentNodeJoinValidationTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentNodeJoinValidationTest.java
index 48b33b6..30dfbc6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentNodeJoinValidationTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentNodeJoinValidationTest.java
@@ -23,10 +23,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheLateAffinityAssignmentNodeJoinValidationTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -60,6 +64,7 @@ public class 
CacheLateAffinityAssignmentNodeJoinValidationTest extends GridCommo
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinValidation1() throws Exception {
         checkNodeJoinValidation(false);
     }
@@ -67,6 +72,7 @@ public class 
CacheLateAffinityAssignmentNodeJoinValidationTest extends GridCommo
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinValidation2() throws Exception {
         checkNodeJoinValidation(true);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
index 2766aba..c424217 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
@@ -98,6 +98,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;
@@ -109,6 +112,7 @@ import static 
org.apache.ignite.internal.processors.cache.ExchangeContext.IGNITE
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -234,6 +238,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayedAffinityCalculation() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -293,6 +298,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleSequentialStart() throws Exception {
         startServer(0, 1);
 
@@ -314,6 +320,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleSequentialStartNoCacheOnCoordinator() throws 
Exception {
         cacheC = new IgniteClosure<String, CacheConfiguration[]>() {
             @Override public CacheConfiguration[] apply(String 
igniteInstanceName) {
@@ -334,6 +341,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleNoCacheOnCoordinator1() throws Exception {
         cacheC = new IgniteClosure<String, CacheConfiguration[]>() {
             @Override public CacheConfiguration[] apply(String 
igniteInstanceName) {
@@ -373,6 +381,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleNoCacheOnCoordinator2() throws Exception {
         System.setProperty(IGNITE_EXCHANGE_COMPATIBILITY_VER_1, "true");
 
@@ -432,6 +441,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCreateCloseClientCacheOnCoordinator1() throws Exception {
         cacheC = new IgniteClosure<String, CacheConfiguration[]>() {
             @Override public CacheConfiguration[] apply(String 
igniteInstanceName) {
@@ -457,6 +467,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCreateCloseClientCacheOnCoordinator2() throws Exception {
         cacheC = new IgniteClosure<String, CacheConfiguration[]>() {
             @Override public CacheConfiguration[] apply(String 
igniteInstanceName) {
@@ -503,6 +514,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCacheDestroyAndCreate1() throws Exception {
         cacheDestroyAndCreate(true);
     }
@@ -510,6 +522,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCacheDestroyAndCreate2() throws Exception {
         cacheDestroyAndCreate(false);
     }
@@ -579,6 +592,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleNodeLeave1() throws Exception {
         affinitySimpleNodeLeave(2);
     }
@@ -588,6 +602,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleNodeLeave2() throws Exception {
         affinitySimpleNodeLeave(4);
     }
@@ -623,6 +638,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleNodeLeaveClientAffinity() throws Exception {
         startServer(0, 1);
 
@@ -644,6 +660,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeLeaveExchangeWaitAffinityMessage() throws Exception {
         System.setProperty(IGNITE_EXCHANGE_COMPATIBILITY_VER_1, "true");
 
@@ -693,6 +710,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleClientNodeEvents1() throws Exception {
         affinitySimpleClientNodeEvents(1);
     }
@@ -702,6 +720,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleClientNodeEvents2() throws Exception {
         affinitySimpleClientNodeEvents(3);
     }
@@ -737,6 +756,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentMultipleJoin1() throws Exception {
         delayAssignmentMultipleJoin(2);
     }
@@ -746,6 +766,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentMultipleJoin2() throws Exception {
         delayAssignmentMultipleJoin(4);
     }
@@ -794,6 +815,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentClientJoin() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -818,6 +840,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentClientLeave() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -848,6 +871,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentClientCacheStart() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -884,6 +908,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentCacheStart() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -918,6 +943,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentCacheDestroy() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -952,6 +978,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinitySimpleStopRandomNode() throws Exception {
         //fail("IGNITE-GG-12292");
 
@@ -1001,6 +1028,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentCoordinatorLeave1() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -1025,6 +1053,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentCoordinatorLeave2() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -1054,6 +1083,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg1() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(4, 3, false, 2);
     }
@@ -1062,6 +1092,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg2() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(4, 3, false);
     }
@@ -1070,6 +1101,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg3() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(4, 3, false, 1);
     }
@@ -1078,6 +1110,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg4() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(5, 3, false);
     }
@@ -1086,6 +1119,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg5() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(5, 3, false, 1);
     }
@@ -1094,6 +1128,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg6() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(5, 3, false, 2);
     }
@@ -1102,6 +1137,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg7() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(5, 3, false, 2, 4);
     }
@@ -1110,6 +1146,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg8() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(6, 3, false, 2, 4);
     }
@@ -1118,6 +1155,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsg9() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(5, 1, false, 4);
     }
@@ -1126,6 +1164,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBlockedFinishMsgForClient() throws Exception {
         doTestCoordLeaveBlockedFinishExchangeMessage(5, 1, true, 4);
     }
@@ -1223,6 +1262,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testCoordinatorLeaveAfterNodeLeavesDelayAssignment() throws 
Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -1272,6 +1312,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeLeftExchangeCoordinatorLeave1() throws Exception {
         nodeLeftExchangeCoordinatorLeave(3);
     }
@@ -1281,6 +1322,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeLeftExchangeCoordinatorLeave2() throws Exception {
         nodeLeftExchangeCoordinatorLeave(5);
     }
@@ -1335,6 +1377,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJoinExchangeBecomeCoordinator() throws Exception {
         long topVer = 0;
 
@@ -1396,6 +1439,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentAffinityChanged() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -1438,6 +1482,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentAffinityChanged2() throws Exception {
         System.setProperty(IGNITE_EXCHANGE_COMPATIBILITY_VER_1, "true");
 
@@ -1519,6 +1564,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDelayAssignmentCacheDestroyCreate() throws Exception {
         Ignite ignite0 = startServer(0, 1);
 
@@ -1572,6 +1618,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientCacheStartClose() throws Exception {
         cacheC = new IgniteClosure<String, CacheConfiguration[]>() {
             @Override public CacheConfiguration[] apply(String 
igniteInstanceName) {
@@ -1600,6 +1647,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCacheStartDestroy() throws Exception {
         startGridsMultiThreaded(3, false);
 
@@ -1634,6 +1682,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInitCacheReceivedOnJoin() throws Exception {
         cacheC = new IgniteClosure<String, CacheConfiguration[]>() {
             @Override public CacheConfiguration[] apply(String s) {
@@ -1677,6 +1726,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientStartFirst1() throws Exception {
         clientStartFirst(1);
     }
@@ -1684,6 +1734,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientStartFirst2() throws Exception {
         clientStartFirst(3);
     }
@@ -1724,6 +1775,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomOperations() throws Exception {
         forceSrvMode = true;
 
@@ -1935,6 +1987,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentStartStaticCaches() throws Exception {
         concurrentStartStaticCaches(false);
     }
@@ -1942,6 +1995,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentStartStaticCachesWithClientNodes() throws 
Exception {
         concurrentStartStaticCaches(true);
     }
@@ -2014,6 +2068,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServiceReassign() throws Exception {
         skipCheckOrder = true;
 
@@ -2047,6 +2102,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNoForceKeysRequests() throws Exception {
         if (MvccFeatureChecker.forcedMvcc())
             fail("https://issues.apache.org/jira/browse/IGNITE-10391";);
@@ -2160,6 +2216,7 @@ public class CacheLateAffinityAssignmentTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStreamer1() throws Exception {
         cacheC = new IgniteClosure<String, CacheConfiguration[]>() {
             @Override public CacheConfiguration[] apply(String s) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
index 10d04bd..7231611 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
@@ -52,6 +52,9 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.MvccFeatureChecker;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -61,6 +64,7 @@ import static 
org.apache.ignite.testframework.GridTestUtils.runAsync;
 /**
  * Tests for cache data loading during simultaneous grids start.
  */
+@RunWith(JUnit4.class)
 public class CacheLoadingConcurrentGridStartSelfTest extends 
GridCommonAbstractTest implements Serializable {
     /** Grids count */
     private static int GRIDS_CNT = 5;
@@ -81,10 +85,8 @@ public class CacheLoadingConcurrentGridStartSelfTest extends 
GridCommonAbstractT
     protected volatile boolean restarts;
 
     /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
+    @Override protected void beforeTest() throws Exception {
         
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
-
-        super.beforeTestsStarted();
     }
 
     /** {@inheritDoc} */
@@ -144,6 +146,7 @@ public class CacheLoadingConcurrentGridStartSelfTest 
extends GridCommonAbstractT
     /**
      * @throws Exception if failed
      */
+    @Test
     public void testLoadCacheWithDataStreamer() throws Exception {
         configured = true;
 
@@ -171,6 +174,7 @@ public class CacheLoadingConcurrentGridStartSelfTest 
extends GridCommonAbstractT
     /**
      * @throws Exception if failed
      */
+    @Test
     public void testLoadCacheFromStore() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-4210";);
 
@@ -184,6 +188,7 @@ public class CacheLoadingConcurrentGridStartSelfTest 
extends GridCommonAbstractT
     /**
      * @throws Exception if failed
      */
+    @Test
     public void testLoadCacheWithDataStreamerSequentialClient() throws 
Exception {
         client = true;
 
@@ -198,6 +203,7 @@ public class CacheLoadingConcurrentGridStartSelfTest 
extends GridCommonAbstractT
     /**
      * @throws Exception if failed
      */
+    @Test
     public void testLoadCacheWithDataStreamerSequentialClientWithConfig() 
throws Exception {
         client = true;
         configured = true;
@@ -214,6 +220,7 @@ public class CacheLoadingConcurrentGridStartSelfTest 
extends GridCommonAbstractT
     /**
      * @throws Exception if failed
      */
+    @Test
     public void testLoadCacheWithDataStreamerSequential() throws Exception {
         loadCacheWithDataStreamerSequential();
     }
@@ -221,6 +228,7 @@ public class CacheLoadingConcurrentGridStartSelfTest 
extends GridCommonAbstractT
     /**
      * @throws Exception if failed
      */
+    @Test
     public void testLoadCacheWithDataStreamerSequentialWithConfigAndRestarts() 
throws Exception {
         restarts = true;
         configured = true;
@@ -237,6 +245,7 @@ public class CacheLoadingConcurrentGridStartSelfTest 
extends GridCommonAbstractT
     /**
      * @throws Exception if failed
      */
+    @Test
     public void testLoadCacheWithDataStreamerSequentialWithConfig() throws 
Exception {
         configured = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
index 844a430..2d5f5fe 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java
@@ -39,6 +39,9 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.MvccFeatureChecker;
 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 java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -49,6 +52,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheLockReleaseNodeLeaveTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -57,10 +61,8 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
     private static final String REPLICATED_TEST_CACHE = 
"REPLICATED_TEST_CACHE";
 
     /** {@inheritDoc} */
-    @Override public void beforeTestsStarted() throws Exception {
+    @Override public void beforeTest() throws Exception {
         
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.ENTRY_LOCK);
-
-        super.beforeTestsStarted();
     }
 
     /** {@inheritDoc} */
@@ -93,6 +95,7 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockRelease() throws Exception {
         startGrids(2);
 
@@ -139,6 +142,7 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockTopologyChange() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-9213";);
 
@@ -191,6 +195,7 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxLockRelease() throws Exception {
         startGrids(2);
 
@@ -239,6 +244,7 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockRelease2() throws Exception {
         final Ignite ignite0 = startGrid(0);
 
@@ -285,6 +291,7 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockRelease3() throws Exception {
         startGrid(0);
 
@@ -319,6 +326,7 @@ public class CacheLockReleaseNodeLeaveTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTxLockRelease2() throws Exception {
         final Ignite ignite0 = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheOperationsInterruptTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheOperationsInterruptTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheOperationsInterruptTest.java
index 971dbd1..f4b1beb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheOperationsInterruptTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheOperationsInterruptTest.java
@@ -33,6 +33,9 @@ import org.apache.ignite.transactions.Transaction;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
+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.REPLICATED;
@@ -43,6 +46,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheOperationsInterruptTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -74,6 +78,7 @@ public class CacheOperationsInterruptTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInterruptPessimisticTx() throws Exception {
         final int NODES = 3;
 
@@ -167,4 +172,4 @@ public class CacheOperationsInterruptTest 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/CachePageWriteLockUnlockTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
index 5b24761..7af5c8d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
@@ -38,12 +38,16 @@ import 
org.apache.ignite.internal.processors.cache.distributed.dht.topology.Grid
 import 
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
 import 
org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryEx;
 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.distributed.dht.topology.GridDhtPartitionState.OWNING;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CachePageWriteLockUnlockTest extends GridCommonAbstractTest {
     /** */
     public static final int PARTITION = 0;
@@ -74,6 +78,7 @@ public class CachePageWriteLockUnlockTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testPreloadPartition() throws Exception {
         try {
             IgniteEx grid0 = startGrid(0);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java
index 2a64485..7c84ede 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java
@@ -33,10 +33,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test covers parallel start and stop of caches.
  */
+@RunWith(JUnit4.class)
 public class CacheParallelStartTest extends GridCommonAbstractTest {
     /** */
     private static final int CACHES_COUNT = 500;
@@ -128,6 +132,7 @@ public class CacheParallelStartTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testParallelStartAndStop() throws Exception {
         testParallelStartAndStop(true);
     }
@@ -135,6 +140,7 @@ public class CacheParallelStartTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testSequentialStartAndStop() throws Exception {
         testParallelStartAndStop(false);
     }

Reply via email to