http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
index 2b7d3a4..84970d0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
@@ -31,10 +31,14 @@ import org.apache.ignite.lang.IgniteCallable;
 import org.apache.ignite.resources.JobContextResource;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests handling of job result serialization error.
  */
+@RunWith(JUnit4.class)
 public class GridClosureSerializationTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(final String 
igniteInstanceName) throws Exception {
@@ -57,6 +61,7 @@ public class GridClosureSerializationTest extends 
GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings({"Convert2Lambda"})
+    @Test
     public void testSerializationFailure() throws Exception {
         final IgniteEx ignite0 = grid(0);
         final IgniteEx ignite1 = grid(1);
@@ -78,6 +83,7 @@ public class GridClosureSerializationTest extends 
GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings({"Convert2Lambda"})
+    @Test
     public void testExceptionSerializationFailure() throws Exception {
         final IgniteEx ignite0 = grid(0);
         final IgniteEx ignite1 = grid(1);
@@ -99,6 +105,7 @@ public class GridClosureSerializationTest extends 
GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings({"Convert2Lambda"})
+    @Test
     public void testAttributesSerializationFailure() throws Exception {
         final IgniteEx ignite0 = grid(0);
         final IgniteEx ignite1 = grid(1);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java
index 2b706d5..d29f062 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridAddressResolverSelfTest.java
@@ -30,11 +30,15 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Address Resolver test.
  */
 @GridCommonTest(group = "Kernal Self")
+@RunWith(JUnit4.class)
 public class GridAddressResolverSelfTest extends GridCommonAbstractTest {
     /** */
     private final InetSocketAddress addr0 = new InetSocketAddress("test0.com", 
5000);
@@ -76,6 +80,7 @@ public class GridAddressResolverSelfTest extends 
GridCommonAbstractTest {
     }
 
     /** */
+    @Test
     public void test() throws Exception {
         startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
index 58c41b5..c73dd27 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
@@ -24,12 +24,16 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteProductVersion;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.mockito.Mockito;
 
 /**
  * Update notifier test.
  */
 @GridCommonTest(group = "Kernal Self")
+@RunWith(JUnit4.class)
 public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
     /** */
     private String updateStatusParams;
@@ -64,6 +68,7 @@ public class GridUpdateNotifierSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNotifier() throws Exception {
         String nodeVer = IgniteProperties.get("ignite.version");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java
index dc24156..5afb0e2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.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;
 
 /**
  * Manual test to reproduce IGNITE-4053
  */
+@RunWith(JUnit4.class)
 public class GridComputeJobExecutionErrorToLogManualTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -58,6 +62,7 @@ public class GridComputeJobExecutionErrorToLogManualTest 
extends GridCommonAbstr
     /**
      * @throws Exception If fails.
      */
+    @Test
     public void testRuntimeException() throws Exception {
         Ignite ignite = grid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeConfigVariationsFullApiTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeConfigVariationsFullApiTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeConfigVariationsFullApiTest.java
index d1fbb34..3e6736e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeConfigVariationsFullApiTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeConfigVariationsFullApiTest.java
@@ -50,11 +50,15 @@ import org.apache.ignite.lang.IgniteRunnable;
 import 
org.apache.ignite.testframework.junits.IgniteConfigVariationsAbstractTest;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Full API compute test.
  */
 @SuppressWarnings("unchecked")
+@RunWith(JUnit4.class)
 public class IgniteComputeConfigVariationsFullApiTest extends 
IgniteConfigVariationsAbstractTest {
     /** Max job count. */
     private static final int MAX_JOB_COUNT = 10;
@@ -177,6 +181,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExecuteTaskClass() throws Exception {
         runTest(jobFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -201,6 +206,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExecuteTaskClassAsync() throws Exception {
         runTest(jobFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -225,6 +231,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExecuteTask() throws Exception {
         runTest(jobFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -248,6 +255,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExecuteTaskAsync() throws Exception {
         runTest(jobFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -271,6 +279,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBroadcastClosure() throws Exception {
         runTest(closureFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -294,6 +303,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBroadcastClosureAsync() throws Exception {
         runTest(closureFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -317,6 +327,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBroadcastCallable() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -346,6 +357,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBroadcastCallableAsync() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -375,6 +387,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBroadcastRunnable() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -389,6 +402,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBroadcastRunnableAsync() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -405,6 +419,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRun() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -427,6 +442,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRunAsync() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -453,6 +469,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApplyAsync() throws Exception {
         runTest(closureFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -480,6 +497,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApply() throws Exception {
         runTest(closureFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -499,6 +517,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApplyForCollection() throws Exception {
         runTest(closureFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -524,6 +543,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApplyForCollectionAsync() throws Exception {
         runTest(closureFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -550,6 +570,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApplyForCollectionWithReducer() throws Exception {
         runTest(closureFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -585,6 +606,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApplyForCollectionWithReducerAsync() throws Exception {
         runTest(closureFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -620,6 +642,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCallAsync() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -648,6 +671,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCall() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -668,6 +692,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCallCollection() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -690,6 +715,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCallCollectionAsync() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -712,6 +738,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCallCollectionWithReducer() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -746,6 +773,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCallCollectionWithReducerAsync() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -780,6 +808,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinityCall() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -806,6 +835,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinityCallAsync() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -834,6 +864,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiCacheAffinityCall() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -861,6 +892,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiCacheAffinityCallAsync() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -890,6 +922,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiCacheByPartIdAffinityCall() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -917,6 +950,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiCacheByPartIdAffinityCallAsync() throws Exception {
         runTest(callableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -946,6 +980,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinityRun() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -965,6 +1000,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinityRunAsync() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -986,6 +1022,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiCacheAffinityRun() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -1006,6 +1043,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiCacheAffinityRunAsync() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -1028,6 +1066,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiCacheByPartIdAffinityRun() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -1048,6 +1087,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultiCacheByPartIdAffinityRunAsync() throws Exception {
         runTest(runnableFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -1070,6 +1110,7 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDeployExecuteByName() throws Exception {
         runTest(jobFactories, new ComputeTest() {
             @Override public void test(Factory factory, Ignite ignite) throws 
Exception {
@@ -1127,7 +1168,8 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
          * @param ignite Ignite instance to use.
          * @throws Exception If failed.
          */
-        public void test(Factory factory, Ignite ignite) throws Exception;
+        @Test
+    public void test(Factory factory, Ignite ignite) throws Exception;
     }
 
     /**
@@ -2469,4 +2511,4 @@ public class IgniteComputeConfigVariationsFullApiTest 
extends IgniteConfigVariat
             out.writeObject(eVal);
         }
     }
-}
\ 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/compute/IgniteComputeCustomExecutorConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorConfigurationSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorConfigurationSelfTest.java
index 2277100..b35b625 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorConfigurationSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorConfigurationSelfTest.java
@@ -25,10 +25,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;
 
 /**
  * Tests custom executor configuration.
  */
+@RunWith(JUnit4.class)
 public class IgniteComputeCustomExecutorConfigurationSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -49,6 +53,7 @@ public class IgniteComputeCustomExecutorConfigurationSelfTest 
extends GridCommon
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConfigurations() throws Exception {
         try {
             checkStartWithInvalidConfiguration(getConfiguration("node0")

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java
index 18c52c0..b59fdcf 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/IgniteComputeCustomExecutorSelfTest.java
@@ -36,12 +36,16 @@ import org.apache.ignite.lang.IgniteReducer;
 import org.apache.ignite.lang.IgniteRunnable;
 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;
 
 /**
  * Tests custom executor named pools.
  *
  * https://issues.apache.org/jira/browse/IGNITE-4699
  */
+@RunWith(JUnit4.class)
 public class IgniteComputeCustomExecutorSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final int GRID_CNT = 2;
@@ -96,6 +100,7 @@ public class IgniteComputeCustomExecutorSelfTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If fails.
      */
+    @Test
     public void testInvalidCustomExecutor() throws Exception {
         grid(0).compute().withExecutor("invalid").broadcast(new 
IgniteRunnable() {
             @Override public void run() {
@@ -107,6 +112,7 @@ public class IgniteComputeCustomExecutorSelfTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If fails.
      */
+    @Test
     public void testAllComputeApiByCustomExecutor() throws Exception {
         IgniteCompute comp = grid(0).compute().withExecutor(EXEC_NAME0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/PublicThreadpoolStarvationTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/PublicThreadpoolStarvationTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/PublicThreadpoolStarvationTest.java
index dd9e0d5..c99b55a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/PublicThreadpoolStarvationTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/PublicThreadpoolStarvationTest.java
@@ -25,6 +25,9 @@ import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
 import org.apache.ignite.lang.IgniteRunnable;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+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;
@@ -33,6 +36,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
  * Test to validate https://issues.apache.org/jira/browse/IGNITE-4239
  * Jobs hang when a lot of jobs calculate cache.
  */
+@RunWith(JUnit4.class)
 public class PublicThreadpoolStarvationTest extends GridCacheAbstractSelfTest {
     /** Cache size. */
     private static final int CACHE_SIZE = 10;
@@ -113,6 +117,7 @@ public class PublicThreadpoolStarvationTest extends 
GridCacheAbstractSelfTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCacheSizeOnPublicThreadpoolStarvation() throws Exception {
         grid(0).compute().run(new IgniteRunnable() {
             @Override public void run() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
index d2d895e..e5800bf 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
@@ -53,6 +53,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -67,6 +70,7 @@ import static 
org.apache.ignite.internal.processors.continuous.GridContinuousPro
 /**
  * Event consume test.
  */
+@RunWith(JUnit4.class)
 public class GridEventConsumeSelfTest extends GridCommonAbstractTest {
     /** */
     private static final String PRJ_PRED_CLS_NAME = 
"org.apache.ignite.tests.p2p.GridEventConsumeProjectionPredicate";
@@ -174,6 +178,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApi() throws Exception {
         try {
             grid(0).events().stopRemoteListen(null);
@@ -251,6 +256,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApiAsyncOld() throws Exception {
         IgniteEvents evtAsync = grid(0).events().withAsync();
 
@@ -341,6 +347,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testApiAsync() throws Exception {
         IgniteEvents evt = grid(0).events();
 
@@ -420,6 +427,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAllEvents() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -460,6 +468,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEventsByType() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -501,6 +510,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEventsByFilter() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -545,6 +555,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEventsByTypeAndFilter() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -591,6 +602,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRemoteProjection() throws Exception {
         final Collection<UUID> nodeIds = new ConcurrentSkipListSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -632,6 +644,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testProjectionWithLocalNode() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -673,6 +686,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLocalNodeOnly() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -716,6 +730,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStopByCallback() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -757,6 +772,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStopRemoteListen() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -807,6 +823,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStopLocalListenByCallback() throws Exception {
         final AtomicInteger cnt = new AtomicInteger();
         final CountDownLatch latch = new CountDownLatch(1);
@@ -842,6 +859,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeJoin() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -893,6 +911,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeJoinWithProjection() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -947,6 +966,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeJoinWithP2P() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-585";);
 
@@ -995,6 +1015,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testResources() throws Exception {
         final Collection<UUID> nodeIds = new HashSet<>();
         final AtomicInteger cnt = new AtomicInteger();
@@ -1049,6 +1070,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMasterNodeLeave() throws Exception {
         final CountDownLatch latch = new CountDownLatch(GRID_CNT);
 
@@ -1088,6 +1110,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMasterNodeLeaveNoAutoUnsubscribe() throws Exception {
         Ignite g = startGrid("anotherGrid");
 
@@ -1145,6 +1168,7 @@ public class GridEventConsumeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultithreadedWithNodeRestart() throws Exception {
         final AtomicBoolean stop = new AtomicBoolean();
         final BlockingQueue<IgniteBiTuple<Integer, UUID>> queue = new 
LinkedBlockingQueue<>();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
index c0cd5f2..7fd5eab 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
@@ -40,12 +40,16 @@ import org.apache.ignite.resources.IgniteInstanceResource;
 import org.apache.ignite.testframework.GridTestUtils;
 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 java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Message listen test.
  */
+@RunWith(JUnit4.class)
 public class GridMessageListenSelfTest extends GridCommonAbstractTest {
     /** */
     private static final int GRID_CNT = 3;
@@ -143,6 +147,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNullTopic() throws Exception {
         latch = new CountDownLatch(MSG_CNT * GRID_CNT);
 
@@ -163,6 +168,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNonNullTopic() throws Exception {
         latch = new CountDownLatch(MSG_CNT * GRID_CNT);
 
@@ -183,6 +189,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStopListen() throws Exception {
         latch = new CountDownLatch(GRID_CNT);
 
@@ -208,6 +215,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testProjection() throws Exception {
         latch = new CountDownLatch(MSG_CNT * (GRID_CNT - 1));
 
@@ -227,6 +235,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeJoin() throws Exception {
         latch = new CountDownLatch(MSG_CNT * (GRID_CNT + 1));
 
@@ -259,6 +268,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeJoinWithProjection() throws Exception {
         latch = new CountDownLatch(MSG_CNT * GRID_CNT);
 
@@ -298,6 +308,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNullTopicWithDeployment() throws Exception {
         Class<?> cls = getExternalClassLoader().loadClass(LSNR_CLS_NAME);
 
@@ -317,6 +328,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNonNullTopicWithDeployment() throws Exception {
         ClassLoader ldr = getExternalClassLoader();
 
@@ -341,6 +353,7 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testListenActor() throws Exception {
         latch = new CountDownLatch(MSG_CNT * (GRID_CNT + 1));
 
@@ -494,4 +507,4 @@ public class GridMessageListenSelfTest extends 
GridCommonAbstractTest {
             latch.countDown();
         }
     }
-}
\ 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/continuous/IgniteNoCustomEventsOnNodeStart.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java
index dc151a6..0e6f736 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java
@@ -25,10 +25,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;
 
 /**
  * Sanity test to verify there are no unnecessary messages on node start.
  */
+@RunWith(JUnit4.class)
 public class IgniteNoCustomEventsOnNodeStart extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -56,6 +60,7 @@ public class IgniteNoCustomEventsOnNodeStart extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNoCustomEventsOnStart() throws Exception {
         failed = false;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
index ae9aff8..57a9715 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
@@ -77,6 +77,9 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentLinkedHashMap;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.internal.pagemem.PageIdUtils.effectivePageId;
 import static 
org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree.rnd;
@@ -86,6 +89,7 @@ import static 
org.apache.ignite.internal.util.IgniteTree.OperationType.REMOVE;
 
 /**
  */
+@RunWith(JUnit4.class)
 public class BPlusTreeSelfTest extends GridCommonAbstractTest {
     /** */
     private static final short LONG_INNER_IO = 30000;
@@ -216,6 +220,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testFind() throws IgniteCheckedException {
         TestTree tree = createTestTree(true);
         TreeMap<Long, Long> map = new TreeMap<>();
@@ -234,6 +239,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testRetries() throws IgniteCheckedException {
         TestTree tree = createTestTree(true);
 
@@ -254,6 +260,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testIsEmpty() throws Exception {
         TestTree tree = createTestTree(true);
 
@@ -277,6 +284,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testFindWithClosure() throws IgniteCheckedException {
         TestTree tree = createTestTree(true);
         TreeMap<Long, Long> map = new TreeMap<>();
@@ -339,6 +347,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_1_20_mm_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 20;
@@ -351,6 +360,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_1_20_mm_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 20;
@@ -363,6 +373,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_1_20_pm_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 20;
@@ -375,6 +386,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_1_20_pm_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 20;
@@ -387,6 +399,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_1_20_pp_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 20;
@@ -399,6 +412,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_1_20_pp_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 20;
@@ -411,6 +425,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_1_20_mp_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 20;
@@ -423,6 +438,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_1_20_mp_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 20;
@@ -436,6 +452,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_2_40_mm_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 2;
         CNT = 40;
@@ -448,6 +465,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_2_40_mm_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 2;
         CNT = 40;
@@ -460,6 +478,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_2_40_pm_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 2;
         CNT = 40;
@@ -472,6 +491,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_2_40_pm_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 2;
         CNT = 40;
@@ -484,6 +504,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_2_40_pp_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 2;
         CNT = 40;
@@ -496,6 +517,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_2_40_pp_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 2;
         CNT = 40;
@@ -508,6 +530,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_2_40_mp_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 2;
         CNT = 40;
@@ -520,6 +543,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_2_40_mp_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 2;
         CNT = 40;
@@ -533,6 +557,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_3_60_mm_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 3;
         CNT = 60;
@@ -545,6 +570,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_3_60_mm_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 3;
         CNT = 60;
@@ -557,6 +583,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_3_60_pm_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 3;
         CNT = 60;
@@ -569,6 +596,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_3_60_pm_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 3;
         CNT = 60;
@@ -581,6 +609,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_3_60_pp_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 3;
         CNT = 60;
@@ -593,6 +622,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_3_60_pp_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 3;
         CNT = 60;
@@ -605,6 +635,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_3_60_mp_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 3;
         CNT = 60;
@@ -617,6 +648,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testPutRemove_3_60_mp_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 3;
         CNT = 60;
@@ -733,6 +765,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testRandomInvoke_1_30_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 30;
@@ -743,6 +776,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testRandomInvoke_1_30_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 30;
@@ -854,6 +888,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testRandomPutRemove_1_30_0() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 30;
@@ -864,6 +899,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testRandomPutRemove_1_30_1() throws IgniteCheckedException {
         MAX_PER_PAGE = 1;
         CNT = 30;
@@ -874,6 +910,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveRemove3_false() throws Exception {
         MAX_PER_PAGE = 3;
 
@@ -883,6 +920,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveRemove3_true() throws Exception {
         MAX_PER_PAGE = 3;
 
@@ -892,6 +930,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveRemove2_false() throws Exception {
         MAX_PER_PAGE = 2;
 
@@ -901,6 +940,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveRemove2_true() throws Exception {
         MAX_PER_PAGE = 2;
 
@@ -910,6 +950,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveRemove1_false() throws Exception {
         MAX_PER_PAGE = 1;
 
@@ -919,6 +960,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveRemove1_true() throws Exception {
         MAX_PER_PAGE = 1;
 
@@ -993,6 +1035,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassivePut1_true() throws Exception {
         MAX_PER_PAGE = 1;
 
@@ -1002,6 +1045,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassivePut1_false() throws Exception {
         MAX_PER_PAGE = 1;
 
@@ -1011,12 +1055,14 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassivePut2_true() throws Exception {
         MAX_PER_PAGE = 2;
 
         doTestMassivePut(true);
     }
 
+    @Test
     public void testMassivePut2_false() throws Exception {
         MAX_PER_PAGE = 2;
 
@@ -1026,12 +1072,14 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMassivePut3_true() throws Exception {
         MAX_PER_PAGE = 3;
 
         doTestMassivePut(true);
     }
 
+    @Test
     public void testMassivePut3_false() throws Exception {
         MAX_PER_PAGE = 3;
 
@@ -1164,6 +1212,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testEmptyCursors() throws IgniteCheckedException {
         MAX_PER_PAGE = 5;
 
@@ -1194,6 +1243,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testCursorConcurrentMerge() throws IgniteCheckedException {
         MAX_PER_PAGE = 5;
 
@@ -1269,6 +1319,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testSizeForPutRmvSequential() throws IgniteCheckedException {
         MAX_PER_PAGE = 5;
 
@@ -1358,6 +1409,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSizeForRandomPutRmvMultithreaded_5_4() throws Exception {
         MAX_PER_PAGE = 5;
         CNT = 10_000;
@@ -1365,6 +1417,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
         doTestSizeForRandomPutRmvMultithreaded(4);
     }
 
+    @Test
     public void testSizeForRandomPutRmvMultithreaded_3_256() throws Exception {
         MAX_PER_PAGE = 3;
         CNT = 10_000;
@@ -1481,6 +1534,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
      *
      * @see #doTestSizeForRandomPutRmvMultithreadedAsync 
doTestSizeForRandomPutRmvMultithreadedAsync() for details.
      */
+    @Test
     public void testSizeForRandomPutRmvMultithreadedAsync_16() throws 
Exception {
         doTestSizeForRandomPutRmvMultithreadedAsync(16);
     }
@@ -1491,6 +1545,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
      *
      * @see #doTestSizeForRandomPutRmvMultithreadedAsync 
doTestSizeForRandomPutRmvMultithreadedAsync() for details.
      */
+    @Test
     public void testSizeForRandomPutRmvMultithreadedAsync_3() throws Exception 
{
         doTestSizeForRandomPutRmvMultithreadedAsync(3);
     }
@@ -1660,6 +1715,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception if test failed
      */
+    @Test
     public void testPutSizeLivelock() throws Exception {
         MAX_PER_PAGE = 5;
         CNT = 800;
@@ -1792,6 +1848,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPutRmvSizeSinglePageContention() throws Exception {
         MAX_PER_PAGE = 10;
         CNT = 20_000;
@@ -1913,6 +1970,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPutRmvFindSizeMultithreaded() throws Exception {
         MAX_PER_PAGE = 5;
         CNT = 60_000;
@@ -2050,6 +2108,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTestRandomPutRemoveMultithreaded_1_30_0() throws Exception 
{
         MAX_PER_PAGE = 1;
         CNT = 30;
@@ -2060,6 +2119,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTestRandomPutRemoveMultithreaded_1_30_1() throws Exception 
{
         MAX_PER_PAGE = 1;
         CNT = 30;
@@ -2070,6 +2130,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTestRandomPutRemoveMultithreaded_2_50_0() throws Exception 
{
         MAX_PER_PAGE = 2;
         CNT = 50;
@@ -2080,6 +2141,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTestRandomPutRemoveMultithreaded_2_50_1() throws Exception 
{
         MAX_PER_PAGE = 2;
         CNT = 50;
@@ -2090,6 +2152,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTestRandomPutRemoveMultithreaded_3_70_0() throws Exception 
{
         MAX_PER_PAGE = 3;
         CNT = 70;
@@ -2100,6 +2163,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTestRandomPutRemoveMultithreaded_3_70_1() throws Exception 
{
         MAX_PER_PAGE = 3;
         CNT = 70;
@@ -2110,6 +2174,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testFindFirstAndLast() throws IgniteCheckedException {
         MAX_PER_PAGE = 5;
 
@@ -2136,6 +2201,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIterate() throws Exception {
         MAX_PER_PAGE = 5;
 
@@ -2166,6 +2232,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIterateConcurrentPutRemove() throws Exception {
         iterateConcurrentPutRemove();
     }
@@ -2173,6 +2240,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIterateConcurrentPutRemove_1() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7265";);
 
@@ -2184,6 +2252,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIterateConcurrentPutRemove_5() throws Exception {
         MAX_PER_PAGE = 5;
 
@@ -2193,6 +2262,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIteratePutRemove_10() throws Exception {
         MAX_PER_PAGE = 10;
 
@@ -2338,6 +2408,7 @@ public class BPlusTreeSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentGrowDegenerateTreeAndConcurrentRemove() throws 
Exception {
         //calculate tree size when split happens
         final TestTree t = createTestTree(true);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListImplSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListImplSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListImplSelfTest.java
index 74f80df..2f78c56 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListImplSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListImplSelfTest.java
@@ -52,10 +52,14 @@ import 
org.apache.ignite.plugin.extensions.communication.MessageWriter;
 import org.apache.ignite.testframework.GridTestUtils;
 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;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CacheFreeListImplSelfTest extends GridCommonAbstractTest {
     /** */
     private static final int CPUS = Runtime.getRuntime().availableProcessors();
@@ -79,6 +83,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteSingleThreaded_1024() throws Exception {
         checkInsertDeleteSingleThreaded(1024);
     }
@@ -86,6 +91,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteSingleThreaded_2048() throws Exception {
         checkInsertDeleteSingleThreaded(2048);
     }
@@ -93,6 +99,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteSingleThreaded_4096() throws Exception {
         checkInsertDeleteSingleThreaded(4096);
     }
@@ -100,6 +107,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteSingleThreaded_8192() throws Exception {
         checkInsertDeleteSingleThreaded(8192);
     }
@@ -107,6 +115,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteSingleThreaded_16384() throws Exception {
         checkInsertDeleteSingleThreaded(16384);
     }
@@ -114,6 +123,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteMultiThreaded_1024() throws Exception {
         checkInsertDeleteMultiThreaded(1024);
     }
@@ -121,6 +131,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteMultiThreaded_2048() throws Exception {
         checkInsertDeleteMultiThreaded(2048);
     }
@@ -128,6 +139,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteMultiThreaded_4096() throws Exception {
         checkInsertDeleteMultiThreaded(4096);
     }
@@ -135,6 +147,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteMultiThreaded_8192() throws Exception {
         checkInsertDeleteMultiThreaded(8192);
     }
@@ -142,6 +155,7 @@ public class CacheFreeListImplSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testInsertDeleteMultiThreaded_16384() throws Exception {
         checkInsertDeleteMultiThreaded(16384);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/DataRegionMetricsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/DataRegionMetricsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/DataRegionMetricsSelfTest.java
index 122f50e..a62b891 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/DataRegionMetricsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/DataRegionMetricsSelfTest.java
@@ -23,12 +23,16 @@ import 
org.apache.ignite.configuration.DataRegionConfiguration;
 import 
org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl;
 import org.apache.ignite.internal.processors.cache.ratemetrics.HitRateMetrics;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.lang.Thread.sleep;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class DataRegionMetricsSelfTest extends GridCommonAbstractTest {
     /** */
     private DataRegionMetricsImpl memMetrics;
@@ -61,6 +65,7 @@ public class DataRegionMetricsSelfTest extends 
GridCommonAbstractTest {
      * Test for allocationRate metric in single-threaded mode.
      * @throws Exception if any happens during test.
      */
+    @Test
     public void testAllocationRateSingleThreaded() throws Exception {
         threadsCnt = 1;
         memMetrics.rateTimeInterval(RATE_TIME_INTERVAL_2);
@@ -84,6 +89,7 @@ public class DataRegionMetricsSelfTest extends 
GridCommonAbstractTest {
      * Test for allocationRate metric in multi-threaded mode with short silent 
period in the middle of the test.
      * @throws Exception if any happens during test.
      */
+    @Test
     public void testAllocationRateMultiThreaded() throws Exception {
         threadsCnt = 4;
         memMetrics.rateTimeInterval(RATE_TIME_INTERVAL_1);
@@ -123,6 +129,7 @@ public class DataRegionMetricsSelfTest extends 
GridCommonAbstractTest {
      * Test verifies that allocationRate calculation algorithm survives 
setting new values to rateTimeInterval parameter.
      * @throws Exception if any happens during test.
      */
+    @Test
     public void testAllocationRateTimeIntervalConcurrentChange() throws 
Exception {
         threadsCnt = 5;
         memMetrics.rateTimeInterval(RATE_TIME_INTERVAL_1);
@@ -153,6 +160,7 @@ public class DataRegionMetricsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception if any happens during test.
      */
+    @Test
     public void testAllocationRateSubintervalsConcurrentChange() throws 
Exception {
         threadsCnt = 5;
         memMetrics.rateTimeInterval(RATE_TIME_INTERVAL_1);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
index 126ed5f..3d8b5aa 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
@@ -30,10 +30,14 @@ import 
org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.util.typedef.internal.U;
 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 IgniteDbDynamicCacheSelfTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
@@ -79,6 +83,7 @@ public class IgniteDbDynamicCacheSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCreate() throws Exception {
         int iterations = 200;
 
@@ -112,6 +117,7 @@ public class IgniteDbDynamicCacheSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMultipleDynamicCaches() throws Exception {
         int caches = 10;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakAbstractTest.java
index 81b5515..9047609 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbMemoryLeakAbstractTest.java
@@ -26,12 +26,16 @@ import 
org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
 import org.apache.ignite.internal.processors.cache.persistence.DataStructure;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.IgniteSystemProperties.getInteger;
 
 /**
  * Base class for memory leaks tests.
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteDbMemoryLeakAbstractTest extends 
IgniteDbAbstractTest {
     /** */
     private static final int CONCURRENCY_LEVEL = 16;
@@ -173,6 +177,7 @@ public abstract class IgniteDbMemoryLeakAbstractTest 
extends IgniteDbAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMemoryLeak() throws Exception {
         final IgniteEx ignite = grid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
index f170280..9b370bd 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java
@@ -46,10 +46,14 @@ import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.GridTestUtils.SF;
 import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest {
     /** */
     private static final int KEYS_COUNT = 20_000;
@@ -78,6 +82,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      *
      */
+    @Test
     public void testGradualRandomPutAllRemoveAll() throws Exception {
         IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -138,6 +143,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      *
      */
+    @Test
     public void testRandomRemove() throws Exception {
         IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -177,6 +183,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
 
     /**
      */
+    @Test
     public void testRandomPut() throws Exception {
         IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -205,6 +212,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutGetSimple() throws Exception {
         IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -229,6 +237,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutGetLarge() throws Exception {
         IgniteCache<Integer, byte[]> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -271,6 +280,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPutGetLargeKeys() throws Exception {
         IgniteCache<LargeDbKey, Integer> cache = 
ignite(0).cache(DEFAULT_CACHE_NAME);
 
@@ -319,6 +329,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutGetOverwrite() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -347,6 +358,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testOverwriteNormalSizeAfterSmallerSize() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -371,6 +383,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutDoesNotTriggerRead() throws Exception {
         IgniteEx ig = grid(0);
 
@@ -382,6 +395,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutGetMultipleObjects() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -455,6 +469,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testSizeClear() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -491,6 +506,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testBounds() throws Exception {
         IgniteEx ig = ig();
 
@@ -549,6 +565,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testMultithreadedPut() throws Exception {
         IgniteEx ig = ig();
 
@@ -613,6 +630,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutGetRandomUniqueMultipleObjects() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -680,6 +698,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPutPrimaryUniqueSecondaryDuplicates() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -724,6 +743,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutGetRandomNonUniqueMultipleObjects() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -770,6 +790,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutGetRemoveMultipleForward() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -814,6 +835,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomPutGetRemove() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -861,6 +883,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
             assertEquals(map.get(key), cache.get(key));
     }
 
+    @Test
     public void testPutGetRemoveMultipleBackward() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -905,6 +928,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testIndexOverwrite() throws Exception {
         final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME);
 
@@ -948,6 +972,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testObjectKey() throws Exception {
         IgniteEx ig = ig();
 
@@ -993,6 +1018,7 @@ public abstract class IgniteDbPutGetAbstractTest extends 
IgniteDbAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIterators() throws Exception {
         IgniteEx ignite = ig();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
index 8cca7f4..0701514 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
@@ -32,6 +32,9 @@ import 
org.apache.ignite.configuration.IgniteReflectionFactory;
 import org.apache.ignite.configuration.WALMode;
 import org.apache.ignite.internal.IgniteEx;
 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;
@@ -39,6 +42,7 @@ import static 
org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteDbPutGetWithCacheStoreTest extends GridCommonAbstractTest {
     /** */
     private static Map<Object, Object> storeMap = new ConcurrentHashMap<>();
@@ -93,6 +97,7 @@ public class IgniteDbPutGetWithCacheStoreTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testWriteThrough() throws Exception {
         checkWriteThrough(ATOMIC);
         checkWriteThrough(TRANSACTIONAL);
@@ -101,6 +106,7 @@ public class IgniteDbPutGetWithCacheStoreTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testReadThrough() throws Exception {
         checkReadThrough(ATOMIC);
         checkReadThrough(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
index 345eb86..14b5b53 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeTinyPutGetTest.java
@@ -19,10 +19,14 @@ package org.apache.ignite.internal.processors.database;
 
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.internal.IgniteEx;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test for
  */
+@RunWith(JUnit4.class)
 public class IgniteDbSingleNodeTinyPutGetTest extends 
IgniteDbSingleNodePutGetTest {
     /** {@inheritDoc} */
     @Override protected boolean isLargePage() {
@@ -30,6 +34,7 @@ public class IgniteDbSingleNodeTinyPutGetTest extends 
IgniteDbSingleNodePutGetTe
     }
 
     /** */
+    @Test
     public void testPutGetTiny() {
         IgniteEx ig = grid(0);
 
@@ -43,106 +48,127 @@ public class IgniteDbSingleNodeTinyPutGetTest extends 
IgniteDbSingleNodePutGetTe
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testGradualRandomPutAllRemoveAll() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testRandomRemove() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testRandomPut() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutGetSimple() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutGetLarge() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutGetOverwrite() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testOverwriteNormalSizeAfterSmallerSize() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutDoesNotTriggerRead() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutGetMultipleObjects() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testSizeClear() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testBounds() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testMultithreadedPut() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutGetRandomUniqueMultipleObjects() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutPrimaryUniqueSecondaryDuplicates() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutGetRandomNonUniqueMultipleObjects() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutGetRemoveMultipleForward() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testRandomPutGetRemove() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testPutGetRemoveMultipleBackward() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testIndexOverwrite() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testObjectKey() {
         // No-op
     }
 
     /** {@inheritDoc} */
+    @Test
     @Override public void testIterators() {
         // No-op
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
index de2161a..78c83b6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
@@ -35,10 +35,14 @@ import 
org.apache.ignite.internal.processors.cache.persistence.DataRegionMetrics
 import org.apache.ignite.internal.processors.cache.persistence.RootPage;
 import org.apache.ignite.internal.util.typedef.internal.U;
 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 IndexStorageSelfTest extends GridCommonAbstractTest {
     /** Make sure page is small enough to trigger multiple pages in a linked 
list. */
     private static final int PAGE_SIZE = 1024;
@@ -57,6 +61,7 @@ public class IndexStorageSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testMetaIndexAllocation() throws Exception {
         metaAllocation();
     }

Reply via email to