http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index 8fad640..6f6c26d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -35,6 +35,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -43,6 +46,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class GridDiscoveryManagerAliveCacheSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -159,6 +163,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAlives() throws Exception {
         clientMode = false;
 
@@ -168,6 +173,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAlivesClient() throws Exception {
         clientMode = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index d19ae72..7b9f552 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -30,6 +30,9 @@ import 
org.apache.ignite.spi.discovery.tcp.TestReconnectProcessor;
 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.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2;
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
@@ -40,6 +43,7 @@ import static 
org.apache.ignite.configuration.DeploymentMode.SHARED;
 /**
  * Tests for node attributes consistency checks.
  */
+@RunWith(JUnit4.class)
 public abstract class GridDiscoveryManagerAttributesSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final String PREFER_IPV4 = "java.net.preferIPv4Stack";
@@ -94,6 +98,7 @@ public abstract class GridDiscoveryManagerAttributesSelfTest 
extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPreferIpV4StackTrue() throws Exception {
         testPreferIpV4Stack(true);
     }
@@ -101,6 +106,7 @@ public abstract class 
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPreferIpV4StackFalse() throws Exception {
         testPreferIpV4Stack(false);
     }
@@ -115,6 +121,7 @@ public abstract class 
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPreferIpV4StackDifferentValues() throws Exception {
         System.setProperty(PREFER_IPV4, "true");
 
@@ -136,6 +143,7 @@ public abstract class 
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUseDefaultSuid() throws Exception {
         try {
             doTestUseDefaultSuid(Boolean.TRUE.toString(), 
Boolean.FALSE.toString(), true);
@@ -183,6 +191,7 @@ public abstract class 
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
         }
     }
 
+    @Test
     public void testUseStringSerVer2() throws Exception {
         String old = 
System.getProperty(IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2);
 
@@ -247,6 +256,7 @@ public abstract class 
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSecurityCompatibilityEnabled() throws Exception {
         TestReconnectPluginProvider.enabled = true;
         TestReconnectProcessor.enabled = true;
@@ -333,6 +343,7 @@ public abstract class 
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDifferentDeploymentModes() throws Exception {
         IgniteEx g = startGrid(0);
 
@@ -354,6 +365,7 @@ public abstract class 
GridDiscoveryManagerAttributesSelfTest extends GridCommonA
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDifferentPeerClassLoadingEnabledFlag() throws Exception {
         IgniteEx g = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
index 4041d6e..353f163 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/IgniteTopologyPrintFormatSelfTest.java
@@ -33,10 +33,14 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.logger.GridTestLog4jLogger;
 import org.apache.log4j.Level;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteTopologyPrintFormatSelfTest extends GridCommonAbstractTest {
     /** */
     public static final String TOPOLOGY_SNAPSHOT = "Topology snapshot";
@@ -86,6 +90,7 @@ public class IgniteTopologyPrintFormatSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerLogs() throws Exception {
         MockLogger log = new MockLogger();
 
@@ -97,6 +102,7 @@ public class IgniteTopologyPrintFormatSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerDebugLogs() throws Exception {
         MockLogger log = new MockLogger();
 
@@ -138,6 +144,7 @@ public class IgniteTopologyPrintFormatSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerAndClientLogs() throws Exception {
         MockLogger log = new MockLogger();
 
@@ -149,6 +156,7 @@ public class IgniteTopologyPrintFormatSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerAndClientDebugLogs() throws Exception {
         MockLogger log = new MockLogger();
 
@@ -192,6 +200,7 @@ public class IgniteTopologyPrintFormatSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testForceServerAndClientLogs() throws Exception {
         MockLogger log = new MockLogger();
 
@@ -203,6 +212,7 @@ public class IgniteTopologyPrintFormatSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testForceServerAndClientDebugLogs() throws Exception {
         MockLogger log = new MockLogger();
 
@@ -299,4 +309,4 @@ public class IgniteTopologyPrintFormatSelfTest extends 
GridCommonAbstractTest {
             logs.clear();
         }
     }
-}
\ 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/managers/events/GridEventStorageManagerSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java
index 0479b81..9103e6c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/events/GridEventStorageManagerSelfTest.java
@@ -28,12 +28,16 @@ import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.lang.IgniteFutureTimeoutException;
 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;
 
 import static org.apache.ignite.events.EventType.EVTS_ALL;
 
 /**
  * Tests for {@link GridEventStorageManager}.
  */
+@RunWith(JUnit4.class)
 public class GridEventStorageManagerSelfTest extends GridCommonAbstractTest {
     /**
      *
@@ -60,6 +64,7 @@ public class GridEventStorageManagerSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWaitForEvent() throws Exception {
         Ignite ignite = grid();
 
@@ -92,6 +97,7 @@ public class GridEventStorageManagerSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWaitForEventContinuationTimeout() throws Exception {
         Ignite ignite = grid();
 
@@ -111,6 +117,7 @@ public class GridEventStorageManagerSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUserEvent() throws Exception {
         Ignite ignite = grid();
 
@@ -126,4 +133,4 @@ public class GridEventStorageManagerSelfTest extends 
GridCommonAbstractTest {
             info("Caught expected exception: " + e);
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
index c7a58f7..e9f0e8d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerEnumSelfTest.java
@@ -25,10 +25,14 @@ import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.marshaller.MarshallerContextTestImpl;
 import org.apache.ignite.testframework.junits.GridTestKernalContext;
 import org.apache.ignite.testframework.junits.logger.GridTestLog4jLogger;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class OptimizedMarshallerEnumSelfTest extends TestCase {
 
     private String igniteHome = System.getProperty("user.dir");
@@ -37,6 +41,7 @@ public class OptimizedMarshallerEnumSelfTest extends TestCase 
{
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEnumSerialisation() throws Exception {
         OptimizedMarshaller marsh = new OptimizedMarshaller();
 
@@ -84,4 +89,4 @@ public class OptimizedMarshallerEnumSelfTest extends TestCase 
{
 
         public abstract String getTestString();
     }
-}
\ 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/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
index 7bd0a5d..d80ec79 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java
@@ -35,6 +35,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -42,6 +45,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class OptimizedMarshallerNodeFailoverTest extends 
GridCommonAbstractTest {
     /** */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -84,6 +88,7 @@ public class OptimizedMarshallerNodeFailoverTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClassCacheUpdateFailover1() throws Exception {
         classCacheUpdateFailover(false);
     }
@@ -91,6 +96,7 @@ public class OptimizedMarshallerNodeFailoverTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClassCacheUpdateFailover2() throws Exception {
         classCacheUpdateFailover(true);
     }
@@ -141,6 +147,7 @@ public class OptimizedMarshallerNodeFailoverTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRestartAllNodes() throws Exception {
         cache = true;
 
@@ -355,4 +362,4 @@ public class OptimizedMarshallerNodeFailoverTest extends 
GridCommonAbstractTest
      *
      */
     static class TestClass20 implements Serializable {}
-}
\ 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/marshaller/optimized/OptimizedMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java
index e9f4d95..92696bb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSelfTest.java
@@ -29,11 +29,15 @@ import 
org.apache.ignite.marshaller.GridMarshallerAbstractTest;
 import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Optimized marshaller self test.
  */
 @GridCommonTest(group = "Marshaller")
+@RunWith(JUnit4.class)
 public class OptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
     /** {@inheritDoc} */
     @Override protected Marshaller marshaller() {
@@ -43,6 +47,7 @@ public class OptimizedMarshallerSelfTest extends 
GridMarshallerAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTestMarshalling() throws Exception {
         final String msg = "PASSED";
 
@@ -70,6 +75,7 @@ public class OptimizedMarshallerSelfTest extends 
GridMarshallerAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testMarshallingSelfLink() throws IgniteCheckedException {
         SelfLink sl = new SelfLink("a string 1");
 
@@ -83,6 +89,7 @@ public class OptimizedMarshallerSelfTest extends 
GridMarshallerAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInvalid() throws Exception {
         GridTestUtils.assertThrows(
             log,
@@ -105,6 +112,7 @@ public class OptimizedMarshallerSelfTest extends 
GridMarshallerAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNested() throws Exception {
         NestedTestObject obj = new NestedTestObject("String", 100);
 
@@ -280,4 +288,4 @@ public class OptimizedMarshallerSelfTest extends 
GridMarshallerAbstractTest {
             this.link = link;
         }
     }
-}
\ 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/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
index 5a9d10c..560884c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerSerialPersistentFieldsSelfTest.java
@@ -25,10 +25,14 @@ import java.io.Serializable;
 import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
 import org.apache.ignite.marshaller.GridMarshallerAbstractTest;
 import org.apache.ignite.marshaller.Marshaller;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test that Optimized Marshaller works with classes with 
serialPersistentFields.
  */
+@RunWith(JUnit4.class)
 public class OptimizedMarshallerSerialPersistentFieldsSelfTest  extends 
GridMarshallerAbstractTest {
     /** {@inheritDoc} */
     @Override protected Marshaller marshaller() {
@@ -38,6 +42,7 @@ public class 
OptimizedMarshallerSerialPersistentFieldsSelfTest  extends GridMars
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOptimizedMarshaller() throws Exception {
         unmarshal(marshal(new TestClass()));
 
@@ -113,4 +118,4 @@ public class 
OptimizedMarshallerSerialPersistentFieldsSelfTest  extends GridMars
             s.readObject();
         }
     }
-}
\ 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/marshaller/optimized/OptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
index c0997b1..8aaeb4d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerTest.java
@@ -45,10 +45,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 OptimizedMarshallerTest extends GridCommonAbstractTest {
     /**
      * @return Marshaller.
@@ -68,6 +72,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testNonSerializable() throws IgniteCheckedException {
         OptimizedMarshaller marsh = marshaller();
 
@@ -83,6 +88,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testNonSerializable1() throws IgniteCheckedException {
         OptimizedMarshaller marsh = marshaller();
 
@@ -104,6 +110,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testNonSerializable2() throws IgniteCheckedException {
         OptimizedMarshaller marsh = marshaller();
 
@@ -137,6 +144,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testNonSerializable3() throws IgniteCheckedException {
         OptimizedMarshaller marsh = marshaller();
 
@@ -154,6 +162,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testNonSerializable4() throws IgniteCheckedException {
         OptimizedMarshaller marsh = marshaller();
 
@@ -173,6 +182,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testNonSerializable5() throws IgniteCheckedException {
         Marshaller marsh = marshaller();
 
@@ -188,6 +198,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testSerializable() throws IgniteCheckedException {
         Marshaller marsh = marshaller();
 
@@ -199,6 +210,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
     /**
      * @throws IgniteCheckedException If failed.
      */
+    @Test
     public void testSerializableAfterChangingValue() throws 
IgniteCheckedException {
         Marshaller marsh = marshaller();
 
@@ -220,6 +232,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testExternalizable() throws IgniteCheckedException {
         Marshaller marsh = marshaller();
 
@@ -233,6 +246,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
     /**
      * Tests {@link OptimizedMarshaller#setRequireSerializable(boolean)}.
      */
+    @Test
     public void testRequireSerializable() {
         OptimizedMarshaller marsh = marshaller();
 
@@ -253,6 +267,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
      *
      * @throws IgniteCheckedException If marshalling failed.
      */
+    @Test
     public void testProxy() throws IgniteCheckedException {
         OptimizedMarshaller marsh = marshaller();
 
@@ -286,6 +301,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDescriptorCache() throws Exception {
         try {
             Ignite ignite = startGridsMultiThreaded(2);
@@ -322,6 +338,7 @@ public class OptimizedMarshallerTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPerformance() throws Exception {
         System.gc();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
index 3c50c00..ed2d800 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java
@@ -68,12 +68,16 @@ import org.apache.ignite.marshaller.MarshallerExclusions;
 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 org.junit.Assert.assertArrayEquals;
 
 /**
  * Test for optimized object streams.
  */
+@RunWith(JUnit4.class)
 public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
     /** */
     private static final MarshallerContext CTX = new 
MarshallerContextTestImpl();
@@ -84,6 +88,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNull() throws Exception {
         assertNull(marshalUnmarshal(null));
     }
@@ -91,6 +96,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testByte() throws Exception {
         byte val = 10;
 
@@ -100,6 +106,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testShort() throws Exception {
         short val = 100;
 
@@ -109,6 +116,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInteger() throws Exception {
         int val = 100;
 
@@ -118,6 +126,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLong() throws Exception {
         long val = 1000L;
 
@@ -127,6 +136,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFloat() throws Exception {
         float val = 10.0f;
 
@@ -136,6 +146,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDouble() throws Exception {
         double val = 100.0d;
 
@@ -145,6 +156,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBoolean() throws Exception {
         assertEquals(Boolean.TRUE, marshalUnmarshal(Boolean.TRUE));
 
@@ -154,6 +166,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testChar() throws Exception {
         char val = 10;
 
@@ -163,6 +176,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testByteArray() throws Exception {
         byte[] arr = marshalUnmarshal(new byte[] {1, 2});
 
@@ -172,6 +186,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testShortArray() throws Exception {
         short[] arr = marshalUnmarshal(new short[] {1, 2});
 
@@ -181,6 +196,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIntArray() throws Exception {
         int[] arr = marshalUnmarshal(new int[] {1, 2});
 
@@ -190,6 +206,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLongArray() throws Exception {
         long[] arr = marshalUnmarshal(new long[] {1L, 2L});
 
@@ -199,6 +216,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testFloatArray() throws Exception {
         float[] arr = marshalUnmarshal(new float[] {1.0f, 2.0f});
 
@@ -208,6 +226,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDoubleArray() throws Exception {
         double[] arr = marshalUnmarshal(new double[] {1.0d, 2.0d});
 
@@ -217,6 +236,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBooleanArray() throws Exception {
         boolean[] arr = marshalUnmarshal(new boolean[] {true, false, false});
 
@@ -229,6 +249,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCharArray() throws Exception {
         char[] arr = marshalUnmarshal(new char[] {1, 2});
 
@@ -238,6 +259,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testObject() throws Exception {
         TestObject obj = new TestObject();
 
@@ -252,6 +274,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRequireSerializable() throws Exception {
         try {
             OptimizedMarshaller marsh = new OptimizedMarshaller(true);
@@ -275,6 +298,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testFailedUnmarshallingLogging() throws Exception {
         OptimizedMarshaller marsh = new OptimizedMarshaller(true);
 
@@ -297,6 +321,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testFailedMarshallingLogging() throws Exception {
         OptimizedMarshaller marsh = new OptimizedMarshaller(true);
 
@@ -316,6 +341,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPool() throws Exception {
         final TestObject obj = new TestObject();
 
@@ -351,6 +377,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testObjectWithNulls() throws Exception {
         TestObject obj = new TestObject();
 
@@ -363,6 +390,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testObjectArray() throws Exception {
         TestObject obj1 = new TestObject();
 
@@ -390,6 +418,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExternalizable() throws Exception {
         ExternalizableTestObject1 obj = new ExternalizableTestObject1();
 
@@ -404,6 +433,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExternalizableWithNulls() throws Exception {
         ExternalizableTestObject2 obj = new ExternalizableTestObject2();
 
@@ -423,6 +453,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLink() throws Exception {
         for (int i = 0; i < 20; i++) {
             LinkTestObject1 obj1 = new LinkTestObject1();
@@ -442,6 +473,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCycleLink() throws Exception {
         for (int i = 0; i < 20; i++) {
             CycleLinkTestObject obj = new CycleLinkTestObject();
@@ -456,6 +488,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNoDefaultConstructor() throws Exception {
         NoDefaultConstructorTestObject obj = new 
NoDefaultConstructorTestObject(100);
 
@@ -465,6 +498,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEnum() throws Exception {
         assertEquals(TestEnum.B, marshalUnmarshal(TestEnum.B));
 
@@ -476,6 +510,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCollection() throws Exception {
         TestObject obj1 = new TestObject();
 
@@ -499,6 +534,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testMap() throws Exception {
         TestObject obj1 = new TestObject();
 
@@ -522,6 +558,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUuid() throws Exception {
         UUID uuid = UUID.randomUUID();
 
@@ -531,6 +568,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDate() throws Exception {
         Date date = new Date();
 
@@ -540,6 +578,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTransient() throws Exception {
         TransientTestObject obj = marshalUnmarshal(new 
TransientTestObject(100, 200, "str1", "str2"));
 
@@ -552,6 +591,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWriteReadObject() throws Exception {
         WriteReadTestObject obj = marshalUnmarshal(new 
WriteReadTestObject(100, "str"));
 
@@ -562,6 +602,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWriteReplace() throws Exception {
         ReplaceTestObject obj = marshalUnmarshal(new ReplaceTestObject(100));
 
@@ -571,6 +612,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWriteReplaceNull() throws Exception {
         ReplaceNullTestObject obj = marshalUnmarshal(new 
ReplaceNullTestObject());
 
@@ -580,6 +622,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReadResolve() throws Exception {
         ResolveTestObject obj = marshalUnmarshal(new ResolveTestObject(100));
 
@@ -589,6 +632,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testArrayDeque() throws Exception {
         Queue<Integer> queue = new ArrayDeque<>();
 
@@ -608,6 +652,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testArrayList() throws Exception {
         Collection<Integer> list = new ArrayList<>();
 
@@ -620,6 +665,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testHashMap() throws Exception {
         Map<Integer, Integer> map = new HashMap<>();
 
@@ -632,6 +678,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testHashSet() throws Exception {
         Collection<Integer> set = new HashSet<>();
 
@@ -645,6 +692,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings("UseOfObsoleteCollectionType")
+    @Test
     public void testHashtable() throws Exception {
         Map<Integer, Integer> map = new Hashtable<>();
 
@@ -657,6 +705,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIdentityHashMap() throws Exception {
         Map<Integer, Integer> map = new IdentityHashMap<>();
 
@@ -669,6 +718,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLinkedHashMap() throws Exception {
         Map<Integer, Integer> map = new LinkedHashMap<>();
 
@@ -681,6 +731,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLinkedHashSet() throws Exception {
         Collection<Integer> set = new LinkedHashSet<>();
 
@@ -693,6 +744,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLinkedList() throws Exception {
         Collection<Integer> list = new LinkedList<>();
 
@@ -705,6 +757,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPriorityQueue() throws Exception {
         Queue<Integer> queue = new PriorityQueue<>();
 
@@ -724,6 +777,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testProperties() throws Exception {
         Properties dflts = new Properties();
 
@@ -743,6 +797,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTreeMap() throws Exception {
         Map<Integer, Integer> map = new TreeMap<>();
 
@@ -755,6 +810,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTreeSet() throws Exception {
         Collection<Integer> set = new TreeSet<>();
 
@@ -768,6 +824,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @SuppressWarnings("UseOfObsoleteCollectionType")
+    @Test
     public void testVector() throws Exception {
         Collection<Integer> vector = new Vector<>();
 
@@ -780,6 +837,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testString() throws Exception {
         assertEquals("Latin", marshalUnmarshal("Latin"));
         assertEquals("Кириллица", 
marshalUnmarshal("Кириллица"));
@@ -789,6 +847,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReadLine() throws Exception {
         OptimizedObjectInputStream in = new OptimizedObjectInputStream(new 
GridUnsafeDataInput());
 
@@ -805,6 +864,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testHierarchy() throws Exception {
         C c = new C(100, "str", 200, "str", 300, "str");
 
@@ -821,6 +881,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInet4Address() throws Exception {
         Inet4Address addr = (Inet4Address)InetAddress.getByName("localhost");
 
@@ -830,6 +891,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClass() throws Exception {
         assertEquals(int.class, marshalUnmarshal(int.class));
         assertEquals(Long.class, marshalUnmarshal(Long.class));
@@ -839,6 +901,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWriteReadFields() throws Exception {
         WriteReadFieldsTestObject obj = marshalUnmarshal(new 
WriteReadFieldsTestObject(100, "str"));
 
@@ -849,6 +912,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWriteFields() throws Exception {
         WriteFieldsTestObject obj = marshalUnmarshal(new 
WriteFieldsTestObject(100, "str"));
 
@@ -859,6 +923,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBigInteger() throws Exception {
         BigInteger b = new 
BigInteger("54654865468745468465321414646834562346475457488");
 
@@ -868,6 +933,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testBigDecimal() throws Exception {
         BigDecimal b = new 
BigDecimal("849572389457208934572093574.123512938654126458542145");
 
@@ -877,6 +943,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSimpleDateFormat() throws Exception {
         SimpleDateFormat f = new SimpleDateFormat("MM/dd/yyyy");
 
@@ -886,6 +953,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testComplexObject() throws Exception {
         ComplexTestObject obj = new ComplexTestObject();
 
@@ -959,6 +1027,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testReadToArray() throws Exception {
         OptimizedObjectInputStream in = OptimizedObjectStreamRegistry.in();
 
@@ -1006,6 +1075,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testHandleTableGrow() throws Exception {
         List<String> c = new ArrayList<>();
 
@@ -1025,6 +1095,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testIncorrectExternalizable() throws Exception {
         GridTestUtils.assertThrows(
             log,
@@ -1040,6 +1111,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExcludedClass() throws Exception {
         Class<?>[] exclClasses = U.staticField(MarshallerExclusions.class, 
"EXCL_CLASSES");
 
@@ -1052,6 +1124,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInet6Address() throws Exception {
         final InetAddress address = Inet6Address.getByAddress(new byte[16]);
 
@@ -1061,6 +1134,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPutFieldsWithDefaultWriteObject() throws Exception {
         try {
             marshalUnmarshal(new CustomWriteObjectMethodObject("test"));
@@ -1073,6 +1147,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testThrowable() throws Exception {
         Throwable t = new Throwable("Throwable");
 
@@ -1082,6 +1157,7 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNestedReadWriteObject() throws Exception {
         NestedReadWriteObject[] arr = new NestedReadWriteObject[5];
 
@@ -2321,4 +2397,4 @@ public class OptimizedObjectStreamSelfTest extends 
GridCommonAbstractTest {
         }
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
index 8b41944..9b6d0b0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
@@ -22,14 +22,19 @@ import java.util.Random;
 import org.apache.ignite.internal.pagemem.PageIdUtils;
 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 PageIdUtilsSelfTest extends GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRotatePageId() throws Exception {
         assertEquals(0x0102FFFFFFFFFFFFL, 
PageIdUtils.rotatePageId(0x0002FFFFFFFFFFFFL));
         assertEquals(0x0B02FFFFFFFFFFFFL, 
PageIdUtils.rotatePageId(0x0A02FFFFFFFFFFFFL));
@@ -41,6 +46,7 @@ public class PageIdUtilsSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEffectivePageId() throws Exception {
         assertEquals(0x0000FFFFFFFFFFFFL, 
PageIdUtils.effectivePageId(0x0002FFFFFFFFFFFFL));
         assertEquals(0x0000FFFFFFFFFFFFL, 
PageIdUtils.effectivePageId(0x0A02FFFFFFFFFFFFL));
@@ -51,6 +57,7 @@ public class PageIdUtilsSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLinkConstruction() throws Exception {
         assertEquals(0x00FFFFFFFFFFFFFFL, PageIdUtils.link(0xFFFFFFFFFFFFFFL, 
0));
         assertEquals(0x01FFFFFFFFFFFFFFL, PageIdUtils.link(0xFFFFFFFFFFFFFFL, 
1));
@@ -71,6 +78,7 @@ public class PageIdUtilsSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testOffsetExtraction() throws Exception {
         assertEquals(0, PageIdUtils.itemId(0x00FFFFFFFFFFFFFFL));
         assertEquals(1, PageIdUtils.itemId(0x01FFFFFFFFFFFFFFL));
@@ -91,6 +99,7 @@ public class PageIdUtilsSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPageIdFromLink() throws Exception {
         assertEquals(0x00FFFFFFFFFFFFFFL, 
PageIdUtils.pageId(0x00FFFFFFFFFFFFFFL));
         assertEquals(0x00FFFFFFFFFFFFFFL, 
PageIdUtils.pageId(0x10FFFFFFFFFFFFFFL));
@@ -121,6 +130,7 @@ public class PageIdUtilsSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRandomIds() throws Exception {
         Random rnd = new Random();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
index b393634..68581dc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoLoadSelfTest.java
@@ -37,10 +37,14 @@ import 
org.apache.ignite.internal.processors.cache.persistence.DummyPageIO;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
 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 PageMemoryNoLoadSelfTest extends GridCommonAbstractTest {
     /** */
     protected static final int PAGE_SIZE = 8 * 1024;
@@ -59,6 +63,7 @@ public class PageMemoryNoLoadSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPageTearingInner() throws Exception {
         PageMemory mem = memory();
 
@@ -103,6 +108,7 @@ public class PageMemoryNoLoadSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLoadedPagesCount() throws Exception {
         PageMemory mem = memory();
 
@@ -128,6 +134,7 @@ public class PageMemoryNoLoadSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPageTearingSequential() throws Exception {
         PageMemory mem = memory();
 
@@ -180,6 +187,7 @@ public class PageMemoryNoLoadSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPageHandleDeallocation() throws Exception {
         PageMemory mem = memory();
 
@@ -207,6 +215,7 @@ public class PageMemoryNoLoadSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPageIdRotation() throws Exception {
         PageMemory mem = memory();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
index a1f18a7..d5d451a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
@@ -38,10 +38,14 @@ import 
org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class GridCacheTxLoadFromStoreOnLockSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -76,6 +80,7 @@ public class GridCacheTxLoadFromStoreOnLockSelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLoadedValueOneBackup() throws Exception {
         checkLoadedValue(1);
     }
@@ -83,6 +88,7 @@ public class GridCacheTxLoadFromStoreOnLockSelfTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLoadedValueNoBackups() throws Exception {
         checkLoadedValue(0);
     }
@@ -160,4 +166,4 @@ public class GridCacheTxLoadFromStoreOnLockSelfTest extends 
GridCommonAbstractTe
             // No-op.
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index bde5808..1ce1e24 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -32,6 +32,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
@@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
  * Tests for {@link GridAffinityProcessor}.
  */
 @GridCommonTest(group = "Affinity Processor")
+@RunWith(JUnit4.class)
 public abstract class GridAffinityProcessorAbstractSelfTest extends 
GridCommonAbstractTest {
     /** Number of grids started for tests. Should not be less than 2. */
     private static final int NODES_CNT = 3;
@@ -107,6 +111,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest 
extends GridCommonAb
      *
      * @throws Exception In case of any exception.
      */
+    @Test
     public void testAffinityProcessor() throws Exception {
         Random rnd = new Random();
 
@@ -158,6 +163,7 @@ public abstract class GridAffinityProcessorAbstractSelfTest 
extends GridCommonAb
      *
      * @throws Exception In case of any exception.
      */
+    @Test
     public void testPerformance() throws Exception {
         IgniteKernal grid = (IgniteKernal)grid(0);
         GridAffinityProcessor aff = grid.context().affinity();
@@ -183,4 +189,4 @@ public abstract class GridAffinityProcessorAbstractSelfTest 
extends GridCommonAb
 
         assertTrue(diff < 25000);
     }
-}
\ 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/affinity/GridAffinityProcessorMemoryLeakTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorMemoryLeakTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorMemoryLeakTest.java
index d6c5727..1fc90ba 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorMemoryLeakTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorMemoryLeakTest.java
@@ -31,6 +31,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_AFFINITY_HISTORY_SIZE;
 import static org.apache.ignite.IgniteSystemProperties.getInteger;
@@ -39,6 +42,7 @@ import static 
org.apache.ignite.IgniteSystemProperties.getInteger;
  * Tests for {@link GridAffinityProcessor}.
  */
 @GridCommonTest(group = "Affinity Processor")
+@RunWith(JUnit4.class)
 public class GridAffinityProcessorMemoryLeakTest extends 
GridCommonAbstractTest {
     /** Max value for affinity history size name. Should be the same as in 
GridAffinityAssignmentCache.MAX_HIST_SIZE */
     private final int MAX_HIST_SIZE = getInteger(IGNITE_AFFINITY_HISTORY_SIZE, 
500);
@@ -84,6 +88,7 @@ public class GridAffinityProcessorMemoryLeakTest extends 
GridCommonAbstractTest
      *
      * @throws Exception In case of any exception.
      */
+    @Test
     public void testAffinityProcessor() throws Exception {
         Ignite ignite = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java
index 1f515d5..802934f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java
@@ -29,10 +29,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;
 
 /**
  * Test for {@link IgniteAuthenticationProcessor} on unstable topology.
  */
+@RunWith(JUnit4.class)
 public class Authentication1kUsersNodeRestartTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -93,6 +97,7 @@ public class Authentication1kUsersNodeRestartTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void test1kUsersNodeRestartServer() 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/authentication/AuthenticationConfigurationClusterTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
index 11aa754..2fe7fc7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
@@ -29,10 +29,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;
 
 /**
  * Test for disabled {@link IgniteAuthenticationProcessor}.
  */
+@RunWith(JUnit4.class)
 public class AuthenticationConfigurationClusterTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -96,6 +100,7 @@ public class AuthenticationConfigurationClusterTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerNodeJoinDisabled() throws Exception {
         checkNodeJoinDisabled(false);
     }
@@ -103,6 +108,7 @@ public class AuthenticationConfigurationClusterTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientNodeJoinDisabled() throws Exception {
         checkNodeJoinDisabled(true);
     }
@@ -110,6 +116,7 @@ public class AuthenticationConfigurationClusterTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testServerNodeJoinEnabled() throws Exception {
         checkNodeJoinEnabled(false);
     }
@@ -117,6 +124,7 @@ public class AuthenticationConfigurationClusterTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClientNodeJoinEnabled() throws Exception {
         checkNodeJoinEnabled(true);
     }
@@ -160,6 +168,7 @@ public class AuthenticationConfigurationClusterTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDisabledAuthentication() throws Exception {
         startGrid(configuration(0, false, false));
 
@@ -205,6 +214,7 @@ public class AuthenticationConfigurationClusterTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testEnableAuthenticationWithoutPersistence() throws Exception {
         GridTestUtils.assertThrowsAnyCause(log, 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/processors/authentication/AuthenticationOnNotActiveClusterTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationOnNotActiveClusterTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationOnNotActiveClusterTest.java
index 18d2032..67c9d92 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationOnNotActiveClusterTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationOnNotActiveClusterTest.java
@@ -26,10 +26,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;
 
 /**
  * Test for {@link IgniteAuthenticationProcessor}.
  */
+@RunWith(JUnit4.class)
 public class AuthenticationOnNotActiveClusterTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -94,6 +98,7 @@ public class AuthenticationOnNotActiveClusterTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDefaultUser() throws Exception {
         startGrids(NODES_COUNT);
 
@@ -108,6 +113,7 @@ public class AuthenticationOnNotActiveClusterTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testNotDefaultUser() throws Exception {
         startGrids(NODES_COUNT + 1);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
index 661c875..0de2767 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
@@ -27,10 +27,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;
 
 /**
  * Test for NPE on start node simultaneous.
  */
+@RunWith(JUnit4.class)
 public class AuthenticationProcessorNPEOnStartTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -72,6 +76,7 @@ public class AuthenticationProcessorNPEOnStartTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void test() throws Exception {
         final AtomicInteger nodeIdx = new AtomicInteger();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
index 248d685..05ec213 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
@@ -30,10 +30,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;
 
 /**
  * Test for {@link IgniteAuthenticationProcessor} on unstable topology.
  */
+@RunWith(JUnit4.class)
 public class AuthenticationProcessorNodeRestartTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -115,6 +119,7 @@ public class AuthenticationProcessorNodeRestartTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentAddUpdateRemoveNodeRestartCoordinator() throws 
Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-7472";);
 
@@ -177,6 +182,7 @@ public class AuthenticationProcessorNodeRestartTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentAuthorize() throws Exception {
         final int testUsersCnt = 10;
 
@@ -276,6 +282,7 @@ public class AuthenticationProcessorNodeRestartTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void test1kUsersNodeRestartServer() throws Exception {
         final AtomicInteger usrCnt = new AtomicInteger();
 
@@ -330,6 +337,7 @@ public class AuthenticationProcessorNodeRestartTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentAddUpdateRemoveNodeRestartServer() throws 
Exception {
         IgniteInternalFuture restartFut = loopServerRestarts();
 
@@ -363,6 +371,7 @@ public class AuthenticationProcessorNodeRestartTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentFailedOperationNodeRestartServer() throws 
Exception {
         IgniteInternalFuture restartFut = loopServerRestarts();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
index 3d579ab..f81979b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
@@ -33,10 +33,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;
 
 /**
  * Test for {@link IgniteAuthenticationProcessor}.
  */
+@RunWith(JUnit4.class)
 public class AuthenticationProcessorSelfTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -130,6 +134,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDefaultUser() throws Exception {
         for (int i = 0; i < NODES_COUNT; ++i) {
             AuthorizationContext actx = 
grid(i).context().authentication().authenticate("ignite", "ignite");
@@ -142,6 +147,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDefaultUserUpdate() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -167,6 +173,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRemoveDefault() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -193,6 +200,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUserManagementPermission() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -246,6 +254,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testProceedUsersOnJoinNode() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -273,6 +282,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAuthenticationInvalidUser() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -305,6 +315,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAddUpdateRemoveUser() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -322,6 +333,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUpdateUser() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -343,6 +355,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUpdateRemoveDoesNotExistsUser() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -375,6 +388,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAddAlreadyExistsUser() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -401,6 +415,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAuthorizeOnClientDisconnect() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -445,6 +460,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testConcurrentAddRemove() throws Exception {
         final AtomicInteger usrCnt = new AtomicInteger();
 
@@ -471,6 +487,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testUserPersistence() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -508,6 +525,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDefaultUserPersistence() throws Exception {
         AuthorizationContext.context(actxDflt);
 
@@ -543,6 +561,7 @@ public class AuthenticationProcessorSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testInvalidUserNamePassword() throws Exception {
         AuthorizationContext.context(actxDflt);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java
index e90a703..5121755 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/AtomicCacheAffinityConfigurationTest.java
@@ -28,9 +28,13 @@ import org.apache.ignite.internal.IgniteEx;
 import 
org.apache.ignite.internal.processors.datastructures.AtomicDataStructureProxy;
 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 AtomicCacheAffinityConfigurationTest extends 
GridCommonAbstractTest {
     /** Affinity function. */
     private AffinityFunction affinityFunction;
@@ -47,6 +51,7 @@ public class AtomicCacheAffinityConfigurationTest extends 
GridCommonAbstractTest
      * @throws Exception If failed.
      *
      */
+    @Test
     public void testRendezvousAffinity() throws Exception {
         try {
             affinityFunction = new RendezvousAffinityFunction(false, 10);
@@ -79,6 +84,7 @@ public class AtomicCacheAffinityConfigurationTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTestAffinity() throws Exception {
         try {
             affinityFunction = new TestAffinityFunction("Some value");
@@ -111,6 +117,7 @@ public class AtomicCacheAffinityConfigurationTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDefaultAffinity() throws Exception {
         try {
             affinityFunction = null;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
index c7c3757..0c878c7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
@@ -29,10 +29,14 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 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;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class BinaryMetadataRegistrationInsideEntryProcessorTest extends 
GridCommonAbstractTest {
     /** */
     private static final String CACHE_NAME = "test-cache";
@@ -50,6 +54,7 @@ public class 
BinaryMetadataRegistrationInsideEntryProcessorTest extends GridComm
     /**
      * @throws Exception If failed;
      */
+    @Test
     public void test() throws Exception {
         Ignite ignite = startGrids(2);
 
@@ -145,4 +150,4 @@ public class 
BinaryMetadataRegistrationInsideEntryProcessorTest extends GridComm
             this.data = data;
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
index 503da88..baaf503 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
@@ -38,6 +38,9 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi;
 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;
 
@@ -45,6 +48,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
  * Test for {@link IgniteCompute#affinityCall(String, Object, IgniteCallable)} 
and
  * {@link IgniteCompute#affinityRun(String, Object, IgniteRunnable)}.
  */
+@RunWith(JUnit4.class)
 public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
     /** */
     private static final String CACHE_NAME = "myCache";
@@ -89,6 +93,7 @@ public class CacheAffinityCallSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinityCallRestartNode() throws Exception {
         startGridsMultiThreaded(SRVS);
 
@@ -98,6 +103,7 @@ public class CacheAffinityCallSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinityCallFromClientRestartNode() throws Exception {
         startGridsMultiThreaded(SRVS + 1);
 
@@ -146,6 +152,7 @@ public class CacheAffinityCallSelfTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAffinityCallNoServerNode() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-1741";);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
index fdc98ff..2a7b446 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java
@@ -41,6 +41,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -48,6 +51,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Tests single / transform messages being sent between nodes in ATOMIC mode.
  */
+@RunWith(JUnit4.class)
 public class CacheAtomicSingleMessageCountSelfTest extends 
GridCommonAbstractTest {
     /** VM ip finder for TCP discovery. */
     private static TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -85,6 +89,7 @@ public class CacheAtomicSingleMessageCountSelfTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSingleMessage() throws Exception {
         startGrids(2);
 
@@ -117,6 +122,7 @@ public class CacheAtomicSingleMessageCountSelfTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSingleTransformMessage() throws Exception {
         startGrids(2);
 
@@ -159,6 +165,7 @@ public class CacheAtomicSingleMessageCountSelfTest extends 
GridCommonAbstractTes
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSingleFilterMessage() throws Exception {
         startGrids(2);
 

Reply via email to