http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index 389a7fe..319e0fc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -60,12 +60,16 @@ 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.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static 
org.apache.ignite.testframework.GridTestUtils.runMultiThreadedAsync;
 
 /**
  * Test for rebalancing and persistence integration.
  */
+@RunWith(JUnit4.class)
 public abstract class IgnitePdsCacheRebalancingAbstractTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -211,6 +215,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest 
extends GridCommonAb
      *
      * @throws Exception If fails.
      */
+    @Test
     public void testRebalancingOnRestart() throws Exception {
         Ignite ignite0 = startGrid(0);
 
@@ -262,6 +267,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest 
extends GridCommonAb
      *
      * @throws Exception If fails.
      */
+    @Test
     public void testRebalancingOnRestartAfterCheckpoint() throws Exception {
         IgniteEx ignite0 = startGrid(0);
 
@@ -323,6 +329,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest 
extends GridCommonAb
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTopologyChangesWithConstantLoad() throws Exception {
         final long timeOut = U.currentTimeMillis() + 5 * 60 * 1000;
 
@@ -520,6 +527,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest 
extends GridCommonAb
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testForceRebalance() throws Exception {
         testForceRebalance(CACHE);
     }
@@ -527,6 +535,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest 
extends GridCommonAb
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testForceRebalanceClientTopology() throws Exception {
         filteredCacheEnabled = true;
 
@@ -582,6 +591,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest 
extends GridCommonAb
     /**
      * @throws Exception If failed
      */
+    @Test
     public void testPartitionCounterConsistencyOnUnstableTopology() throws 
Exception {
         final Ignite ig = startGrids(4);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
index 8e00d88..9cae83f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
@@ -38,10 +38,14 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsCacheStartStopWithFreqCheckpointTest extends 
GridCommonAbstractTest {
     /** Caches. */
     private static final int CACHES = 10;
@@ -103,6 +107,7 @@ public class IgnitePdsCacheStartStopWithFreqCheckpointTest 
extends GridCommonAbs
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testCheckpointDeadlock() throws Exception {
         IgniteEx crd = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
index da19285..6f3c9e5 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
@@ -48,10 +48,14 @@ import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.multijvm.IgniteProcessProxy;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test to reproduce corrupted indexes problem after partition file eviction 
and truncation.
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsCorruptedIndexTest extends GridCommonAbstractTest {
     /** Cache name. */
     private static final String CACHE = "cache";
@@ -123,6 +127,7 @@ public class IgnitePdsCorruptedIndexTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testCorruption() throws Exception {
         final String corruptedNodeName = "corrupted";
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java
index dba8486..2592410 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java
@@ -54,6 +54,9 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiClosure;
 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_PDS_SKIP_CRC;
 import static 
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
@@ -62,6 +65,7 @@ import static 
org.apache.ignite.internal.processors.cache.persistence.metastorag
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
     /** */
     private static final String CACHE_NAME1 = "cache1";
@@ -148,6 +152,7 @@ public class IgnitePdsCorruptedStoreTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If test failed.
      */
+    @Test
     public void testNodeInvalidatedWhenPersistenceIsCorrupted() throws 
Exception {
         Ignite ignite = startGrid(0);
 
@@ -192,6 +197,7 @@ public class IgnitePdsCorruptedStoreTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception In case of fail
      */
+    @Test
     public void testWrongPageCRC() throws Exception {
         System.setProperty(IGNITE_PDS_SKIP_CRC, "true");
 
@@ -225,6 +231,7 @@ public class IgnitePdsCorruptedStoreTest extends 
GridCommonAbstractTest {
     /**
      * Test node invalidation when meta storage is corrupted.
      */
+    @Test
     public void testMetaStorageCorruption() throws Exception {
         IgniteEx ignite = startGrid(0);
 
@@ -251,6 +258,7 @@ public class IgnitePdsCorruptedStoreTest extends 
GridCommonAbstractTest {
     /**
      * Test node invalidation when cache meta is corrupted.
      */
+    @Test
     public void testCacheMetaCorruption() throws Exception {
         IgniteEx ignite = startGrid(0);
 
@@ -325,6 +333,7 @@ public class IgnitePdsCorruptedStoreTest extends 
GridCommonAbstractTest {
     /**
      * Test node invalidation when meta store is read only.
      */
+    @Test
     public void testReadOnlyMetaStore() throws Exception {
         IgniteEx ignite0 = startGrid(0);
 
@@ -369,6 +378,7 @@ public class IgnitePdsCorruptedStoreTest extends 
GridCommonAbstractTest {
     /**
      * Test node invalidation due to checkpoint error.
      */
+    @Test
     public void testCheckpointFailure() 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/processors/cache/persistence/IgnitePdsDestroyCacheTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheTest.java
index 99d6f01..06e3a6a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheTest.java
@@ -18,16 +18,21 @@
 package org.apache.ignite.internal.processors.cache.persistence;
 
 import org.apache.ignite.Ignite;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test correct clean up cache configuration data after destroying cache.
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsDestroyCacheTest extends 
IgnitePdsDestroyCacheAbstractTest {
     /**
      *  Test destroy non grouped caches.
      *
      *  @throws Exception If failed.
      */
+    @Test
     public void testDestroyCaches() throws Exception {
         Ignite ignite = startGrids(NODES);
 
@@ -43,6 +48,7 @@ public class IgnitePdsDestroyCacheTest extends 
IgnitePdsDestroyCacheAbstractTest
      *
      *  @throws Exception If failed.
      */
+    @Test
     public void testDestroyGroupCaches() throws Exception {
         Ignite ignite = startGrids(NODES);
 
@@ -58,6 +64,7 @@ public class IgnitePdsDestroyCacheTest extends 
IgnitePdsDestroyCacheAbstractTest
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDestroyCachesAbruptly() throws Exception {
         Ignite ignite = startGrids(NODES);
 
@@ -67,12 +74,13 @@ public class IgnitePdsDestroyCacheTest extends 
IgnitePdsDestroyCacheAbstractTest
 
         checkDestroyCachesAbruptly(ignite);
     }
-    
+
     /**
      * Test destroy group caches abruptly with checkpoints.
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDestroyGroupCachesAbruptly() throws Exception {
         Ignite ignite = startGrids(NODES);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java
index 1bb6f5d..8042a76 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java
@@ -21,10 +21,14 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.util.typedef.G;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Check that cluster survives after destroy caches abruptly with disabled 
checkpoints.
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsDestroyCacheWithoutCheckpointsTest extends 
IgnitePdsDestroyCacheAbstractTest {
     /**
      * {@inheritDoc}
@@ -39,6 +43,7 @@ public class IgnitePdsDestroyCacheWithoutCheckpointsTest 
extends IgnitePdsDestro
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDestroyCachesAbruptlyWithoutCheckpoints() throws Exception 
{
         Ignite ignite = startGrids(NODES);
 
@@ -56,6 +61,7 @@ public class IgnitePdsDestroyCacheWithoutCheckpointsTest 
extends IgnitePdsDestro
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDestroyGroupCachesAbruptlyWithoutCheckpoints() throws 
Exception {
         Ignite ignite = startGrids(NODES);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
index be3ed0b..52adb02 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
@@ -33,10 +33,14 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.WALMode;
 import 
org.apache.ignite.internal.processors.database.IgniteDbDynamicCacheSelfTest;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
@@ -82,6 +86,7 @@ public class IgnitePdsDynamicCacheTest extends 
IgniteDbDynamicCacheSelfTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRestartAndCreate() throws Exception {
         startGrids(3);
 
@@ -149,6 +154,7 @@ public class IgnitePdsDynamicCacheTest extends 
IgniteDbDynamicCacheSelfTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDynamicCacheSavingOnNewNode() 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/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
index d6d5c4f..e90354e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
@@ -28,10 +28,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsExchangeDuringCheckpointTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -42,6 +46,7 @@ public class IgnitePdsExchangeDuringCheckpointTest extends 
GridCommonAbstractTes
     /**
      *
      */
+    @Test
     public void testExchangeOnNodeLeft() throws Exception {
         for (int i = 0; i < 5; i++) {
             startGrids(3);
@@ -63,6 +68,7 @@ public class IgnitePdsExchangeDuringCheckpointTest extends 
GridCommonAbstractTes
     /**
      *
      */
+    @Test
     public void testExchangeOnNodeJoin() throws Exception {
         for (int i = 0; i < 5; i++) {
             startGrids(2);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
index 27bfe28..c8c8aaf 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
@@ -27,10 +27,14 @@ import 
org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsMarshallerMappingRestoreOnNodeStartTest extends 
GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) 
throws Exception {
@@ -68,6 +72,7 @@ public class IgnitePdsMarshallerMappingRestoreOnNodeStartTest 
extends GridCommon
      * Test verifies that binary metadata from regular java classes is saved 
and restored correctly
      * on cluster restart.
      */
+    @Test
     public void testStaticMetadataIsRestoredOnRestart() throws Exception {
         startGrids(1);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
index d907239..6c3a275 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
@@ -32,12 +32,16 @@ import org.apache.ignite.configuration.WALMode;
 import org.apache.ignite.internal.IgniteEx;
 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_DEFAULT_DISK_PAGE_COMPRESSION;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsPageSizesTest extends GridCommonAbstractTest {
     /** Cache name. */
     private final String cacheName = "cache";
@@ -80,6 +84,7 @@ public class IgnitePdsPageSizesTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPageSize_1k() throws Exception {
         checkPageSize(1024);
     }
@@ -87,6 +92,7 @@ public class IgnitePdsPageSizesTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPageSize_2k() throws Exception {
         checkPageSize(2 * 1024);
     }
@@ -94,6 +100,7 @@ public class IgnitePdsPageSizesTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPageSize_4k() throws Exception {
         checkPageSize(4 * 1024);
     }
@@ -101,6 +108,7 @@ public class IgnitePdsPageSizesTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPageSize_8k() throws Exception {
         checkPageSize(8 * 1024);
     }
@@ -108,6 +116,7 @@ public class IgnitePdsPageSizesTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPageSize_16k() throws Exception {
         checkPageSize(16 * 1024);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
index 578692c..1d1a03f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
@@ -45,12 +45,16 @@ import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static 
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
 
 /**
  * Test class to check that partition files after eviction are destroyed 
correctly on next checkpoint or crash recovery.
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsPartitionFilesDestroyTest extends GridCommonAbstractTest 
{
     /** Cache name. */
     private static final String CACHE = "cache";
@@ -145,6 +149,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionFileDestroyAfterCheckpoint() throws Exception {
         IgniteEx crd = (IgniteEx) startGrids(2);
 
@@ -177,6 +182,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionFileDestroyAndRecreate() throws Exception {
         IgniteEx crd = startGrid(0);
 
@@ -224,6 +230,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionFileDestroyCrashRecovery1() throws Exception {
         IgniteEx crd = startGrid(0);
 
@@ -277,6 +284,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionFileDestroyCrashRecovery2() throws Exception {
         IgniteEx crd = startGrid(0);
 
@@ -338,6 +346,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testDestroyWhenPartitionsAreEmpty() throws Exception {
         IgniteEx crd = (IgniteEx) startGrids(2);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java
index 112fc59..2eafdc1 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java
@@ -31,10 +31,14 @@ import org.apache.ignite.internal.IgniteEx;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsPartitionsStateRecoveryTest extends 
GridCommonAbstractTest {
     /** Cache name. */
     private static final String CACHE = "cache";
@@ -94,6 +98,7 @@ public class IgnitePdsPartitionsStateRecoveryTest extends 
GridCommonAbstractTest
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionsStateConsistencyAfterRecovery() throws Exception 
{
         IgniteEx ignite = startGrid(0);
 
@@ -135,6 +140,7 @@ public class IgnitePdsPartitionsStateRecoveryTest extends 
GridCommonAbstractTest
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testPartitionsStateConsistencyAfterRecoveryNoCheckpoints() 
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/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
index 15205e0..b769eda 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
@@ -52,10 +52,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * This test generates WAL & Page Store with N pages, then rewrites pages with 
zeroes and tries to acquire all pages.
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsRecoveryAfterFileCorruptionTest extends 
GridCommonAbstractTest {
     /** Ip finder. */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -117,6 +121,7 @@ public class IgnitePdsRecoveryAfterFileCorruptionTest 
extends GridCommonAbstract
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPageRecoveryAfterFileCorruption() throws Exception {
         IgniteEx ig = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
index e51901d..e27b94f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
@@ -38,12 +38,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.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsRemoveDuringRebalancingTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -100,6 +104,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testRemovesDuringRebalancing() throws Exception {
         IgniteEx ig = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
index 9409f9d..c2c6ced 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
@@ -52,10 +52,14 @@ import org.apache.ignite.lang.IgniteRunnable;
 import org.apache.ignite.resources.IgniteInstanceResource;
 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 handle of task canceling with PDS enabled.
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsTaskCancelingTest extends GridCommonAbstractTest {
     /** Slow file IO enabled. */
     private static final AtomicBoolean slowFileIoEnabled = new 
AtomicBoolean(false);
@@ -113,6 +117,7 @@ public class IgnitePdsTaskCancelingTest extends 
GridCommonAbstractTest {
     /**
      * Checks that tasks canceling does not lead to node failure.
      */
+    @Test
     public void testFailNodesOnCanceledTask() throws Exception {
         cleanPersistenceDir();
 
@@ -184,6 +189,7 @@ public class IgnitePdsTaskCancelingTest extends 
GridCommonAbstractTest {
     /**
      * Test FilePageStore with multiple interrupted threads.
      */
+    @Test
     public void testFilePageStoreInterruptThreads() throws Exception {
         failure.set(false);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
index 3b324c3..ebaf168 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTxCacheRebalancingTest.java
@@ -23,10 +23,14 @@ import org.apache.ignite.cache.CacheRebalanceMode;
 import org.apache.ignite.cache.CacheWriteSynchronizationMode;
 import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
 import org.apache.ignite.configuration.CacheConfiguration;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsTxCacheRebalancingTest extends 
IgnitePdsCacheRebalancingAbstractTest {
     /** {@inheritDoc} */
     @Override protected CacheConfiguration cacheConfiguration(String 
cacheName) {
@@ -52,6 +56,7 @@ public class IgnitePdsTxCacheRebalancingTest extends 
IgnitePdsCacheRebalancingAb
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testTopologyChangesWithConstantLoadExplicitTx() throws 
Exception {
         explicitTx = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
index 5f28456..a755f0f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
@@ -48,6 +48,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -57,6 +60,7 @@ import static 
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -126,6 +130,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClusterRestartStaticCaches1() throws Exception {
         clusterRestart(1, true);
     }
@@ -133,6 +138,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClusterRestartStaticCaches2() throws Exception {
         clusterRestart(3, true);
     }
@@ -140,6 +146,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClusterRestartDynamicCaches1() throws Exception {
         clusterRestart(1, false);
     }
@@ -147,6 +154,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testClusterRestartDynamicCaches2() throws Exception {
         clusterRestart(3, false);
     }
@@ -155,6 +163,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
      * @throws Exception If failed.
      */
     @SuppressWarnings("unchecked")
+    @Test
     public void testClusterRestartCachesWithH2Indexes() throws Exception {
         CacheConfiguration[] ccfgs1 = new CacheConfiguration[5];
 
@@ -218,6 +227,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testExpiryPolicy() throws Exception {
         long ttl = 10 * 60000;
 
@@ -291,6 +301,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCreateDropCache() throws Exception {
         ccfgs = new CacheConfiguration[]{cacheConfiguration(GROUP1, "c1", 
PARTITIONED, ATOMIC, 1)
             .setIndexedTypes(Integer.class, Person.class)};
@@ -307,6 +318,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCreateDropCache1() throws Exception {
         CacheConfiguration ccfg1 = cacheConfiguration(GROUP1, "c1", 
PARTITIONED, ATOMIC, 1);
 
@@ -331,6 +343,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testCreateDropCache2() throws Exception {
         CacheConfiguration ccfg1 = cacheConfiguration(GROUP1, "c1", 
PARTITIONED, ATOMIC, 1)
             .setIndexedTypes(Integer.class, Person.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
index 80fb0e0..a74c469 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
@@ -39,10 +39,14 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePersistentStoreDataStructuresTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder ipFinder = new 
TcpDiscoveryVmIpFinder(true);
@@ -92,6 +96,7 @@ public class IgnitePersistentStoreDataStructuresTest extends 
GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testQueue() throws Exception {
         Ignite ignite = startGrids(4);
 
@@ -117,6 +122,7 @@ public class IgnitePersistentStoreDataStructuresTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testAtomic() throws Exception {
         Ignite ignite = startGrids(4);
 
@@ -142,6 +148,7 @@ public class IgnitePersistentStoreDataStructuresTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSequence() throws Exception {
         Ignite ignite = startGrids(4);
 
@@ -171,6 +178,7 @@ public class IgnitePersistentStoreDataStructuresTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSequenceAfterAutoactivation() throws Exception {
         final String seqName = "testSequence";
 
@@ -215,6 +223,7 @@ public class IgnitePersistentStoreDataStructuresTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSet() throws Exception {
         Ignite ignite = startGrids(4);
 
@@ -246,6 +255,7 @@ public class IgnitePersistentStoreDataStructuresTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLockVolatility() throws Exception {
         Ignite ignite = startGrids(4);
 
@@ -269,6 +279,7 @@ public class IgnitePersistentStoreDataStructuresTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testSemaphoreVolatility() throws Exception {
         Ignite ignite = startGrids(4);
 
@@ -292,6 +303,7 @@ public class IgnitePersistentStoreDataStructuresTest 
extends GridCommonAbstractT
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLatchVolatility() throws Exception {
         Ignite ignite = startGrids(4);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
index bb08a8d..4966da4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
@@ -48,12 +48,16 @@ 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.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.testframework.GridTestUtils.runAsync;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgniteRebalanceScheduleResendPartitionsTest extends 
GridCommonAbstractTest {
     /** */
     public static final TcpDiscoveryVmIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -110,6 +114,7 @@ public class IgniteRebalanceScheduleResendPartitionsTest 
extends GridCommonAbstr
      *
      * @throws Exception If failed.
      */
+    @Test
     public void test() throws Exception {
         Ignite ig0 = startGrids(3);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
index 4f2817f..5b28833 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
@@ -37,6 +37,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.lang.String.valueOf;
 import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_DISABLE_WAL_DURING_REBALANCING;
@@ -47,6 +50,7 @@ import static 
org.apache.ignite.internal.processors.cache.persistence.file.FileP
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest extends 
GridCommonAbstractTest {
 
     /** */
@@ -102,6 +106,7 @@ public class 
LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest extends Grid
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void test() throws Exception {
         Ignite ig = startGrids(NODES);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
index 04af1cc..094c678 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
@@ -55,12 +55,16 @@ import 
org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class LocalWalModeChangeDuringRebalancingSelfTest extends 
GridCommonAbstractTest {
     /** */
     private static boolean disableWalDuringRebalancing = true;
@@ -219,6 +223,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWalDisabledDuringRebalancing() throws Exception {
         doTestSimple();
     }
@@ -226,6 +231,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWalNotDisabledIfParameterSetToFalse() throws Exception {
         disableWalDuringRebalancing = false;
 
@@ -309,6 +315,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWalDisabledDuringRebalancingWithPendingTxTracker() throws 
Exception {
         enablePendingTxTracker = true;
         dfltCacheBackupCnt = 2;
@@ -363,6 +370,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testLocalAndGlobalWalStateInterdependence() throws Exception {
         Ignite ignite = startGrids(3);
 
@@ -402,6 +410,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testWithExchangesMerge() throws Exception {
         final int nodeCnt = 4;
         final int keyCnt = getKeysCount();
@@ -455,6 +464,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testParallelExchangeDuringRebalance() throws Exception {
         doTestParallelExchange(supplyMessageLatch);
     }
@@ -462,6 +472,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testParallelExchangeDuringCheckpoint() throws Exception {
         doTestParallelExchange(fileIOLatch);
     }
@@ -517,6 +528,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testDataClearedAfterRestartWithDisabledWal() throws Exception {
         Ignite ignite = startGrid(0);
 
@@ -558,6 +570,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest 
extends GridCommonAbstr
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testWalNotDisabledAfterShrinkingBaselineTopology() throws 
Exception {
         Ignite ignite = startGrids(4);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
index fac021e..82def5c 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
@@ -27,12 +27,16 @@ import 
org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
 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;
 
 import static 
org.apache.ignite.configuration.MemoryConfiguration.DFLT_MEM_PLC_DEFAULT_NAME;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class MemoryPolicyInitializationTest extends GridCommonAbstractTest {
     /** */
     private static final String CUSTOM_NON_DEFAULT_MEM_PLC_NAME = 
"custom_mem_plc";
@@ -68,6 +72,7 @@ public class MemoryPolicyInitializationTest extends 
GridCommonAbstractTest {
     /**
      * Verifies that expected memory policies are allocated when used doesn't 
provide any MemoryPolicyConfiguration.
      */
+    @Test
     public void testNoConfigProvided() throws Exception {
         memCfg = null;
 
@@ -84,6 +89,7 @@ public class MemoryPolicyInitializationTest extends 
GridCommonAbstractTest {
      * Verifies that expected memory policies are allocated when used provides 
MemoryPolicyConfiguration
      * with non-default custom MemoryPolicy.
      */
+    @Test
     public void testCustomConfigNoDefault() throws Exception {
         prepareCustomNoDefaultConfig();
 
@@ -103,6 +109,7 @@ public class MemoryPolicyInitializationTest extends 
GridCommonAbstractTest {
      * User is allowed to configure memory policy with 'default' name,
      * in that case Ignite instance will use this user-defined memory policy 
as a default one.
      */
+    @Test
     public void testCustomConfigOverridesDefault() throws Exception {
         prepareCustomConfigWithOverridingDefault();
 
@@ -127,6 +134,7 @@ public class MemoryPolicyInitializationTest extends 
GridCommonAbstractTest {
      * At the same time user still can create a memory policy with name 
'default'
      * which although won't be used as default.
      */
+    @Test
     public void testCustomConfigOverridesDefaultNameAndDeclaresDefault() 
throws Exception {
         prepareCustomConfigWithOverriddenDefaultName();
 
@@ -150,6 +158,7 @@ public class MemoryPolicyInitializationTest extends 
GridCommonAbstractTest {
      * with specified default memory policy name and specified custom memory 
policy name
      * all started with correct memory policy.
      */
+    @Test
     public void testCachesOnOverriddenMemoryPolicy() throws Exception {
         prepareCustomConfigWithOverridingDefaultAndCustom();
 
@@ -184,6 +193,7 @@ public class MemoryPolicyInitializationTest extends 
GridCommonAbstractTest {
      * with specified default memory policy name and specified custom memory 
policy name
      * all started with correct memory policy.
      */
+    @Test
     public void testCachesOnUserDefinedDefaultMemoryPolicy() throws Exception {
         prepareCustomConfigWithOverriddenDefaultName();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java
index bb55c82..2de83c2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java
@@ -21,10 +21,14 @@ import 
org.apache.ignite.configuration.DataStorageConfiguration;
 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 that warning is logged when persistence store directory equals {@code 
System.getProperty("java.io.tmpdir")}.
  */
+@RunWith(JUnit4.class)
 public class PersistenceDirectoryWarningLoggingTest extends 
GridCommonAbstractTest {
     /** Warning message to test. */
     private static final String WARN_MSG_PREFIX = "Persistence store directory 
is in the temp " +
@@ -60,6 +64,7 @@ public class PersistenceDirectoryWarningLoggingTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPdsDirWarningSuppressed() throws Exception {
         startGrid();
 
@@ -69,6 +74,7 @@ public class PersistenceDirectoryWarningLoggingTest extends 
GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testPdsDirWarningIsLogged() throws Exception {
         IgniteConfiguration cfg = getConfiguration("0");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
index 13a98e4..a404adf 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
@@ -53,12 +53,16 @@ import 
org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static 
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
 
 /**
  * Checks that client affinity assignment cache is calculated correctly 
regardless of current baseline topology.
  */
+@RunWith(JUnit4.class)
 public class ClientAffinityAssignmentWithBaselineTest extends 
GridCommonAbstractTest {
     /** Nodes count. */
     private static final int DEFAULT_NODES_COUNT = 5;
@@ -225,6 +229,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      *
      */
+    @Test
     public void testPartitionedAtomicCache() throws Exception {
         testChangingBaselineDown(PARTITIONED_ATOMIC_CACHE_NAME, false);
     }
@@ -232,6 +237,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      *
      */
+    @Test
     public void testPartitionedTxCache() throws Exception {
         testChangingBaselineDown(PARTITIONED_TX_CACHE_NAME, false);
     }
@@ -239,6 +245,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      * Test that activation after client join won't break cache.
      */
+    @Test
     public void testLateActivation() throws Exception {
         testChangingBaselineDown(PARTITIONED_TX_CACHE_NAME, true);
     }
@@ -246,6 +253,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      *
      */
+    @Test
     public void testReplicatedAtomicCache() throws Exception {
         testChangingBaselineDown(REPLICATED_ATOMIC_CACHE_NAME, false);
     }
@@ -253,6 +261,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      *
      */
+    @Test
     public void testReplicatedTxCache() throws Exception {
         testChangingBaselineDown(REPLICATED_TX_CACHE_NAME, false);
     }
@@ -328,6 +337,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      * Tests that rejoin of baseline node with clear LFS under load won't 
break cache.
      */
+    @Test
     public void testRejoinWithCleanLfs() throws Exception {
         IgniteEx ig0 = (IgniteEx)startGrids(DEFAULT_NODES_COUNT - 1);
         startGrid("flaky");
@@ -394,6 +404,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      * Test that changing baseline down under cross-cache txs load won't break 
cache.
      */
+    @Test
     public void testCrossCacheTxs() throws Exception {
         IgniteEx ig0 = (IgniteEx)startGrids(DEFAULT_NODES_COUNT);
 
@@ -455,6 +466,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      * Tests that join of non-baseline node while long transactions are 
running won't break dynamically started cache.
      */
+    @Test
     public void testDynamicCacheLongTransactionNodeStart() throws Exception {
         IgniteEx ig0 = (IgniteEx)startGrids(4);
 
@@ -526,13 +538,14 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
      * Tests that if dynamic cache has no affinity nodes at the moment of 
start,
      * it will still work correctly when affinity nodes will appear.
      */
+    @Test
     public void testDynamicCacheStartNoAffinityNodes() throws Exception {
         fail("IGNITE-8652");
 
         IgniteEx ig0 = startGrid(0);
 
         ig0.cluster().active(true);
-        
+
         IgniteEx client = (IgniteEx)startGrid("client");
 
         CacheConfiguration<Integer, String> dynamicCacheCfg = new 
CacheConfiguration<Integer, String>()
@@ -544,7 +557,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
             .setNodeFilter(new 
ConsistentIdNodeFilter((Serializable)ig0.localNode().consistentId()));
 
         IgniteCache<Integer, String> dynamicCache = 
client.getOrCreateCache(dynamicCacheCfg);
-        
+
         for (int i = 1; i < 4; i++)
             startGrid(i);
 
@@ -552,29 +565,29 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
 
         for (int i = 0; i < ENTRIES; i++)
             dynamicCache.put(i, "abacaba" + i);
-        
+
         AtomicBoolean releaseTx = new AtomicBoolean(false);
         CountDownLatch allTxsDoneLatch = new CountDownLatch(10);
-        
+
         for (int i = 0; i < 10; i++) {
             final int i0 = i;
-            
+
             GridTestUtils.runAsync(new Runnable() {
                 @Override public void run() {
                     try (Transaction tx = 
client.transactions().txStart(TransactionConcurrency.PESSIMISTIC,
                         TransactionIsolation.REPEATABLE_READ)) {
                         dynamicCache.put(i0, "txtxtxtx" + i0);
-                        
+
                         while (!releaseTx.get())
                             LockSupport.parkNanos(1_000_000);
-                        
+
                         tx.commit();
-                        
+
                         System.out.println("Tx #" + i0 + " committed");
                     }
                     catch (Throwable t) {
                         System.out.println("Tx #" + i0 + " failed");
-                        
+
                         t.printStackTrace();
                     }
                     finally {
@@ -583,7 +596,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
                 }
             });
         }
-        
+
         GridTestUtils.runAsync(new Runnable() {
             @Override public void run() {
                 try {
@@ -608,6 +621,7 @@ public class ClientAffinityAssignmentWithBaselineTest 
extends GridCommonAbstract
     /**
      * Tests that join of non-baseline node while long transactions are 
running won't break cache started on client join.
      */
+    @Test
     public void testClientJoinCacheLongTransactionNodeStart() throws Exception 
{
         IgniteEx ig0 = (IgniteEx)startGrids(4);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
index cddd701..c84f754 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
@@ -27,10 +27,14 @@ import org.apache.ignite.configuration.WALMode;
 import org.apache.ignite.internal.IgniteEx;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Test absenting eviction for joined node if it is out of baseline.
  */
+@RunWith(JUnit4.class)
 public class IgniteAbsentEvictionNodeOutOfBaselineTest extends 
GridCommonAbstractTest {
     /** */
     private static final String TEST_CACHE_NAME = "test";
@@ -75,6 +79,7 @@ public class IgniteAbsentEvictionNodeOutOfBaselineTest 
extends GridCommonAbstrac
     /**
      * Removed partitions if node is out of baseline.
      */
+    @Test
     public void testPartitionsRemovedIfJoiningNodeNotInBaseline() throws 
Exception {
         //given: start 3 nodes with data
         Ignite ignite0 = startGrids(3);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java
index 2ae492b..c96ec50 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java
@@ -59,10 +59,14 @@ import org.apache.ignite.testframework.GridStringLogger;
 import org.apache.ignite.testframework.GridTestUtils;
 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;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class CheckpointBufferDeadlockTest extends GridCommonAbstractTest {
     /** Ip finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -146,6 +150,7 @@ public class CheckpointBufferDeadlockTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testFourCheckpointThreads() throws Exception {
         checkpointThreads = 4;
 
@@ -155,6 +160,7 @@ public class CheckpointBufferDeadlockTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testOneCheckpointThread() throws Exception {
         checkpointThreads = 1;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
index 93cc074..c629420 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
@@ -64,10 +64,14 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * A set of tests that check correctness of logical recovery performed during 
node start.
  */
+@RunWith(JUnit4.class)
 public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
     /** */
     private static final int[] EVTS_DISABLED = {};
@@ -176,6 +180,7 @@ public class IgniteLogicalRecoveryTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testRecoveryOnJoinToActiveCluster() throws Exception {
         IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3);
 
@@ -205,6 +210,7 @@ public class IgniteLogicalRecoveryTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testRecoveryOnJoinToInactiveCluster() throws Exception {
         IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3);
 
@@ -238,6 +244,7 @@ public class IgniteLogicalRecoveryTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testRecoveryOnDynamicallyStartedCaches() throws Exception {
         List<CacheConfiguration> dynamicCaches = Lists.newArrayList(
             cacheConfiguration(DYNAMIC_CACHE_PREFIX + 0, 
CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL),
@@ -252,6 +259,7 @@ public class IgniteLogicalRecoveryTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testRecoveryWithMvccCaches() throws Exception {
         fail("https://issues.apache.org/jira/browse/IGNITE-10052";);
 
@@ -298,6 +306,7 @@ public class IgniteLogicalRecoveryTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testRecoveryOnJoinToDifferentBlt() throws Exception {
         IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3);
 
@@ -330,6 +339,7 @@ public class IgniteLogicalRecoveryTest extends 
GridCommonAbstractTest {
     /**
      *
      */
+    @Test
     public void testRecoveryOnCrushDuringCheckpointOnNodeStart() throws 
Exception {
         IgniteEx crd = (IgniteEx) startGridsMultiThreaded(3, false);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
index 4787143..c341452 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
@@ -29,12 +29,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsCacheRestoreTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -93,6 +97,7 @@ public class IgnitePdsCacheRestoreTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRestoreAndNewCache1() throws Exception {
         restoreAndNewCache(false);
     }
@@ -100,6 +105,7 @@ public class IgnitePdsCacheRestoreTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Test
     public void testRestoreAndNewCache2() throws Exception {
         restoreAndNewCache(true);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
index 1246db1..0ecde09 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
@@ -44,6 +44,9 @@ import org.apache.ignite.mxbean.CacheGroupMetricsMXBean;
 import org.apache.ignite.plugin.extensions.communication.Message;
 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.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
 
@@ -51,6 +54,7 @@ import static 
org.apache.ignite.internal.processors.cache.persistence.file.FileP
  * Test scenarios with rebalancing, IGNITE_DISABLE_WAL_DURING_REBALANCING 
optimization and topology changes
  * such as client nodes join/leave, server nodes from BLT leave/join, server 
nodes out of BLT join/leave.
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsCacheWalDisabledOnRebalancingTest extends 
GridCommonAbstractTest {
     /** Block message predicate to set to Communication SPI in node 
configuration. */
     private IgniteBiPredicate<ClusterNode, Message> blockMessagePredicate;
@@ -138,6 +142,7 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest 
extends GridCommonAbstra
      * If client joins topology during rebalancing process, rebalancing 
finishes successfully,
      * all partitions are owned as expected when rebalancing finishes.
      */
+    @Test
     public void testClientJoinsLeavesDuringRebalancing() throws Exception {
         Ignite ig0 = startGrids(2);
 
@@ -188,11 +193,12 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest 
extends GridCommonAbstra
     /**
      * If server nodes from BLT leave topology and then join again after 
additional keys were put to caches,
      * rebalance starts.
-     * 
+     *
      * Test verifies that all moving partitions get owned after rebalance 
finishes.
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testServerNodesFromBltLeavesAndJoinsDuringRebalancing() throws 
Exception {
         Ignite ig0 = startGridsMultiThreaded(4);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
index 0326c84..36d35e7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
@@ -49,6 +49,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.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import static java.nio.file.Files.newDirectoryStream;
 import static 
org.apache.ignite.configuration.DataStorageConfiguration.DFLT_DATA_REG_DEFAULT_NAME;
@@ -60,6 +63,7 @@ import static 
org.apache.ignite.internal.processors.cache.persistence.metastorag
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsDataRegionMetricsTest extends GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -126,6 +130,7 @@ public class IgnitePdsDataRegionMetricsTest extends 
GridCommonAbstractTest {
     }
 
     /** */
+    @Test
     public void testMemoryUsageSingleNode() throws Exception {
         DataRegionMetrics initMetrics = null;
 
@@ -169,6 +174,7 @@ public class IgnitePdsDataRegionMetricsTest extends 
GridCommonAbstractTest {
     }
 
     /** */
+    @Test
     public void testMemoryUsageMultipleNodes() throws Exception {
         IgniteEx node0 = startGrid(0);
         IgniteEx node1 = startGrid(1);
@@ -220,6 +226,7 @@ public class IgnitePdsDataRegionMetricsTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testCheckpointBufferSize() throws Exception {
         IgniteEx ig = startGrid(0);
 
@@ -237,6 +244,7 @@ public class IgnitePdsDataRegionMetricsTest extends 
GridCommonAbstractTest {
      *
      * @throws Exception If failed.
      */
+    @Test
     public void testUsedCheckpointBuffer() throws Exception {
         IgniteEx ig = startGrid(0);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
index d386c17..29740d9 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
@@ -41,10 +41,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsMultiNodePutGetRestartTest extends 
GridCommonAbstractTest {
     /** */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -108,6 +112,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends 
GridCommonAbstractTest
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPutGetSimple() throws Exception {
         String home = U.getIgniteHome();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
index 720b604..5091d98 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
@@ -35,10 +35,14 @@ import 
org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabase
 import org.apache.ignite.internal.util.typedef.internal.U;
 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 IgnitePdsPageEvictionDuringPartitionClearTest extends 
GridCommonAbstractTest {
     /** */
     public static final String CACHE_NAME = "cache";
@@ -85,6 +89,7 @@ public class IgnitePdsPageEvictionDuringPartitionClearTest 
extends GridCommonAbs
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPageEvictionOnNodeStart() throws Exception {
         for (int r = 0; r < 3; r++) {
             cleanPersistenceDir();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
index 3c07a16..8534231 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
@@ -37,10 +37,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  *
  */
+@RunWith(JUnit4.class)
 public class IgnitePdsPageEvictionTest extends GridCommonAbstractTest {
     /** IP finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
@@ -102,6 +106,7 @@ public class IgnitePdsPageEvictionTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception if failed.
      */
+    @Test
     public void testPageEvictionSql() throws Exception {
         IgniteEx ig = grid(0);
 

Reply via email to