http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
index b7bfb02..6b02ec4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java
@@ -26,12 +26,16 @@ import org.apache.ignite.configuration.AtomicConfiguration;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 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;
 
 /**
  * Cache atomic long api test.
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteAtomicLongApiAbstractSelfTest extends 
IgniteAtomicsAbstractTest {
     /** Random number generator. */
     private static final Random RND = new Random();
@@ -61,6 +65,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCreateRemove() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -102,6 +107,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIncrementAndGet() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -118,6 +124,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetAndIncrement() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -134,6 +141,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDecrementAndGet() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -150,6 +158,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetAndDecrement() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -166,6 +175,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetAndAdd() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -184,6 +194,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAddAndGet() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -202,6 +213,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetAndSet() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -220,6 +232,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCompareAndSet() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -245,6 +258,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testGetAndSetInTx() throws Exception {
         info("Running test [name=" + getName() + ", cacheMode=" + 
atomicsCacheMode() + ']');
 
@@ -272,6 +286,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testIsolation() throws Exception {
         Ignite ignite = grid(0);
 
@@ -298,6 +313,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMultipleStructuresInDifferentGroups() throws Exception {
         Ignite ignite = grid(0);
 
@@ -338,4 +354,4 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest 
extends IgniteAtomicsA
         assertNotNull(ignite.atomicLong("atomic1", 1, false));
         assertNotNull(ignite.atomicLong("atomic3", cfg, 3, false));
     }
-}
\ 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/datastructures/IgniteClientDataStructuresAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
index 118ea52..ba30a3f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
@@ -43,10 +43,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 abstract class IgniteClientDataStructuresAbstractTest extends 
GridCommonAbstractTest {
     /** */
     protected static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -87,6 +91,7 @@ public abstract class IgniteClientDataStructuresAbstractTest 
extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSequence() throws Exception {
         Ignite clientNode = clientIgnite();
         Ignite srvNode = serverNode();
@@ -147,6 +152,7 @@ public abstract class 
IgniteClientDataStructuresAbstractTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomicLong() throws Exception {
         Ignite clientNode = clientIgnite();
         Ignite srvNode = serverNode();
@@ -226,6 +232,7 @@ public abstract class 
IgniteClientDataStructuresAbstractTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSet() throws Exception {
         Ignite clientNode = clientIgnite();
         Ignite srvNode = serverNode();
@@ -274,6 +281,7 @@ public abstract class 
IgniteClientDataStructuresAbstractTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLatch() throws Exception {
         Ignite clientNode = clientIgnite();
         Ignite srvNode = serverNode();
@@ -352,6 +360,7 @@ public abstract class 
IgniteClientDataStructuresAbstractTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSemaphore() throws Exception {
         Ignite clientNode = clientIgnite();
         Ignite srvNode = serverNode();
@@ -430,6 +439,7 @@ public abstract class 
IgniteClientDataStructuresAbstractTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReentrantLock() throws Exception {
         Ignite clientNode = clientIgnite();
         Ignite srvNode = serverNode();
@@ -520,6 +530,7 @@ public abstract class 
IgniteClientDataStructuresAbstractTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testQueue() throws Exception {
         Ignite clientNode = clientIgnite();
         Ignite srvNode = serverNode();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java
index 4dcdbb7..7cbf3cc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCountDownLatchAbstractSelfTest.java
@@ -48,6 +48,9 @@ import org.apache.ignite.resources.LoggerResource;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -58,6 +61,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Cache count down latch self test.
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteCountDownLatchAbstractSelfTest extends 
IgniteAtomicsAbstractTest
     implements Externalizable {
     /** */
@@ -77,6 +81,7 @@ public abstract class IgniteCountDownLatchAbstractSelfTest 
extends IgniteAtomics
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLatch() throws Exception {
         checkLatch();
     }
@@ -87,6 +92,7 @@ public abstract class IgniteCountDownLatchAbstractSelfTest 
extends IgniteAtomics
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testIsolation() throws Exception {
         Ignite ignite = grid(0);
 
@@ -325,6 +331,7 @@ public abstract class IgniteCountDownLatchAbstractSelfTest 
extends IgniteAtomics
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLatchMultinode1() throws Exception {
         if (gridCount() == 1)
             return;
@@ -382,6 +389,7 @@ public abstract class IgniteCountDownLatchAbstractSelfTest 
extends IgniteAtomics
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLatchBroadcast() throws Exception {
         Ignite ignite = grid(0);
         ClusterGroup srvsGrp = ignite.cluster().forServers();
@@ -434,6 +442,7 @@ public abstract class IgniteCountDownLatchAbstractSelfTest 
extends IgniteAtomics
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLatchMultinode2() throws Exception {
         if (gridCount() == 1)
             return;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
index db4754c..fa32d69 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureUniqueNameTest.java
@@ -41,6 +41,9 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.lang.IgniteUuid;
 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.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -48,6 +51,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteDataStructureUniqueNameTest extends 
IgniteCollectionAbstractTest {
     /** {@inheritDoc} */
     @Override protected int gridCount() {
@@ -81,6 +85,7 @@ public class IgniteDataStructureUniqueNameTest extends 
IgniteCollectionAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUniqueNameMultithreaded() throws Exception {
         testUniqueName(true);
     }
@@ -88,6 +93,7 @@ public class IgniteDataStructureUniqueNameTest extends 
IgniteCollectionAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUniqueNameMultinode() throws Exception {
         testUniqueName(false);
     }
@@ -95,6 +101,7 @@ public class IgniteDataStructureUniqueNameTest extends 
IgniteCollectionAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCreateRemove() throws Exception {
         final String name = IgniteUuid.randomUuid().toString();
 
@@ -232,6 +239,7 @@ public class IgniteDataStructureUniqueNameTest extends 
IgniteCollectionAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUniqueNamePerGroup() throws Exception {
         Ignite ignite = ignite(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
index 2b99a91..72c9878 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
@@ -32,10 +32,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 IgniteDataStructureWithJobTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -57,6 +61,7 @@ public class IgniteDataStructureWithJobTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJobWithRestart() throws Exception {
         Ignite ignite = startGrid(0);
 
@@ -103,4 +108,4 @@ public class IgniteDataStructureWithJobTest extends 
GridCommonAbstractTest {
 
         fut.get();
     }
-}
\ 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/datastructures/IgniteExchangeLatchManagerCoordinatorFailTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerCoordinatorFailTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerCoordinatorFailTest.java
index d8f23ac..9aa1fc6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerCoordinatorFailTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteExchangeLatchManagerCoordinatorFailTest.java
@@ -31,10 +31,14 @@ import org.apache.ignite.lang.IgniteBiClosure;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests for {@link ExchangeLatchManager} functionality when latch coordinator 
is failed.
  */
+@RunWith(JUnit4.class)
 public class IgniteExchangeLatchManagerCoordinatorFailTest extends 
GridCommonAbstractTest {
     /** */
     private static final String LATCH_NAME = "test";
@@ -145,6 +149,7 @@ public class IgniteExchangeLatchManagerCoordinatorFailTest 
extends GridCommonAbs
      * Node 3 state -> {@link #all}
      * Node 4 state -> {@link #beforeCreate}
      */
+    @Test
     public void testCoordinatorFail1() throws Exception {
         List<IgniteBiClosure<ExchangeLatchManager, CountDownLatch, Boolean>> 
nodeStates = Lists.newArrayList(
             beforeCreate,
@@ -164,6 +169,7 @@ public class IgniteExchangeLatchManagerCoordinatorFailTest 
extends GridCommonAbs
      * Node 3 state -> {@link #all}
      * Node 4 state -> {@link #beforeCreate}
      */
+    @Test
     public void testCoordinatorFail2() throws Exception {
         List<IgniteBiClosure<ExchangeLatchManager, CountDownLatch, Boolean>> 
nodeStates = Lists.newArrayList(
             beforeCountDown,
@@ -183,6 +189,7 @@ public class IgniteExchangeLatchManagerCoordinatorFailTest 
extends GridCommonAbs
      * Node 3 state -> {@link #all}
      * Node 4 state -> {@link #beforeCreate}
      */
+    @Test
     public void testCoordinatorFail3() throws Exception {
         List<IgniteBiClosure<ExchangeLatchManager, CountDownLatch, Boolean>> 
nodeStates = Lists.newArrayList(
             all,

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
index 812ff23..0052183 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteLockAbstractSelfTest.java
@@ -58,7 +58,10 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -70,6 +73,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Cache reentrant lock self test.
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTest
     implements Externalizable {
     /** */
@@ -93,6 +97,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReentrantLock() throws Exception {
         checkReentrantLock(false);
 
@@ -102,6 +107,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFailover() throws Exception {
         if (atomicsCacheMode() == LOCAL)
             return;
@@ -121,6 +127,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testIsolation() throws Exception {
         Ignite ignite = grid(0);
 
@@ -414,6 +421,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockSerialization() throws Exception {
         final IgniteLock lock = grid(0).reentrantLock("lock", true, true, 
true);
 
@@ -443,6 +451,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInitialization() throws Exception {
         // Test #name() method.
         {
@@ -682,6 +691,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReentrantLockMultinode1() throws Exception {
         testReentrantLockMultinode1(false);
 
@@ -759,6 +769,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockInterruptibly() throws Exception {
         testLockInterruptibly(false);
 
@@ -836,6 +847,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockInterruptiblyMultinode() throws Exception {
         testLockInterruptiblyMultinode(false);
 
@@ -959,6 +971,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLock() throws Exception {
         testLock(false);
 
@@ -1042,6 +1055,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTryLock() throws Exception {
         testTryLock(false);
 
@@ -1125,6 +1139,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTryLockTimed() throws Exception {
         testTryLockTimed(false);
 
@@ -1201,6 +1216,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConditionAwaitUninterruptibly() throws Exception {
         testConditionAwaitUninterruptibly(false);
 
@@ -1290,6 +1306,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConditionInterruptAwait() throws Exception {
         testConditionInterruptAwait(false);
 
@@ -1369,6 +1386,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testHasQueuedThreads() throws Exception {
         testHasQueuedThreads(false);
 
@@ -1446,6 +1464,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testHasConditionQueuedThreads() throws Exception {
         testHasConditionQueuedThreads(false);
 
@@ -1557,6 +1576,7 @@ public abstract class IgniteLockAbstractSelfTest extends 
IgniteAtomicsAbstractTe
      * on the OS thread scheduling, certain deviation from uniform 
distribution is tolerated.
      * @throws Exception If failed.
      */
+    @Test
     public void testFairness() throws Exception {
         if (gridCount() == 1)
             return;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
index 445d469..8ddabb7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
@@ -47,7 +47,10 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -59,6 +62,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Cache semaphore self test.
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteSemaphoreAbstractSelfTest extends 
IgniteAtomicsAbstractTest
     implements Externalizable {
     /** */
@@ -82,6 +86,7 @@ public abstract class IgniteSemaphoreAbstractSelfTest extends 
IgniteAtomicsAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSemaphore() throws Exception {
         checkSemaphore();
         checkSemaphoreSerialization();
@@ -90,6 +95,7 @@ public abstract class IgniteSemaphoreAbstractSelfTest extends 
IgniteAtomicsAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFailover() throws Exception {
         if (atomicsCacheMode() == LOCAL)
             return;
@@ -104,6 +110,7 @@ public abstract class IgniteSemaphoreAbstractSelfTest 
extends IgniteAtomicsAbstr
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testIsolation() throws Exception {
         Ignite ignite = grid(0);
 
@@ -282,6 +289,7 @@ public abstract class IgniteSemaphoreAbstractSelfTest 
extends IgniteAtomicsAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSemaphoreClosing() throws Exception {
         IgniteConfiguration cfg;
         GridStringLogger stringLogger;
@@ -472,6 +480,7 @@ public abstract class IgniteSemaphoreAbstractSelfTest 
extends IgniteAtomicsAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSemaphoreMultinode1() throws Exception {
         if (gridCount() == 1)
             return;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java
index d5a76f8..46cb095 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java
@@ -30,12 +30,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  */
+@RunWith(JUnit4.class)
 public class IgniteSequenceInternalCleanupTest extends GridCommonAbstractTest {
     /** */
     public static final int GRIDS_CNT = 5;
@@ -98,6 +102,7 @@ public class IgniteSequenceInternalCleanupTest extends 
GridCommonAbstractTest {
     }
 
     /** */
+    @Test
     public void testDeactivate() throws Exception {
         try {
             Ignite ignite = startGridsMultiThreaded(GRIDS_CNT);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java
index 862d240..c76762f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverNoWaitingAcquirerTest.java
@@ -27,13 +27,16 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 import java.util.concurrent.TimeUnit;
+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;
 
 /**
  *
- * Class to test the retrieval of a permit on a semaphore after initial 
semaphore owner has been closed. 
+ * Class to test the retrieval of a permit on a semaphore after initial 
semaphore owner has been closed.
  *
  * IGNITE-7090
  *
@@ -42,6 +45,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
  * </pre></b>
  *
  */
+@RunWith(JUnit4.class)
 public class SemaphoreFailoverNoWaitingAcquirerTest extends 
GridCommonAbstractTest {
     /** */
     protected static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -74,6 +78,7 @@ public class SemaphoreFailoverNoWaitingAcquirerTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePermitsPartitioned() throws Exception {
         atomicsCacheMode = PARTITIONED;
 
@@ -83,6 +88,7 @@ public class SemaphoreFailoverNoWaitingAcquirerTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePermitsReplicated() throws Exception {
         atomicsCacheMode = REPLICATED;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverSafeReleasePermitsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverSafeReleasePermitsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverSafeReleasePermitsTest.java
index 210b234..cbcf471 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverSafeReleasePermitsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/SemaphoreFailoverSafeReleasePermitsTest.java
@@ -27,6 +27,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;
@@ -34,6 +37,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class SemaphoreFailoverSafeReleasePermitsTest extends 
GridCommonAbstractTest {
     /** */
     protected static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -66,6 +70,7 @@ public class SemaphoreFailoverSafeReleasePermitsTest extends 
GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePermitsPartitioned() throws Exception {
         atomicsCacheMode = PARTITIONED;
 
@@ -75,6 +80,7 @@ public class SemaphoreFailoverSafeReleasePermitsTest extends 
GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReleasePermitsReplicated() throws Exception {
         atomicsCacheMode = REPLICATED;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalCountDownLatchSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalCountDownLatchSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalCountDownLatchSelfTest.java
index 9182c39..d39cf5d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalCountDownLatchSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalCountDownLatchSelfTest.java
@@ -24,6 +24,9 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteCountDownLatchAbstractSelfTest;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -32,6 +35,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteLocalCountDownLatchSelfTest extends 
IgniteCountDownLatchAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode atomicsCacheMode() {
@@ -44,6 +48,7 @@ public class IgniteLocalCountDownLatchSelfTest extends 
IgniteCountDownLatchAbstr
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testLatch() throws Exception {
         // Test main functionality.
         IgniteCountDownLatch latch = grid(0).countDownLatch("latch", 2, false, 
true);
@@ -92,4 +97,4 @@ public class IgniteLocalCountDownLatchSelfTest extends 
IgniteCountDownLatchAbstr
 
         checkRemovedLatch(latch);
     }
-}
\ 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/datastructures/local/IgniteLocalLockSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalLockSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalLockSelfTest.java
index 7e1a11c..b3f1a9d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalLockSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalLockSelfTest.java
@@ -24,6 +24,9 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteLockAbstractSelfTest;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -31,6 +34,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteLocalLockSelfTest extends IgniteLockAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode atomicsCacheMode() {
@@ -43,6 +47,7 @@ public class IgniteLocalLockSelfTest extends 
IgniteLockAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testReentrantLock() throws Exception {
         // Test main functionality.
         IgniteLock lock = grid(0).reentrantLock("lock", true, false, true);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalSemaphoreSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalSemaphoreSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalSemaphoreSelfTest.java
index a516fc1..2af67e0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalSemaphoreSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/local/IgniteLocalSemaphoreSelfTest.java
@@ -24,6 +24,9 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteSemaphoreAbstractSelfTest;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -31,6 +34,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteLocalSemaphoreSelfTest extends 
IgniteSemaphoreAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode atomicsCacheMode() {
@@ -43,6 +47,7 @@ public class IgniteLocalSemaphoreSelfTest extends 
IgniteSemaphoreAbstractSelfTes
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testSemaphore() throws Exception {
         // Test main functionality.
         IgniteSemaphore semaphore = grid(0).semaphore("semaphore", -2, false, 
true);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
index 84b55c5..eeee625 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java
@@ -28,12 +28,16 @@ import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicsA
 import 
org.apache.ignite.internal.processors.datastructures.GridCacheAtomicSequenceImpl;
 import org.apache.ignite.internal.util.typedef.internal.U;
 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;
 
 /**
  * Cache partitioned multi-threaded tests.
  */
+@RunWith(JUnit4.class)
 public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends 
IgniteAtomicsAbstractTest {
     /** Number of threads for multithreaded test. */
     private static final int THREAD_NUM = 30;
@@ -62,6 +66,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testValues() throws Exception {
         String seqName = UUID.randomUUID().toString();
 
@@ -137,16 +142,19 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testUpdatedSync() throws Exception {
         checkUpdate(true);
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testPreviousSync() throws Exception {
         checkUpdate(false);
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testIncrementAndGet() throws Exception {
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
@@ -163,6 +171,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testIncrementAndGetAsync() throws Exception {
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
@@ -179,6 +188,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testGetAndIncrement() throws Exception {
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
@@ -195,6 +205,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testGetAndIncrementAsync() throws Exception {
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
@@ -211,6 +222,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testAddAndGet() throws Exception {
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
@@ -227,6 +239,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testGetAndAdd() throws Exception {
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
@@ -243,6 +256,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testMixed1() throws Exception {
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
@@ -264,6 +278,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     }
 
     /** @throws Exception If failed. */
+    @Test
     public void testMixed2() throws Exception {
         // Random sequence names.
         String seqName = UUID.randomUUID().toString();
@@ -285,6 +300,7 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testMultipleSequences() throws Exception {
         final int seqCnt = 5;
         final int threadCnt = 5;
@@ -368,4 +384,4 @@ public class 
GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA
     private abstract static class GridInUnsafeClosure<E> {
         public abstract void apply(E p) throws IgniteCheckedException;
     }
-}
\ 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/datastructures/partitioned/GridCachePartitionedAtomicSequenceTxSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceTxSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceTxSelfTest.java
index 19f97bd..1fabfa4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceTxSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceTxSelfTest.java
@@ -32,12 +32,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.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;
 
 /**
  * Tests {@link IgniteAtomicSequence} operations inside started user 
transaction.
  */
+@RunWith(JUnit4.class)
 public class GridCachePartitionedAtomicSequenceTxSelfTest extends 
GridCommonAbstractTest {
     /** Number of threads. */
     private static final int THREAD_NUM = 8;
@@ -107,6 +111,7 @@ public class GridCachePartitionedAtomicSequenceTxSelfTest 
extends GridCommonAbst
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTransactionIncrement() throws Exception {
         ignite(0).atomicSequence(SEQ_NAME, 0, true);
 
@@ -123,6 +128,7 @@ public class GridCachePartitionedAtomicSequenceTxSelfTest 
extends GridCommonAbst
     /**
      * Tests isolation of system and user transactions.
      */
+    @Test
     public void testIsolation() {
         IgniteAtomicSequence seq = ignite(0).atomicSequence(SEQ_NAME, 0, true);
 
@@ -166,4 +172,4 @@ public class GridCachePartitionedAtomicSequenceTxSelfTest 
extends GridCommonAbst
                 }
         }
     }
-}
\ 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/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
index 4673549..9e88a18 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSetFailoverSelfTest.java
@@ -19,12 +19,16 @@ package 
org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import 
org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetFailoverAbstractSelfTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 
 /**
  * Set failover tests.
  */
+@RunWith(JUnit4.class)
 public class GridCachePartitionedAtomicSetFailoverSelfTest extends 
GridCacheSetFailoverAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
@@ -32,6 +36,7 @@ public class GridCachePartitionedAtomicSetFailoverSelfTest 
extends GridCacheSetF
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testNodeRestart() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-170";);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
index 0021718..f2c50f2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
@@ -30,6 +30,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.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -41,6 +44,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  * Test with variable number of nodes.
  */
+@RunWith(JUnit4.class)
 public class GridCachePartitionedNodeRestartTxSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -94,6 +98,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest 
extends GridCommonAbstrac
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimple() throws Exception {
         String key = UUID.randomUUID().toString();
 
@@ -115,6 +120,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest 
extends GridCommonAbstrac
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testCustom() throws Exception {
         String key = UUID.randomUUID().toString();
 
@@ -136,6 +142,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest 
extends GridCommonAbstrac
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomic() throws Exception {
         String key = UUID.randomUUID().toString();
 
@@ -299,4 +306,4 @@ public class GridCachePartitionedNodeRestartTxSelfTest 
extends GridCommonAbstrac
 
         stopGrid(0);
     }
-}
\ 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/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index 4412c57..7979e3c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -33,6 +33,9 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteCollectionAbstractTest;
 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 java.util.concurrent.TimeUnit.MILLISECONDS;
 
@@ -46,6 +49,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends 
IgniteCollectionAbstractTest {
     /** {@inheritDoc} */
     @Override protected int gridCount() {
@@ -107,6 +111,7 @@ public class 
GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testQueueCreation() throws Exception {
         final AtomicInteger idx = new AtomicInteger();
 
@@ -161,6 +166,7 @@ public class 
GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTx() throws Exception {
         if (cacheConfiguration().getAtomicityMode() != TRANSACTIONAL)
             return;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
index cd66f4d..ea34e74 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java
@@ -38,6 +38,9 @@ import 
org.apache.ignite.internal.processors.affinity.GridAffinityFunctionContex
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteCollectionAbstractTest;
 import org.apache.ignite.internal.util.typedef.internal.U;
 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.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -45,6 +48,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  * Cache queue test with changing topology.
  */
+@RunWith(JUnit4.class)
 public class GridCachePartitionedQueueEntryMoveSelfTest extends 
IgniteCollectionAbstractTest {
     /** Queue capacity. */
     private static final int QUEUE_CAP = 5;
@@ -82,6 +86,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest 
extends IgniteCollection
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testQueue() throws Exception {
         final String queueName = "qq";
 
@@ -212,4 +217,4 @@ public class GridCachePartitionedQueueEntryMoveSelfTest 
extends IgniteCollection
 
         return assignment.get(part);
     }
-}
\ 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/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
index ec57dea..a37944d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedSetFailoverSelfTest.java
@@ -19,19 +19,24 @@ package 
org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import 
org.apache.ignite.internal.processors.cache.datastructures.GridCacheSetFailoverAbstractSelfTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 
 /**
  * Set failover tests.
  */
+@RunWith(JUnit4.class)
 public class GridCachePartitionedSetFailoverSelfTest extends 
GridCacheSetFailoverAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheAtomicityMode collectionCacheAtomicityMode() {
         return TRANSACTIONAL;
     }
 
+    @Test
     @Override public void testNodeRestart(){
         fail("https://issues.apache.org/jira/browse/IGNITE-1593";);
     }
-}
\ 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/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
index aa075c0..bb68bbf 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedQueueNoBackupsTest.java
@@ -28,6 +28,9 @@ import 
org.apache.ignite.internal.processors.cache.GridCacheAdapter;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
 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.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -35,6 +38,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePartitionedQueueNoBackupsTest extends 
GridCachePartitionedQueueApiSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode collectionCacheMode() {
@@ -58,6 +62,7 @@ public class IgnitePartitionedQueueNoBackupsTest extends 
GridCachePartitionedQue
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCollocation() throws Exception {
         IgniteQueue<Integer> queue = grid(0).queue("queue", 0, config(true));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java
index 5f09dfa..1c8618d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java
@@ -26,10 +26,14 @@ import 
org.apache.ignite.internal.processors.cache.GridCacheAdapter;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePartitionedSetNoBackupsSelfTest extends 
GridCachePartitionedSetSelfTest {
     /** {@inheritDoc} */
     @Override protected CollectionConfiguration collectionConfiguration() {
@@ -43,6 +47,7 @@ public class IgnitePartitionedSetNoBackupsSelfTest extends 
GridCachePartitionedS
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCollocation() throws Exception {
         Set<Integer> set0 = grid(0).set(SET_NAME, config(true));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
index e54251e..078c573 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
@@ -24,10 +24,14 @@ import 
org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.WALMode;
 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 Cache64kPartitionsTest extends GridCommonAbstractTest {
     /** */
     private boolean persistenceEnabled;
@@ -62,6 +66,7 @@ public class Cache64kPartitionsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testManyPartitionsNoPersistence() throws Exception {
         checkManyPartitions();
     }
@@ -69,6 +74,7 @@ public class Cache64kPartitionsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testManyPartitionsWithPersistence() throws Exception {
         persistenceEnabled = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAbstractRestartSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAbstractRestartSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAbstractRestartSelfTest.java
index dd93626..61d96bc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAbstractRestartSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAbstractRestartSelfTest.java
@@ -32,10 +32,14 @@ import 
org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
 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.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Abstract restart test.
  */
+@RunWith(JUnit4.class)
 public abstract class CacheAbstractRestartSelfTest extends 
IgniteCacheAbstractTest {
     /** */
     private volatile CountDownLatch cacheCheckedLatch = new CountDownLatch(1);
@@ -72,6 +76,7 @@ public abstract class CacheAbstractRestartSelfTest extends 
IgniteCacheAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRestart() throws Exception {
         final int clientGrid = gridCount() - 1;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java
index 2f04870..373ba75 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java
@@ -34,10 +34,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 CacheAffinityEarlyTest extends GridCommonAbstractTest {
     /** Grid count. */
     private static int GRID_CNT = 8;
@@ -79,6 +83,7 @@ public class CacheAffinityEarlyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStartNodes() throws Exception {
         for (int i = 0; i < iters; i++) {
             try {
@@ -162,4 +167,4 @@ public class CacheAffinityEarlyTest extends 
GridCommonAbstractTest {
 
         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/CacheAsyncOperationsFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java
index 211320f..9b62c35 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java
@@ -39,12 +39,16 @@ import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.testframework.GridTestUtils;
 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.CacheMode.PARTITIONED;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public abstract class CacheAsyncOperationsFailoverAbstractTest extends 
GridCacheAbstractSelfTest {
     /** */
     private static final int NODE_CNT = 4;
@@ -96,6 +100,7 @@ public abstract class 
CacheAsyncOperationsFailoverAbstractTest extends GridCache
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPutAllAsyncFailover() throws Exception {
         putAllAsyncFailover(5, 10);
     }
@@ -103,6 +108,7 @@ public abstract class 
CacheAsyncOperationsFailoverAbstractTest extends GridCache
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPutAllAsyncFailoverManyThreads() throws Exception {
         
putAllAsyncFailover(ignite(0).configuration().getSystemThreadPoolSize() * 2, 3);
     }
@@ -110,6 +116,7 @@ public abstract class 
CacheAsyncOperationsFailoverAbstractTest extends GridCache
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAsyncFailover() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-9759";);
 
@@ -374,4 +381,4 @@ public abstract class 
CacheAsyncOperationsFailoverAbstractTest extends GridCache
             return S.toString(TestValue.class, this);
         }
     }
-}
\ 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/CacheAsyncOperationsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.java
index 0416d17..d6933ff 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.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 CacheAsyncOperationsTest extends GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -73,6 +77,7 @@ public class CacheAsyncOperationsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAsyncOperationsTx() throws Exception {
         asyncOperations(TRANSACTIONAL);
     }
@@ -80,6 +85,7 @@ public class CacheAsyncOperationsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAsyncOperationsMvccTx() throws Exception {
         asyncOperations(TRANSACTIONAL_SNAPSHOT);
     }
@@ -87,6 +93,7 @@ public class CacheAsyncOperationsTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAsyncOperationsAtomic() throws Exception {
         asyncOperations(ATOMIC);
     }
@@ -263,4 +270,4 @@ public class CacheAsyncOperationsTest extends 
GridCommonAbstractTest {
             // No-op.
         }
     }
-}
\ 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/CacheAtomicPrimarySyncBackPressureTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicPrimarySyncBackPressureTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicPrimarySyncBackPressureTest.java
index 62707c7..0534001 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicPrimarySyncBackPressureTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAtomicPrimarySyncBackPressureTest.java
@@ -34,12 +34,16 @@ import 
org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.IgniteSpiException;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Checks that back-pressure control restricts uncontrolled growing
  * of backup message queue. This means, if queue too big - any reads
  * will be stopped until received acks from backup nodes.
  */
+@RunWith(JUnit4.class)
 public class CacheAtomicPrimarySyncBackPressureTest extends 
GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
@@ -73,6 +77,7 @@ public class CacheAtomicPrimarySyncBackPressureTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientPut() throws Exception {
         Ignite srv1 = startGrid("server1");
         Ignite srv2 = startGrid("server2");
@@ -85,6 +90,7 @@ public class CacheAtomicPrimarySyncBackPressureTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerPut() throws Exception {
         Ignite srv1 = startGrid("server1");
         Ignite srv2 = startGrid("server2");

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
index 053ed82..2d4b3b3 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -56,6 +56,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 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.FULL_SYNC;
@@ -64,6 +67,7 @@ import static 
org.apache.ignite.cache.PartitionLossPolicy.READ_ONLY_SAFE;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
     /** */
     private static final String CACHE_NAME = "cache";
@@ -151,6 +155,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testRebalanceForCacheWithNodeFilter() throws Exception {
         try {
             final int EMPTY_NODE_IDX = 2;
@@ -232,6 +237,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTopologyChangesWithFixedBaseline() throws Exception {
         startGrids(NODE_COUNT);
 
@@ -367,6 +373,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBaselineTopologyChangesFromServer() throws Exception {
         testBaselineTopologyChanges(false);
     }
@@ -374,6 +381,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBaselineTopologyChangesFromClient() throws Exception {
         testBaselineTopologyChanges(true);
     }
@@ -381,6 +389,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testClusterActiveWhileBaselineChanging() throws Exception {
         startGrids(NODE_COUNT);
 
@@ -542,6 +551,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPrimaryLeft() throws Exception {
         startGrids(NODE_COUNT);
 
@@ -629,6 +639,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPrimaryLeftAndClusterRestart() throws Exception {
         startGrids(NODE_COUNT);
 
@@ -740,6 +751,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testMetadataUpdate() throws Exception {
         startGrids(5);
 
@@ -776,6 +788,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testClusterRestoredOnRestart() throws Exception {
         startGrids(5);
 
@@ -811,6 +824,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNonPersistentCachesIgnoreBaselineTopology() throws 
Exception {
         Ignite ig = startGrids(4);
 
@@ -832,6 +846,7 @@ public class CacheBaselineTopologyTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testAffinityAssignmentChangedAfterRestart() throws Exception {
         int parts = 32;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnGetAllTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnGetAllTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnGetAllTest.java
index b970787..dd301b1 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnGetAllTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnGetAllTest.java
@@ -21,6 +21,9 @@ import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 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 CacheBlockOnGetAllTest extends CacheBlockOnReadAbstractTest {
 
     /** {@inheritDoc} */
@@ -52,192 +56,224 @@ public class CacheBlockOnGetAllTest 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";);
     }

Reply via email to