http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
index 36b9890..88a38b6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java
@@ -29,6 +29,9 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse;
 import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 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;
@@ -36,6 +39,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteClientReconnectStreamerTest extends 
IgniteClientReconnectAbstractTest {
     /** */
     public static final String CACHE_NAME = "streamer";
@@ -66,6 +70,7 @@ public class IgniteClientReconnectStreamerTest extends 
IgniteClientReconnectAbst
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStreamerReconnect() throws Exception {
         final Ignite client = grid(serverCount());
 
@@ -130,6 +135,7 @@ public class IgniteClientReconnectStreamerTest extends 
IgniteClientReconnectAbst
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStreamerReconnectInProgress() throws Exception {
         Ignite client = grid(serverCount());
 
@@ -234,4 +240,4 @@ public class IgniteClientReconnectStreamerTest extends 
IgniteClientReconnectAbst
 
         streamer.close();
     }
-}
\ 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/IgniteClientRejoinTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java
index 8744465..53fd4eb4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java
@@ -49,10 +49,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
 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 client to be able restore connection to cluster if coordination is 
not available.
  */
+@RunWith(JUnit4.class)
 public class IgniteClientRejoinTest extends GridCommonAbstractTest {
     /** Block. */
     private volatile boolean block;
@@ -115,6 +119,7 @@ public class IgniteClientRejoinTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientsReconnectAfterStart() throws Exception {
         Ignite srv1 = startGrid("server1");
 
@@ -192,6 +197,7 @@ public class IgniteClientRejoinTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientsReconnect() throws Exception {
         Ignite srv1 = startGrid("server1");
 
@@ -268,6 +274,7 @@ public class IgniteClientRejoinTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientsReconnectDisabled() throws Exception {
         clientReconnectDisabled = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
index f346b8e..ea7f9ec 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
@@ -33,12 +33,16 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest 
{
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -70,6 +74,7 @@ public class IgniteComputeEmptyClusterGroupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAsync() throws Exception {
         ClusterGroup empty = ignite(0).cluster().forNodeId(UUID.randomUUID());
 
@@ -89,6 +94,7 @@ public class IgniteComputeEmptyClusterGroupTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSync() throws Exception {
         ClusterGroup empty = ignite(0).cluster().forNodeId(UUID.randomUUID());
 
@@ -177,4 +183,4 @@ public class IgniteComputeEmptyClusterGroupTest extends 
GridCommonAbstractTest {
             return null;
         }
     }
-}
\ 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/IgniteComputeJobOneThreadTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
index 76f669e..8d1b444 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeJobOneThreadTest.java
@@ -23,10 +23,14 @@ import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.lang.IgniteRunnable;
 import org.apache.ignite.spi.collision.fifoqueue.FifoQueueCollisionSpi;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test of absence of gaps between jobs in compute
  */
+@RunWith(JUnit4.class)
 public class IgniteComputeJobOneThreadTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String name) 
throws Exception {
         FifoQueueCollisionSpi colSpi = new FifoQueueCollisionSpi();
@@ -55,6 +59,7 @@ public class IgniteComputeJobOneThreadTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNoTimeout() 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/IgniteComputeResultExceptionTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeResultExceptionTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeResultExceptionTest.java
index fab5de6..59a476c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeResultExceptionTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeResultExceptionTest.java
@@ -31,38 +31,48 @@ import org.apache.ignite.compute.ComputeTask;
 import org.apache.ignite.compute.ComputeTaskFuture;
 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;
 
 /**
  * Testing that if {@link ComputeTask#result(ComputeJobResult, List)} throws 
an {@link IgniteException}
  * then that exception is thrown as the execution result.
  */
+@RunWith(JUnit4.class)
 public class IgniteComputeResultExceptionTest extends GridCommonAbstractTest {
     /** */
+    @Test
     public void testIgniteExceptionExecute() throws Exception {
         checkExecuteException(new IgniteException());
     }
 
     /** */
+    @Test
     public void testIgniteExceptionWithCauseExecute() throws Exception {
         checkExecuteException(new IgniteException(new Exception()));
     }
 
     /** */
+    @Test
     public void testIgniteExceptionWithCauseChainExecute() throws Exception {
         checkExecuteException(new IgniteException(new Exception(new 
Throwable())));
     }
 
     /** */
+    @Test
     public void testCustomExceptionExecute() throws Exception {
         checkExecuteException(new TaskException());
     }
 
     /** */
+    @Test
     public void testCustomExceptionWithCauseExecute() throws Exception {
         checkExecuteException(new TaskException(new Exception()));
     }
 
     /** */
+    @Test
     public void testCustomExceptionWithCauseChainExecute() throws Exception {
         checkExecuteException(new TaskException(new Exception(new 
Throwable())));
     }
@@ -80,32 +90,38 @@ public class IgniteComputeResultExceptionTest extends 
GridCommonAbstractTest {
     }
 
     /** */
+    @Test
     public void testIgniteExceptionExecuteAsync() throws Exception {
         checkExecuteAsyncException(new IgniteException());
     }
 
     /** */
+    @Test
     public void testIgniteExceptionWithCauseExecuteAsync() throws Exception {
         checkExecuteAsyncException(new IgniteException(new Exception()));
     }
 
     /** */
+    @Test
     public void testIgniteExceptionWithCauseChainExecuteAsync() throws 
Exception {
         checkExecuteAsyncException(new IgniteException(new Exception(new 
Throwable())));
     }
 
 
     /** */
+    @Test
     public void testCustomExceptionExecuteAsync() throws Exception {
         checkExecuteAsyncException(new TaskException());
     }
 
     /** */
+    @Test
     public void testCustomExceptionWithCauseExecuteAsync() throws Exception {
         checkExecuteAsyncException(new TaskException(new Exception()));
     }
 
     /** */
+    @Test
     public void testCustomExceptionWithCauseChainExecuteAsync() throws 
Exception {
         checkExecuteAsyncException(new TaskException(new Exception(new 
Throwable())));
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
index a82373b..583b9e4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeTopologyExceptionTest.java
@@ -26,12 +26,16 @@ import 
org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.lang.IgniteCallable;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.internal.GridClosureCallMode.BALANCE;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteComputeTopologyExceptionTest extends GridCommonAbstractTest 
{
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
@@ -46,6 +50,7 @@ public class IgniteComputeTopologyExceptionTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCorrectException() throws Exception {
         Ignite ignite = ignite(0);
 
@@ -72,6 +77,7 @@ public class IgniteComputeTopologyExceptionTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCorrectCheckedException() throws Exception {
         IgniteKernal ignite0 = (IgniteKernal)ignite(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
index af65ffb..ac2e1e8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
@@ -23,10 +23,14 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests node stop while it is being accessed from EntryProcessor.
  */
+@RunWith(JUnit4.class)
 public class IgniteConcurrentEntryProcessorAccessStopTest extends 
GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
@@ -38,6 +42,7 @@ public class IgniteConcurrentEntryProcessorAccessStopTest 
extends GridCommonAbst
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentAccess() throws Exception {
         CacheConfiguration<Object, Object> ccfg = new 
CacheConfiguration<>(DEFAULT_CACHE_NAME);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
index fb19449..ec58c1e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConnectionConcurrentReserveAndRemoveTest.java
@@ -35,9 +35,13 @@ 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 IgniteConnectionConcurrentReserveAndRemoveTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -79,6 +83,7 @@ public class IgniteConnectionConcurrentReserveAndRemoveTest 
extends GridCommonAb
     }
 
 
+    @Test
     public void test() throws Exception {
         IgniteEx svr = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
index 32ce978..50b771b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
@@ -38,12 +38,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
 import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests checks case when one node is unable to connect to next in a ring,
  * but those nodes are not experiencing any connectivity troubles between
  * each other.
  */
+@RunWith(JUnit4.class)
 public class IgniteDiscoveryMassiveNodeFailTest extends GridCommonAbstractTest 
{
     /** */
     private static final int FAILURE_DETECTION_TIMEOUT = 5_000;
@@ -118,6 +122,7 @@ public class IgniteDiscoveryMassiveNodeFailTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveFailDisabledRecovery() throws Exception {
         timeout = 0; // Disable previous node check.
 
@@ -176,6 +181,7 @@ public class IgniteDiscoveryMassiveNodeFailTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveFailSelfKill() throws Exception {
         startGrids(5);
 
@@ -211,6 +217,7 @@ public class IgniteDiscoveryMassiveNodeFailTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveFailAndRecovery() throws Exception {
         startGrids(5);
 
@@ -254,6 +261,7 @@ public class IgniteDiscoveryMassiveNodeFailTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveFail() throws Exception {
         failNodes = true;
 
@@ -270,6 +278,7 @@ public class IgniteDiscoveryMassiveNodeFailTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMassiveFailForceNodeFail() throws Exception {
         failNodes = true;
 
@@ -285,6 +294,7 @@ public class IgniteDiscoveryMassiveNodeFailTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testRecoveryOnDisconnect() throws Exception {
         startGrids(3);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
index d028922..c7b0cf8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExecutorServiceTest.java
@@ -32,11 +32,15 @@ import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.resources.IgniteInstanceResource;
 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;
 
 /**
  * Grid distributed executor test.
  */
 @GridCommonTest(group = "Thread Tests")
+@RunWith(JUnit4.class)
 public class IgniteExecutorServiceTest extends GridCommonAbstractTest {
     /** */
     public IgniteExecutorServiceTest() {
@@ -46,6 +50,7 @@ public class IgniteExecutorServiceTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception Thrown in case of test failure.
      */
+    @Test
     public void testExecute() throws Exception {
         Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
@@ -70,6 +75,7 @@ public class IgniteExecutorServiceTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception Thrown in case of test failure.
      */
+    @Test
     public void testSubmit() throws Exception {
         Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
@@ -107,6 +113,7 @@ public class IgniteExecutorServiceTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception Thrown in case of test failure.
      */
+    @Test
     public void testSubmitWithFutureTimeout() throws Exception {
         Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
@@ -134,6 +141,7 @@ public class IgniteExecutorServiceTest extends 
GridCommonAbstractTest {
      * @throws Exception Thrown in case of test failure.
      */
     @SuppressWarnings("TooBroadScope")
+    @Test
     public void testInvokeAll() throws Exception {
         Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
@@ -164,6 +172,7 @@ public class IgniteExecutorServiceTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception Thrown in case of test failure.
      */
+    @Test
     public void testInvokeAllWithTimeout() throws Exception {
         Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
@@ -210,6 +219,7 @@ public class IgniteExecutorServiceTest extends 
GridCommonAbstractTest {
      * @throws Exception Thrown in case of test failure.
      */
     @SuppressWarnings("TooBroadScope")
+    @Test
     public void testInvokeAny() throws Exception {
         Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
@@ -235,6 +245,7 @@ public class IgniteExecutorServiceTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception Thrown in case of test failure.
      */
+    @Test
     public void testInvokeAnyWithTimeout() throws Exception {
         Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
@@ -315,4 +326,4 @@ public class IgniteExecutorServiceTest extends 
GridCommonAbstractTest {
             assert ignite != null;
         }
     }
-}
\ 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/IgniteExplicitImplicitDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
index 46a7035..c39e725 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteExplicitImplicitDeploymentSelfTest.java
@@ -46,11 +46,15 @@ import org.apache.ignite.resources.LoggerResource;
 import org.apache.ignite.testframework.GridTestClassLoader;
 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;
 
 /**
  *
  */
 @GridCommonTest(group = "Kernal Self")
+@RunWith(JUnit4.class)
 public class IgniteExplicitImplicitDeploymentSelfTest extends 
GridCommonAbstractTest {
     /** */
     public IgniteExplicitImplicitDeploymentSelfTest() {
@@ -73,6 +77,7 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends 
GridCommonAbstract
     /**
      * @throws Exception If test failed.
      */
+    @Test
     public void testImplicitDeployLocally() throws Exception {
         execImplicitDeployLocally(true, true, true);
     }
@@ -80,6 +85,7 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends 
GridCommonAbstract
     /**
      * @throws Exception If test failed.
      */
+    @Test
     public void testImplicitDeployP2P() throws Exception {
         execImplicitDeployP2P(true, true, true);
     }
@@ -87,6 +93,7 @@ public class IgniteExplicitImplicitDeploymentSelfTest extends 
GridCommonAbstract
     /**
      * @throws Exception If test failed.
      */
+    @Test
     public void testExplicitDeployLocally() throws Exception {
         execExplicitDeployLocally(true, true, true);
     }
@@ -94,6 +101,7 @@ public class IgniteExplicitImplicitDeploymentSelfTest 
extends GridCommonAbstract
     /**
      * @throws Exception If test failed.
      */
+    @Test
     public void testExplicitDeployP2P() throws Exception {
         execExplicitDeployP2P(true, true, true);
     }
@@ -489,4 +497,4 @@ public class IgniteExplicitImplicitDeploymentSelfTest 
extends GridCommonAbstract
             }
         }
     }
-}
\ 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/IgniteInternalCacheRemoveTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java
index ce45dc2..9ea04bc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteInternalCacheRemoveTest.java
@@ -19,10 +19,14 @@ package org.apache.ignite.internal;
 
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteInternalCacheRemoveTest extends GridCacheAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected int gridCount() {
@@ -32,10 +36,11 @@ public class IgniteInternalCacheRemoveTest extends 
GridCacheAbstractSelfTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testRemove() throws IgniteCheckedException {
         jcache().put("key", 1);
 
         assert jcache().remove("key", 1);
         assert !jcache().remove("key", 1);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
index 7eae2ce..e331bfb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteLocalNodeMapBeforeStartTest.java
@@ -26,6 +26,9 @@ import org.apache.ignite.lifecycle.LifecycleBean;
 import org.apache.ignite.lifecycle.LifecycleEventType;
 import org.apache.ignite.resources.IgniteInstanceResource;
 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.lifecycle.LifecycleEventType.AFTER_NODE_START;
 import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_STOP;
@@ -35,10 +38,12 @@ import static 
org.apache.ignite.lifecycle.LifecycleEventType.BEFORE_NODE_STOP;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteLocalNodeMapBeforeStartTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNodeLocalMapFromLifecycleBean() throws Exception {
         IgniteConfiguration cfg = 
getConfiguration(getTestIgniteInstanceName(0));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java
index 899728c..ebe3da7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteReflectionFactorySelfTest.java
@@ -22,14 +22,19 @@ import java.util.HashMap;
 import java.util.Map;
 import junit.framework.TestCase;
 import org.apache.ignite.configuration.IgniteReflectionFactory;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests for {@link IgniteReflectionFactory} class.
  */
+@RunWith(JUnit4.class)
 public class IgniteReflectionFactorySelfTest extends TestCase {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testByteMethod() throws Exception {
         byte    expByteVal    = 42;
         short   expShortVal   = 42;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
index 00a33a6..b1ebbfe 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteRoundRobinErrorAfterClientReconnectTest.java
@@ -25,10 +25,14 @@ import 
org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.lang.IgniteClosure;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test to reproduce IGNITE-4060.
  */
+@RunWith(JUnit4.class)
 public class IgniteRoundRobinErrorAfterClientReconnectTest extends 
GridCommonAbstractTest {
     /** Server index. */
     private static final int SRV_IDX = 0;
@@ -65,6 +69,7 @@ public class IgniteRoundRobinErrorAfterClientReconnectTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientReconnect() throws Exception {
         final Ignite cli = grid(CLI_IDX);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
index d738784..58f9562 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
@@ -41,12 +41,16 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteSlowClientDetectionSelfTest extends GridCommonAbstractTest {
     /** */
     public static final String PARTITIONED = "partitioned";
@@ -99,6 +103,7 @@ public class IgniteSlowClientDetectionSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSlowClient() throws Exception {
         final IgniteEx slowClient = grid(nodeCount() - 1);
 
@@ -189,4 +194,4 @@ public class IgniteSlowClientDetectionSelfTest extends 
GridCommonAbstractTest {
             System.out.println(">>>> Received update: " + iterable);
         }
     }
-}
\ 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/IgniteUpdateNotifierPerClusterSettingSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
index a348ea5..0187925 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
@@ -26,9 +26,13 @@ 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 IgniteUpdateNotifierPerClusterSettingSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -65,6 +69,7 @@ public class IgniteUpdateNotifierPerClusterSettingSelfTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNotifierEnabledForCluster() throws Exception {
         checkNotifierStatusForCluster(true);
     }
@@ -72,6 +77,7 @@ public class IgniteUpdateNotifierPerClusterSettingSelfTest 
extends GridCommonAbs
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNotifierDisabledForCluster() throws Exception {
         checkNotifierStatusForCluster(false);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/LongJVMPauseDetectorTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/LongJVMPauseDetectorTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/LongJVMPauseDetectorTest.java
index 267f389..34a58e6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/LongJVMPauseDetectorTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/LongJVMPauseDetectorTest.java
@@ -20,10 +20,14 @@ package org.apache.ignite.internal;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.testframework.GridStringLogger;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests if LongJVMPauseDetector starts properly.
  */
+@RunWith(JUnit4.class)
 public class LongJVMPauseDetectorTest extends GridCommonAbstractTest {
     /** */
     private GridStringLogger strLog;
@@ -46,6 +50,7 @@ public class LongJVMPauseDetectorTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testJulMessage() throws Exception {
         this.strLog = new GridStringLogger(true);
 
@@ -59,6 +64,7 @@ public class LongJVMPauseDetectorTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testStopWorkerThread() throws Exception {
         strLog = new GridStringLogger(true);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
index f31a56d..1f15306 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
@@ -35,12 +35,16 @@ import org.apache.ignite.testframework.GridTestClassLoader;
 import org.apache.ignite.testframework.junits.GridTestKernalContext;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.logger.GridTestLog4jLogger;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.internal.MarshallerPlatformIds.JAVA_ID;
 
 /**
  * Test marshaller context.
  */
+@RunWith(JUnit4.class)
 public class MarshallerContextLockingSelfTest extends GridCommonAbstractTest {
     /** Inner logger. */
     private InnerLogger innerLog;
@@ -73,6 +77,7 @@ public class MarshallerContextLockingSelfTest extends 
GridCommonAbstractTest {
     /**
      * Multithreaded test, used custom class loader
      */
+    @Test
     public void testMultithreadedUpdate() throws Exception {
         multithreaded(new Callable<Object>() {
             @Override public Object call() throws Exception {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
index bf0c911..88fc226 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
@@ -24,10 +24,14 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.util.GridDebug;
 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;
 
 /**
  * Tests leaks on node restart with enabled persistence.
  */
+@RunWith(JUnit4.class)
 public class MemoryLeaksOnRestartNodeTest extends GridCommonAbstractTest {
     /** Heap dump file name. */
     private static final String HEAP_DUMP_FILE_NAME = "test.hprof";
@@ -70,6 +74,7 @@ public class MemoryLeaksOnRestartNodeTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception On failed.
      */
+    @Test
     public void test() throws Exception {
         // Warmup
         for (int i = 0; i < RESTARTS / 2; ++i) {
@@ -108,4 +113,4 @@ public class MemoryLeaksOnRestartNodeTest extends 
GridCommonAbstractTest {
         // Remove dump if successful.
         dumpFile.delete();
    }
-}
\ 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/TaskNodeRestartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
index 7cab4e6..4e8a634 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
@@ -43,10 +43,14 @@ 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.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class TaskNodeRestartTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -75,6 +79,7 @@ public class TaskNodeRestartTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTaskNodeRestart() throws Exception {
         final AtomicBoolean finished = new AtomicBoolean();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsMxBeanImplTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsMxBeanImplTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsMxBeanImplTest.java
index 4c19271..45a52e7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsMxBeanImplTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsMxBeanImplTest.java
@@ -38,6 +38,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.MvccFeatureChecker;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -47,6 +50,7 @@ import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class TransactionMetricsMxBeanImplTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -92,6 +96,7 @@ public class TransactionMetricsMxBeanImplTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testTxMetric() throws Exception {
         //given:
         int keysNumber = 10;
@@ -179,6 +184,7 @@ public class TransactionMetricsMxBeanImplTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testNearTxInfo() throws Exception {
         IgniteEx primaryNode1 = startGrid(0);
         IgniteEx primaryNode2 = startGrid(1);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java
index d358c72..fe6576c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/TransactionsMXBeanImplTest.java
@@ -31,6 +31,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.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -38,6 +41,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class TransactionsMXBeanImplTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -73,6 +77,7 @@ public class TransactionsMXBeanImplTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testBasic() throws Exception {
         IgniteEx ignite = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/VisorManagementEventSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/VisorManagementEventSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/VisorManagementEventSelfTest.java
index 1e8e0ca..3ebb79a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/VisorManagementEventSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/VisorManagementEventSelfTest.java
@@ -33,12 +33,16 @@ import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.events.EventType.EVT_MANAGEMENT_TASK_STARTED;;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class VisorManagementEventSelfTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
@@ -86,6 +90,7 @@ public class VisorManagementEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testManagementOneNodeVisorTask() throws Exception {
         IgniteEx ignite = startGrid(0);
 
@@ -98,6 +103,7 @@ public class VisorManagementEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testManagementMultiNodeVisorTask() throws Exception {
         IgniteEx ignite = startGrid(0);
 
@@ -110,6 +116,7 @@ public class VisorManagementEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNotManagementOneNodeVisorTask() throws Exception {
         IgniteEx ignite = startGrid(0);
 
@@ -122,6 +129,7 @@ public class VisorManagementEventSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNotManagementMultiNodeVisorTask() throws Exception {
         IgniteEx ignite = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
index 7548cf0..a3aabca 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
@@ -34,12 +34,16 @@ import 
org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.junit.Assert.assertNotEquals;
 
 /**
  * Array identity resolver self test.
  */
+@RunWith(JUnit4.class)
 public class BinaryArrayIdentityResolverSelfTest extends 
GridCommonAbstractTest {
     /** Pointers to release. */
     private final Set<Long> ptrs = new GridConcurrentHashSet<>();
@@ -88,6 +92,7 @@ public class BinaryArrayIdentityResolverSelfTest extends 
GridCommonAbstractTest
     /**
      * Test hash code generation for simple object.
      */
+    @Test
     public void testHashCode() {
         InnerClass obj = new InnerClass(1, "2", 3);
 
@@ -99,6 +104,7 @@ public class BinaryArrayIdentityResolverSelfTest extends 
GridCommonAbstractTest
     /**
      * Test hash code generation for simple object.
      */
+    @Test
     public void testHashCodeBinarylizable() {
         InnerClassBinarylizable obj = new InnerClassBinarylizable(1, "2", 3);
 
@@ -110,6 +116,7 @@ public class BinaryArrayIdentityResolverSelfTest extends 
GridCommonAbstractTest
     /**
      * Test equals for simple object.
      */
+    @Test
     public void testEquals() {
         InnerClass obj = new InnerClass(1, "2", 3);
 
@@ -128,6 +135,7 @@ public class BinaryArrayIdentityResolverSelfTest extends 
GridCommonAbstractTest
     /**
      * Test equals for simple object.
      */
+    @Test
     public void testEqualsBinarilyzable() {
         InnerClassBinarylizable obj = new InnerClassBinarylizable(1, "2", 3);
 
@@ -148,6 +156,7 @@ public class BinaryArrayIdentityResolverSelfTest extends 
GridCommonAbstractTest
     /**
      * Test equals for different type IDs.
      */
+    @Test
     public void testEqualsDifferenTypes() {
         InnerClass obj1 = new InnerClass(1, "2", 3);
         InnerClassBinarylizable obj2 = new InnerClassBinarylizable(1, "2", 3);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicIdMapperSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicIdMapperSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicIdMapperSelfTest.java
index 1d6da2c..f0b6213 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicIdMapperSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicIdMapperSelfTest.java
@@ -20,14 +20,19 @@ package org.apache.ignite.internal.binary;
 import org.apache.ignite.binary.BinaryBasicIdMapper;
 import org.apache.ignite.internal.binary.test.GridBinaryTestClass1;
 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 BinaryBasicIdMapperSelfTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLowerCase() throws Exception {
         BinaryBasicIdMapper mapper = new BinaryBasicIdMapper(true);
 
@@ -40,6 +45,7 @@ public class BinaryBasicIdMapperSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDefaultCase() throws Exception {
         BinaryBasicIdMapper mapper = new BinaryBasicIdMapper(false);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicNameMapperSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicNameMapperSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicNameMapperSelfTest.java
index 70fb8e7..f2c94fe 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicNameMapperSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryBasicNameMapperSelfTest.java
@@ -20,14 +20,19 @@ package org.apache.ignite.internal.binary;
 import org.apache.ignite.binary.BinaryBasicNameMapper;
 import org.apache.ignite.internal.binary.test.GridBinaryTestClass1;
 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 BinaryBasicNameMapperSelfTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleName() throws Exception {
         BinaryBasicNameMapper mapper = new BinaryBasicNameMapper(true);
 
@@ -39,6 +44,7 @@ public class BinaryBasicNameMapperSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFullName() throws Exception {
         BinaryBasicNameMapper mapper = new BinaryBasicNameMapper(false);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
index 3dfa179..b7d81c4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationConsistencySelfTest.java
@@ -30,12 +30,16 @@ import org.apache.ignite.configuration.BinaryConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 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.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
 
 /**
  * Tests a check of binary configuration consistency.
  */
+@RunWith(JUnit4.class)
 public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTest {
     /** */
     private BinaryConfiguration binaryCfg;
@@ -66,6 +70,7 @@ public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSkipCheckConsistencyFlagEnabled() throws Exception {
         String backup = 
System.setProperty(IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK, "true");
 
@@ -95,6 +100,7 @@ public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPositiveNullConfig() throws Exception {
         binaryCfg = null;
 
@@ -108,6 +114,7 @@ public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPositiveEmptyConfig() throws Exception {
         binaryCfg = new BinaryConfiguration();
 
@@ -121,6 +128,7 @@ public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPositiveCustomConfig() throws Exception {
         binaryCfg = customConfig(false);
 
@@ -134,6 +142,7 @@ public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNegativeNullEmptyConfigs() throws Exception {
         checkNegative(null, new BinaryConfiguration());
     }
@@ -141,6 +150,7 @@ public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNegativeEmptyNullConfigs() throws Exception {
         checkNegative(new BinaryConfiguration(), null);
     }
@@ -148,6 +158,7 @@ public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNegativeEmptyCustomConfigs() throws Exception {
         checkNegative(new BinaryConfiguration(), customConfig(false));
     }
@@ -156,6 +167,7 @@ public class BinaryConfigurationConsistencySelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNegativeCustomNullConfigs() throws Exception {
         checkNegative(customConfig(false), null);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
index cedbbaf..32e0b52 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
@@ -38,10 +38,14 @@ import org.apache.ignite.internal.visor.VisorTaskArgument;
 import org.apache.ignite.internal.visor.node.VisorNodePingTask;
 import org.apache.ignite.internal.visor.node.VisorNodePingTaskArg;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests that node will start with custom binary serializer and thin client 
will connect to such node.
  */
+@RunWith(JUnit4.class)
 public class BinaryConfigurationCustomSerializerSelfTest extends 
GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
@@ -88,6 +92,7 @@ public class BinaryConfigurationCustomSerializerSelfTest 
extends GridCommonAbstr
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testThinClientConnected() throws Exception {
         UUID nid = ignite(0).cluster().localNode().id();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
index 89ee35f..c896efa 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java
@@ -39,11 +39,15 @@ import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.marshaller.Marshaller;
 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;
 
 /**
  * Contains tests for binary enums.
  */
 @SuppressWarnings("unchecked")
+@RunWith(JUnit4.class)
 public class BinaryEnumsSelfTest extends GridCommonAbstractTest {
     /** Cache name. */
     private static String CACHE_NAME = "cache";
@@ -144,6 +148,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleRegistered() throws Exception {
         checkSimple(true);
     }
@@ -153,6 +158,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleNotRegistered() throws Exception {
         checkSimple(false);
     }
@@ -162,6 +168,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNestedRegistered() throws Exception {
         checkNested(true);
     }
@@ -171,6 +178,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNestedNotRegistered() throws Exception {
         checkNested(false);
     }
@@ -180,6 +188,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleBuilderRegistered() throws Exception {
         checkSimpleBuilder(true);
     }
@@ -189,6 +198,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleBuilderNotRegistered() throws Exception {
         checkSimpleBuilder(false);
     }
@@ -198,6 +208,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNestedBuilderRegistered() throws Exception {
         checkNestedBuilder(true);
     }
@@ -207,6 +218,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNestedBuilderNotRegistered() throws Exception {
         checkNestedBuilder(false);
     }
@@ -214,6 +226,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInstanceFromBytes() throws Exception {
         startUp(true);
 
@@ -353,6 +366,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleArrayRegistered() throws Exception {
         checkSimpleArray(true);
     }
@@ -362,6 +376,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleArrayNotRegistered() throws Exception {
         checkSimpleArray(false);
     }
@@ -371,6 +386,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleBuilderArrayRegistered() throws Exception {
         checkSimpleBuilderArray(true);
     }
@@ -380,6 +396,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleBuilderArrayNotRegistered() throws Exception {
         checkSimpleBuilderArray(false);
     }
@@ -420,6 +437,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testZeroTypeId() throws Exception {
         startUp(true);
 
@@ -437,6 +455,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception
      */
+    @Test
     public void testBinaryTypeEnumValues() throws Exception {
         startUp(false);
 
@@ -455,6 +474,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception
      */
+    @Test
     public void testEnumWrongBinaryConfig() throws Exception {
         this.register = true;
 
@@ -472,6 +492,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception
      */
+    @Test
     public void testEnumValidation() throws Exception {
         startUp(false);
 
@@ -493,6 +514,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception
      */
+    @Test
     public void testEnumMerge() throws Exception {
         startUp(false);
 
@@ -543,6 +565,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDeclaredBodyEnumRegistered() throws Exception {
         checkDeclaredBodyEnum(true);
     }
@@ -552,6 +575,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDeclaredBodyEnumNotRegistered() throws Exception {
         checkDeclaredBodyEnum(false);
     }
@@ -644,7 +668,7 @@ public class BinaryEnumsSelfTest extends 
GridCommonAbstractTest {
         if (register)
             assertEquals(val.name(), obj.enumName());
     }
-    
+
     /**
      * Validate single value.
      *

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
index 38decf7..6a2f612 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
@@ -27,10 +27,14 @@ import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.marshaller.MarshallerContextTestImpl;
 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 BinaryFieldExtractionSelfTest extends GridCommonAbstractTest {
     /**
      * Create marshaller.
@@ -60,6 +64,7 @@ public class BinaryFieldExtractionSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPrimitiveMarshalling() throws Exception {
         BinaryMarshaller marsh = createMarshaller();
 
@@ -101,6 +106,7 @@ public class BinaryFieldExtractionSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTimeMarshalling() throws Exception {
         BinaryMarshaller marsh = createMarshaller();
 
@@ -122,6 +128,7 @@ public class BinaryFieldExtractionSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDecimalFieldMarshalling() throws Exception {
         BinaryMarshaller marsh = createMarshaller();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
index f139c4c..0ebaa6c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
@@ -33,10 +33,14 @@ import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.UUID;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Contains tests for binary object fields.
  */
+@RunWith(JUnit4.class)
 public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTest {
     /** Marshaller. */
     protected BinaryMarshaller dfltMarsh;
@@ -105,6 +109,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testByte() throws Exception {
         check("fByte");
     }
@@ -114,6 +119,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testByteArray() throws Exception {
         check("fByteArr");
     }
@@ -123,6 +129,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBoolean() throws Exception {
         check("fBool");
     }
@@ -132,6 +139,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testBooleanArray() throws Exception {
         check("fBoolArr");
     }
@@ -141,6 +149,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testShort() throws Exception {
         check("fShort");
     }
@@ -150,6 +159,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testShortArray() throws Exception {
         check("fShortArr");
     }
@@ -159,6 +169,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testChar() throws Exception {
         check("fChar");
     }
@@ -168,6 +179,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testCharArray() throws Exception {
         check("fCharArr");
     }
@@ -177,6 +189,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testInt() throws Exception {
         check("fInt");
     }
@@ -186,6 +199,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testIntArray() throws Exception {
         check("fIntArr");
     }
@@ -195,6 +209,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testLong() throws Exception {
         check("fLong");
     }
@@ -204,6 +219,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testLongArray() throws Exception {
         check("fLongArr");
     }
@@ -213,6 +229,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testFloat() throws Exception {
         check("fFloat");
     }
@@ -222,6 +239,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testFloatArray() throws Exception {
         check("fFloatArr");
     }
@@ -231,6 +249,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDouble() throws Exception {
         check("fDouble");
     }
@@ -240,6 +259,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleArray() throws Exception {
         check("fDoubleArr");
     }
@@ -249,6 +269,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testString() throws Exception {
         check("fString");
     }
@@ -258,6 +279,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testStringArray() throws Exception {
         check("fStringArr");
     }
@@ -267,6 +289,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDate() throws Exception {
         check("fDate");
     }
@@ -276,6 +299,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDateArray() throws Exception {
         check("fDateArr");
     }
@@ -285,6 +309,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTimestamp() throws Exception {
         check("fTimestamp");
     }
@@ -294,6 +319,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testTimestampArray() throws Exception {
         check("fTimestampArr");
     }
@@ -303,6 +329,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testUuid() throws Exception {
         check("fUuid");
     }
@@ -312,6 +339,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testUuidArray() throws Exception {
         check("fUuidArr");
     }
@@ -321,6 +349,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDecimal() throws Exception {
         check("fDecimal");
     }
@@ -330,6 +359,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDecimalArray() throws Exception {
         check("fDecimalArr");
     }
@@ -339,6 +369,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testObject() throws Exception {
         check("fObj");
     }
@@ -348,6 +379,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testObjectArray() throws Exception {
         check("fObjArr");
     }
@@ -357,6 +389,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testNull() throws Exception {
         check("fNull");
     }
@@ -366,6 +399,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends 
GridCommonAbstractTes
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testMissing() throws Exception {
         String fieldName = "fMissing";
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
index 265d283..f3e40c5 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
@@ -26,10 +26,14 @@ import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.logger.NullLogger;
 import org.apache.ignite.marshaller.MarshallerContextTestImpl;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Contains tests for compact offsets.
  */
+@RunWith(JUnit4.class)
 public abstract class BinaryFooterOffsetsAbstractSelfTest extends 
GridCommonAbstractTest {
     /** 2 pow 8. */
     private static int POW_8 = 1 << 8;
@@ -78,6 +82,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest 
extends GridCommonAbst
      *
      * @throws Exception If failed.
      */
+    @Test
     public void test1Byte() throws Exception {
         check(POW_8 >> 2);
     }
@@ -87,6 +92,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest 
extends GridCommonAbst
      *
      * @throws Exception If failed.
      */
+    @Test
     public void test1ByteSign() throws Exception {
         check(POW_8 >> 1);
     }
@@ -96,6 +102,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest 
extends GridCommonAbst
      *
      * @throws Exception If failed.
      */
+    @Test
     public void test2Bytes() throws Exception {
         check(POW_16 >> 2);
     }
@@ -105,6 +112,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest 
extends GridCommonAbst
      *
      * @throws Exception If failed.
      */
+    @Test
     public void test2BytesSign() throws Exception {
         check(POW_16 >> 1);
     }
@@ -114,6 +122,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest 
extends GridCommonAbst
      *
      * @throws Exception If failed.
      */
+    @Test
     public void test4Bytes() throws Exception {
         check(POW_16 << 2);
     }

Reply via email to