You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by il...@apache.org on 2021/02/05 16:11:42 UTC

[ignite] branch master updated: IGNITE-13512 Add travis check that tests are not in suites - Fixes #8367.

This is an automated email from the ASF dual-hosted git repository.

ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 62cc458  IGNITE-13512 Add travis check that tests are not in suites - Fixes #8367.
62cc458 is described below

commit 62cc45861c0273286e00eb6fbc510c0bb5589e52
Author: Maksim Timonin <ti...@gmail.com>
AuthorDate: Fri Feb 5 19:10:18 2021 +0300

    IGNITE-13512 Add travis check that tests are not in suites - Fixes #8367.
    
    Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
 .travis.yml                                        |  10 ++
 DEVNOTES.txt                                       |  17 +++
 .../org/apache/ignite/p2p/P2PGridifySelfTest.java  |   2 +
 .../ignite/testsuites/IgniteAopSelfTestSuite.java  |   5 +
 .../direct/singlesplit/SingleSplitsLoadTest.java   |   3 +
 .../gridify/GridifySingleSplitLoadTest.java        |   3 +
 .../org/apache/ignite/tests/SerializerSuite.java}  |  17 +--
 .../client/ClientMarshallerBenchmarkTest.java      |   3 +
 .../loadtests/client/ClientTcpSslLoadTest.java     |   3 +
 .../IgnitePKIndexesMigrationToUnwrapPkTest.java    |   2 +
 .../RendezvousAffinityFunctionSimpleBenchmark.java |   3 +
 .../cache/CacheEntryProcessorCopySelfTest.java     |   4 +
 .../cache/GridCacheAffinityRoutingSelfTest.java    |   3 +
 .../cache/GridCacheEntryMemorySizeSelfTest.java    |   3 +
 .../processors/cache/GridCacheMvccSelfTest.java    |   3 +
 .../cache/GridCacheNestedTxAbstractTest.java       |   2 +-
 .../cache/GridCacheOnCopyFlagAtomicSelfTest.java   |   2 +
 .../cache/GridCacheOnCopyFlagLocalSelfTest.java    |   2 +
 .../GridCacheOnCopyFlagReplicatedSelfTest.java     |   2 +
 .../GridCacheOnCopyFlagTxPartitionedSelfTest.java  |   2 +
 .../cache/GridCacheP2PUndeploySelfTest.java        |   2 +
 .../cache/GridCacheTtlManagerEvictionSelfTest.java |   2 +
 .../cache/IgniteCacheInterceptorSelfTestSuite.java |   9 +-
 .../cache/IgniteOutOfMemoryPropagationTest.java    |   3 +
 ...aryObjectsAtomicNearDisabledOnheapSelfTest.java |   6 +
 ...GridCacheBinaryObjectsAtomicOnheapSelfTest.java |   6 +
 ...jectsPartitionedNearDisabledOnheapSelfTest.java |   6 +
 ...acheBinaryObjectsPartitionedOnheapSelfTest.java |   6 +
 .../GridCacheBinaryObjectsLocalOnheapSelfTest.java |   6 +
 .../IgniteDataStructuresNoClassOnServerTest.java   |   2 +
 ...chePartitionedAtomicReferenceMultiNodeTest.java |   2 +
 .../partitioned/IgnitePartitionedLockSelfTest.java |   2 +
 ...acheReplicatedAtomicReferenceMultiNodeTest.java |   2 +
 .../CacheClientsConcurrentStartTest.java           |   2 +
 ...ava => GridCacheMultithreadedFailoverTest.java} |   4 +-
 .../IgniteBinaryMetadataUpdateNodeRestartTest.java |   2 +
 ...CacheClientMultiNodeUpdateTopologyLockTest.java |   2 +
 .../distributed/IgniteTxTimeoutAbstractTest.java   |   2 +-
 ... => IgniteCacheConcurrentPutGetRemoveTest.java} |   2 +-
 .../dht/atomic/GridCacheAtomicPreloadSelfTest.java |   2 +
 .../GridCacheRebalancingOrderingTest.java          |   2 +
 .../GridCacheReplicatedMarshallerTxTest.java       |   2 +
 .../GridCacheReplicatedOnheapFullApiSelfTest.java  |   6 +
 ...heReplicatedOnheapMultiNodeFullApiSelfTest.java |   6 +
 .../GridCacheReplicatedTxConcurrentGetTest.java    |   2 +
 .../replicated/GridCacheReplicatedTxReadTest.java  |   2 +
 .../IgniteCacheAtomicLocalExpiryPolicyTest.java    |   3 +
 ...niteCacheAtomicLocalOnheapExpiryPolicyTest.java |   6 +
 .../IgniteCacheAtomicOnheapExpiryPolicyTest.java   |   6 +
 .../expiry/IgniteCacheExpiryPolicyTestSuite.java   |   4 +-
 ...gniteStableBaselineCachePutAllFailoverTest.java |   2 +
 ...gniteStableBaselineCacheRemoveFailoverTest.java |   2 +
 .../db/checkpoint/IgniteMassLoadSandboxTest.java   |   3 +
 .../db/wal/WalCompactionAfterRestartTest.java      |   2 +
 .../pagelocktracker/PageLockTrackerTestSuit.java   |   1 +
 .../IgniteChangeGlobalStateCacheTest.java          |   2 +
 .../IgniteChangeGlobalStateDataStructureTest.java  |   2 +
 .../IgniteChangeGlobalStateServiceTest.java        |   1 +
 .../IgniteChangeGlobalStateTest.java               |   1 +
 .../extended/GridActivateExtensionTest.java        |   2 +
 .../communication/GridIoManagerBenchmark0.java     |   3 +
 .../tcp/GridTcpCommunicationSpiLogTest.java        |   2 +
 .../ignite/testsuites/IgniteBasicTestSuite.java    |   8 ++
 .../IgniteBasicWithPersistenceTestSuite.java       |   8 +-
 .../testsuites/IgniteBinaryCacheTestSuite.java     |  12 +-
 .../testsuites/IgniteBinaryObjectsTestSuite.java   |  15 ++-
 .../IgniteCacheDataStructuresSelfTestSuite.java    |  13 +-
 .../testsuites/IgniteCacheFailoverTestSuite2.java  |   6 +-
 .../IgniteCacheFullApiSelfTestSuite.java           |   3 +-
 .../testsuites/IgniteCacheRestartTestSuite.java    |   5 +-
 .../testsuites/IgniteCacheRestartTestSuite2.java   |   4 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java    |  15 +--
 .../ignite/testsuites/IgniteCacheTestSuite3.java   |  15 ++-
 .../ignite/testsuites/IgniteCacheTestSuite5.java   |   3 +-
 .../ignite/testsuites/IgniteCacheTestSuite6.java   |  13 +-
 .../ignite/testsuites/IgnitePdsTestSuite2.java     |   2 +
 .../testsuites/IgniteStandByClusterSuite.java      |  12 +-
 .../ignite/testsuites/IgniteUtilSelfTestSuite.java |   2 +
 .../testsuites/IgnitePdsNativeIoTestSuite.java     |   2 +
 .../cache/GridCacheQuerySimpleBenchmark.java       |   3 +
 .../index/ComplexSecondaryKeyUnwrapSelfTest.java   |   2 +
 .../cache/index/SqlTransactionsSelfTest.java       |   2 +
 .../IgniteBinaryCacheQueryTestSuite.java           |   9 ++
 .../testsuites/IgniteCacheMvccSqlTestSuite.java    |   3 +-
 .../testsuites/IgniteCacheQuerySelfTestSuite6.java |   3 +-
 .../ml/composition/CompositionTestSuite.java       |   6 +-
 .../apache/ignite/ml/dataset/DatasetTestSuite.java |   6 +-
 .../ignite/ml/math/MathImplLocalTestSuite.java     |   5 +
 .../ml/math/distances/DistancesTestSuite.java}     |  23 ++--
 .../ignite/ml/naivebayes/NaiveBayesTestSuite.java  |  48 ++++++++
 .../ml/preprocessing/PreprocessingTestSuite.java   |  13 +-
 .../ignite/ml/selection/SelectionTestSuite.java    |   8 +-
 .../ignite/ml/tree/DecisionTreeTestSuite.java      |   4 +-
 .../randomforest/RandomForestTreeTestSuite.java    |   4 +-
 .../scalar/testsuites/ScalarSelfTestSuite.scala    |   2 -
 .../apache/ignite/spark/IgniteDataFrameSuite.scala |   6 +-
 .../apache/ignite/spark/IgniteDataFrameSuite.scala |   6 +-
 modules/tools/pom.xml                              |  57 ++++++++-
 .../surefire/testsuites/AssertOnOrphanedTests.java |  56 +++++++++
 .../surefire/testsuites/CheckAllTestsInSuites.java | 127 ++++++++++++++++++++
 .../surefire/testsuites/IgniteTestsProvider.java   | 131 +++++++++++++++++++++
 .../testsuites/OrphanedTestCollection.java         | 106 +++++++++++++++++
 ...che.maven.surefire.providerapi.SurefireProvider |   1 +
 parent/pom.xml                                     |   7 +-
 pom.xml                                            |  69 +++++++++++
 105 files changed, 984 insertions(+), 84 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f762605..c563d51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,3 +50,13 @@ matrix:
       dotnet: 3.1.101
       script:
         - dotnet build modules/platforms/dotnet/Apache.Ignite.DotNetCore.sln
+
+    - language: java
+      name: "Check test suites"
+      os: linux
+      dist: trusty
+      install: skip
+      jdk: openjdk8
+      script: mvn test -Pcheck-test-suites
+      before_cache: rm -rfv $HOME/.m2/repository/org/apache/ignite
+      cache: { directories: [ $HOME/.m2/repository ] }
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index a3b63bd..8678fa3 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -196,6 +196,23 @@ To run tests locally use:
 
 For example, %TEST_PATTERN% can be 'org.apache.ignite.testsuites.IgniteBasicTestSuite' or 'GridCacheLocalAtomicFullApiSelfTest#testGet'
 
+Test suites
+=========
+All unit tests must be included in any test suite. Travis runs a check for that. To check it locally run for the root project:
+
+        mvn test -Pcheck-test-suites
+
+If you want to check a single module only:
+
+1) Add ignite-tools dependency to the test scope of the module.
+
+2) Install ignite-tools with command:
+
+    mvn install -Pcheck-test-suites
+
+3) Run tests in the module:
+
+    mvn test
 
 Apache RAT Instructions
 =======================
diff --git a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
index 85479ae..f5cbf0c 100644
--- a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
@@ -28,12 +28,14 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.testframework.GridTestClassLoader;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  *
  */
 @SuppressWarnings({"ProhibitedExceptionDeclared"})
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13723")
 @GridCommonTest(group = "P2P")
 public class P2PGridifySelfTest extends GridCommonAbstractTest {
     /** Current deployment mode. Used in {@link #getConfiguration(String)}. */
diff --git a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
index 5603b63..abf9879 100644
--- a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
+++ b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java
@@ -22,6 +22,8 @@ import org.apache.ignite.gridify.GridifySetToXXXNonSpringAopSelfTest;
 import org.apache.ignite.gridify.GridifySetToXXXSpringAopSelfTest;
 import org.apache.ignite.gridify.NonSpringAopSelfTest;
 import org.apache.ignite.gridify.SpringAopSelfTest;
+import org.apache.ignite.gridify.hierarchy.GridifyHierarchyTest;
+import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshallerAopTest;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.tools.junit.JUnitTeamcityReporter;
 import org.junit.BeforeClass;
@@ -44,6 +46,9 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP
     GridifySetToXXXSpringAopSelfTest.class,
     GridifySetToXXXNonSpringAopSelfTest.class,
     ExternalNonSpringAopSelfTest.class,
+
+    OptimizedMarshallerAopTest.class,
+    GridifyHierarchyTest.class
 })
 public class IgniteAopSelfTestSuite {
     /** */
diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
index 449d2ec..b6d4de9 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
@@ -31,11 +31,14 @@ import org.apache.ignite.testframework.config.GridTestProperties;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
 import org.apache.log4j.Level;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Single split load test.
  */
+// Load test.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13728")
 @GridCommonTest(group = "Load Test")
 public class SingleSplitsLoadTest extends GridCommonAbstractTest {
     /** */
diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
index 2493e73..05cc63e 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
@@ -31,11 +31,14 @@ import org.apache.ignite.testframework.config.GridTestProperties;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
 import org.apache.log4j.Level;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Gridify single split load test.
  */
+// Load test.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13728")
 @GridCommonTest(group = "Load Test")
 public class GridifySingleSplitLoadTest extends GridCommonAbstractTest {
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java b/modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/SerializerSuite.java
similarity index 75%
copy from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java
copy to modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/SerializerSuite.java
index f71a4e3..b6f5e07 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java
+++ b/modules/cassandra/serializers/src/test/java/org/apache/ignite/tests/SerializerSuite.java
@@ -13,14 +13,17 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package org.apache.ignite.internal.processors.cache.expiry;
+package org.apache.ignite.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-public class IgniteCacheAtomicOnheapExpiryPolicyTest extends IgniteCacheAtomicExpiryPolicyTest {
-    /** {@inheritDoc} */
-    @Override protected boolean onheapCacheEnabled() {
-        return true;
-    }
+/**
+ * Suite contains serializers tests.
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses(KryoSerializerTest.class)
+public class SerializerSuite {
 }
diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
index dfbac60..632d93b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.processors.rest.client.message.GridClientCache
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.marshaller.MarshallerUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.CAS;
@@ -38,6 +39,8 @@ import static org.apache.ignite.internal.processors.rest.client.message.GridClie
 /**
  * Tests basic performance of marshallers.
  */
+// Benchmark.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13728")
 public class ClientMarshallerBenchmarkTest extends GridCommonAbstractTest {
     /** Marshallers to test. */
     private GridClientMarshaller[] marshallers;
diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
index 2396658..cdcac12 100644
--- a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientTcpSslLoadTest.java
@@ -20,11 +20,14 @@ package org.apache.ignite.loadtests.client;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.client.ClientTcpSslMultiThreadedSelfTest;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Makes a long run to ensure stability and absence of memory leaks.
  */
+// Load test.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13728")
 public class ClientTcpSslLoadTest extends ClientTcpSslMultiThreadedSelfTest {
     /** Test duration. */
     private static final long TEST_RUN_TIME = 8 * 60 * 60 * 1000;
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java
index 3345d7b..d0504ef 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePKIndexesMigrationToUnwrapPkTest.java
@@ -32,11 +32,13 @@ import org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfT
 import org.apache.ignite.lang.IgniteInClosure;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.jetbrains.annotations.NotNull;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Test to check that starting node with PK index of the old format present doesn't break anything.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13723")
 public class IgnitePKIndexesMigrationToUnwrapPkTest extends IgnitePersistenceCompatibilityAbstractTest {
     /** */
     private static String TABLE_NAME = "TEST_IDX_TABLE";
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java
index 59d5893..aacb1f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java
@@ -64,12 +64,15 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Simple benchmarks, compatibility test and distribution check utils for affinity functions.
  * Needs to check changes at the {@link RendezvousAffinityFunction}.
  */
+// Benchmark.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13728")
 public class RendezvousAffinityFunctionSimpleBenchmark extends GridCommonAbstractTest {
     /** MAC prefix. */
     private static final String MAC_PREF = "MAC";
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
index 5cab6dd..9902d03 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
@@ -34,11 +34,15 @@ import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Test for value copy in entry processor.
  */
+// Test fails due to incorrect handling of CacheConfiguration#getCopyOnRead() and
+// CacheObjectContext#storeValue() properties. Heap storage should be redesigned in this ticket.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-10420")
 public class CacheEntryProcessorCopySelfTest extends GridCommonAbstractTest {
     /** Old value. */
     private static final int OLD_VAL = 100;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index b8184a8..9fa5f8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.resources.JobContextResource;
 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.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -43,6 +44,8 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Affinity routing tests.
  */
+// Test have a special version for Binary Marshaller.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
     /** */
     private static final int GRID_CNT = 4;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index 168fced..8355335 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.marshaller.MarshallerContext;
 import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.testframework.MvccFeatureChecker;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -47,6 +48,8 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  *
  */
+// Test have a special version for Binary Marshaller.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
     /** Null reference size (optimized marshaller writes one byte for null reference). */
     private static final int NULL_REF_SIZE = 1;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
index dd750b4..ba55d0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -35,6 +36,8 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  * Test cases for multi-threaded tests.
  */
+// Tests that are not ready to be used with BinaryMarshaller.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
     /** Grid. */
     private IgniteKernal grid;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
index 8de49de..98a76c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
@@ -40,7 +40,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  * Nested transaction emulation.
  */
-public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest {
+public abstract class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest {
     /** Counter key. */
     private static final String CNTR_KEY = "CNTR_KEY";
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAtomicSelfTest.java
index 1301f16..7f8b5b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAtomicSelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -26,6 +27,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  * Tests {@link org.apache.ignite.cache.CacheInterceptor}.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheOnCopyFlagAtomicSelfTest extends GridCacheOnCopyFlagAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode cacheMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagLocalSelfTest.java
index 3d9619b..03dfd75 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagLocalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagLocalSelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -26,6 +27,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
 /**
  * Tests {@link org.apache.ignite.cache.CacheInterceptor}.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheOnCopyFlagLocalSelfTest extends GridCacheOnCopyFlagAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode cacheMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagReplicatedSelfTest.java
index 49a5b25..9a7e4f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagReplicatedSelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -26,6 +27,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
 /**
  * Tests {@link org.apache.ignite.cache.CacheInterceptor}.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheOnCopyFlagReplicatedSelfTest extends GridCacheOnCopyFlagAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode cacheMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagTxPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagTxPartitionedSelfTest.java
index d73128d..29e4e1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagTxPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagTxPartitionedSelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -26,6 +27,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 /**
  * Tests {@link org.apache.ignite.cache.CacheInterceptor}.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheOnCopyFlagTxPartitionedSelfTest extends GridCacheOnCopyFlagAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode cacheMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
index 12530ed..764f46f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
@@ -34,6 +34,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -46,6 +47,7 @@ import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-10420")
 public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
     /** Test p2p value. */
     private static final String TEST_VALUE = "org.apache.ignite.tests.p2p.GridCacheDeploymentTestValue3";
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
index 9be8721..8fbf424 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerEvictionSelfTest.java
@@ -30,11 +30,13 @@ import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.testframework.MvccFeatureChecker;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * TTL manager eviction self test.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-10420")
 public class GridCacheTtlManagerEvictionSelfTest extends GridCommonAbstractTest {
     /** */
     private static final int ENTRIES_TO_PUT = 10_100;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
index d3d5159..36ba4a3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInterceptorSelfTestSuite.java
@@ -62,11 +62,10 @@ public class IgniteCacheInterceptorSelfTestSuite {
         GridTestUtils.addTestIfNeeded(suite, GridCacheInterceptorReplicatedSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheInterceptorReplicatedWithStoreSelfTest.class, ignoredTests);
 
-// TODO GG-11141.
-//        GridTestUtils.addTestIfNeeded(suite, GridCacheOnCopyFlagTxPartitionedSelfTest.class, ignoredTests);
-//        GridTestUtils.addTestIfNeeded(suite, GridCacheOnCopyFlagReplicatedSelfTest.class, ignoredTests);
-//        GridTestUtils.addTestIfNeeded(suite, GridCacheOnCopyFlagLocalSelfTest.class, ignoredTests);
-//        GridTestUtils.addTestIfNeeded(suite, GridCacheOnCopyFlagAtomicSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheOnCopyFlagTxPartitionedSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheOnCopyFlagReplicatedSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheOnCopyFlagLocalSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheOnCopyFlagAtomicSelfTest.class, ignoredTests);
 
         GridTestUtils.addTestIfNeeded(suite, CacheInterceptorPartitionCounterRandomOperationsTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, CacheInterceptorPartitionCounterLocalSanityTest.class, ignoredTests);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
index 8a13ddc..9d48b21 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
@@ -37,11 +37,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.Ignore;
 import org.junit.Test;
 
 /**
  *
  */
+// Now it takes too long.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-6753, https://issues.apache.org/jira/browse/IGNITE-9218")
 public class IgniteOutOfMemoryPropagationTest extends GridCommonAbstractTest {
     /** */
     public static final int NODES = 3;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.java
index 13d545c..4a9f268 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.java
@@ -17,6 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.binary.distributed.dht;
 
+import org.junit.Ignore;
+
+/**
+ * Test for binary objects stored in cache with enabled on-heap cache.
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest extends GridCacheBinaryObjectsAtomicNearDisabledSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicOnheapSelfTest.java
index a58dbca..f95aa23 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicOnheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicOnheapSelfTest.java
@@ -17,6 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.binary.distributed.dht;
 
+import org.junit.Ignore;
+
+/**
+ * Test for binary objects stored in cache with enabled on-heap cacheg.
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheBinaryObjectsAtomicOnheapSelfTest extends GridCacheBinaryObjectsAtomicSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.java
index 2ac56f7..cb4e1b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.java
@@ -17,6 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.binary.distributed.dht;
 
+import org.junit.Ignore;
+
+/**
+ * Test for binary objects stored in cache with enabled on-heap cache.
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest extends GridCacheBinaryObjectsPartitionedNearDisabledSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedOnheapSelfTest.java
index 6f4c609..9463bbd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedOnheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedOnheapSelfTest.java
@@ -17,6 +17,12 @@
 
 package org.apache.ignite.internal.processors.cache.binary.distributed.dht;
 
+import org.junit.Ignore;
+
+/**
+ * Test for binary objects stored in cache with enabled on-heap cache.
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheBinaryObjectsPartitionedOnheapSelfTest extends GridCacheBinaryObjectsPartitionedSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java
index bb44a4d..47dbb84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java
@@ -18,6 +18,12 @@
 
 package org.apache.ignite.internal.processors.cache.binary.local;
 
+import org.junit.Ignore;
+
+/**
+ * Test for binary objects stored in cache with enabled on-heap cache.
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheBinaryObjectsLocalOnheapSelfTest extends GridCacheBinaryObjectsLocalSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructuresNoClassOnServerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructuresNoClassOnServerTest.java
index 9808107..06abb02 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructuresNoClassOnServerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructuresNoClassOnServerTest.java
@@ -18,10 +18,12 @@
 package org.apache.ignite.internal.processors.cache.datastructures;
 
 import org.apache.ignite.internal.processors.cache.distributed.IgniteNoClassOnServerAbstractTest;
+import org.junit.Ignore;
 
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class IgniteDataStructuresNoClassOnServerTest extends IgniteNoClassOnServerAbstractTest {
     /** {@inheritDoc} */
     @Override protected String clientClassName() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java
index 3b8e35a..9e9facc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicReferenceMultiNodeTest.java
@@ -20,12 +20,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.configuration.AtomicConfiguration;
 import org.apache.ignite.internal.processors.cache.datastructures.GridCacheAtomicReferenceMultiNodeAbstractTest;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  *  AtomicReference and AtomicStamped multi node tests.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCachePartitionedAtomicReferenceMultiNodeTest extends GridCacheAtomicReferenceMultiNodeAbstractTest {
     /** {@inheritDoc} */
     @Override protected CacheMode atomicsCacheMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedLockSelfTest.java
index 787f1e3..1b9005a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedLockSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.partitioned;
 
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteLockAbstractSelfTest;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-3141, https://issues.apache.org/jira/browse/IGNITE-9214")
 public class IgnitePartitionedLockSelfTest extends IgniteLockAbstractSelfTest {
     /** {@inheritDoc} */
     @Override protected CacheMode atomicsCacheMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java
index ce0bcd32..e772cfd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedAtomicReferenceMultiNodeTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.datastructures.replicated;
 
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.internal.processors.cache.datastructures.GridCacheAtomicReferenceMultiNodeAbstractTest;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
  * AtomicReference and AtomicStamped tests with replicated cache.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridCacheReplicatedAtomicReferenceMultiNodeTest extends GridCacheAtomicReferenceMultiNodeAbstractTest {
     /** {@inheritDoc} */
     @Override protected CacheMode atomicsCacheMode() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
index b87e9f0..7b9244a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheClientsConcurrentStartTest.java
@@ -44,6 +44,7 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -52,6 +53,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class CacheClientsConcurrentStartTest extends GridCommonAbstractTest {
     /** */
     private static final int SRV_CNT = 4;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverTest.java
similarity index 99%
rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
rename to modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverTest.java
index ec48359..bf3f493 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverTest.java
@@ -58,6 +58,7 @@ 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.apache.ignite.transactions.Transaction;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -69,7 +70,8 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Base test for all multithreaded cache scenarios w/ and w/o failover.
  */
-public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstractTest {
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13723")
+public class GridCacheMultithreadedFailoverTest extends GridCommonAbstractTest {
     /** Node name prefix. */
     private static final String NODE_PREFIX = "node";
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
index 9b17d87..89b36ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -47,6 +48,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-4768, https://issues.apache.org/jira/browse/IGNITE-9214")
 public class IgniteBinaryMetadataUpdateNodeRestartTest extends GridCommonAbstractTest {
     /** */
     private static final String ATOMIC_CACHE = "atomicCache";
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
index 50751df..bbeefd9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -46,6 +47,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class IgniteCacheClientMultiNodeUpdateTopologyLockTest extends GridCommonAbstractTest {
     /** */
     private static final String TEST_CACHE = "testCache";
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
index 0e2b038..6f07270 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
@@ -39,7 +39,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 /**
  * Simple cache test.
  */
-public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
+public abstract class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
     /** Random number generator. */
     private static final Random RAND = new Random();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemoveTest.java
similarity index 98%
rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
rename to modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemoveTest.java
index f8597556..f917da3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemoveTest.java
@@ -38,7 +38,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  *
  */
-public class IgniteCacheConcurrentPutGetRemove extends GridCommonAbstractTest {
+public class IgniteCacheConcurrentPutGetRemoveTest extends GridCommonAbstractTest {
     /** */
     private static final int NODES = 4;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
index d543d07..3c5c9c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPreloadSelfTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -45,6 +46,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
 /**
  * Simple test for preloading in ATOMIC cache.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class GridCacheAtomicPreloadSelfTest extends GridCommonAbstractTest {
     /** */
     private boolean nearEnabled;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
index 64ff911..e98cb9d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
@@ -59,6 +59,7 @@ import org.apache.ignite.services.ServiceConfiguration;
 import org.apache.ignite.services.ServiceContext;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -103,6 +104,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
  *     </li>
  * </ol>
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
     /** {@link Random} for test key generation. */
     private static final Random RANDOM = new Random();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
index 09f02c4..8273c70 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMarshallerTxTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.processors.cache.GridCacheMarshallerTxAbstractTest;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -27,6 +28,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Test transaction with wrong marshalling.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class GridCacheReplicatedMarshallerTxTest extends GridCacheMarshallerTxAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapFullApiSelfTest.java
index 4280277..9f144b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapFullApiSelfTest.java
@@ -18,6 +18,12 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.replicated;
 
+import org.junit.Ignore;
+
+/**
+ * Tests for replicated cache with enabled on-heap cache.
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class GridCacheReplicatedOnheapFullApiSelfTest extends GridCacheReplicatedFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.java
index cd04b58..c7c239f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.java
@@ -18,6 +18,12 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.replicated;
 
+import org.junit.Ignore;
+
+/**
+ * Multi-nodes tests for replicated cache with enabled on-heap cache.
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class GridCacheReplicatedOnheapMultiNodeFullApiSelfTest extends GridCacheReplicatedMultiNodeFullApiSelfTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
index cbc58c3..4881f0b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.processors.cache.IgniteTxConcurrentGetAbstractTest;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -27,6 +28,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 /**
  * Checks multithreaded put/get replicated cache operations on one node.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class GridCacheReplicatedTxConcurrentGetTest extends IgniteTxConcurrentGetAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxReadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxReadTest.java
index 0b168f8..20bf8a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxReadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxReadTest.java
@@ -19,10 +19,12 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated;
 
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.internal.processors.cache.GridCacheAbstractTxReadTest;
+import org.junit.Ignore;
 
 /**
  * Checks transactional reads for local cache.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9218")
 public class GridCacheReplicatedTxReadTest extends GridCacheAbstractTxReadTest {
     /**
      * @return {@code LOCAL} for this test.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java
index 2f3bf2d..a12d508 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalExpiryPolicyTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.expiry;
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -27,6 +28,8 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
 /**
  *
  */
+// Test have a special version for Binary Marshaller.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class IgniteCacheAtomicLocalExpiryPolicyTest extends IgniteCacheExpiryPolicyAbstractTest {
     /** {@inheritDoc} */
     @Override protected int gridCount() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalOnheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalOnheapExpiryPolicyTest.java
index af178e51..90aca1c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalOnheapExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicLocalOnheapExpiryPolicyTest.java
@@ -18,6 +18,12 @@
 
 package org.apache.ignite.internal.processors.cache.expiry;
 
+import org.junit.Ignore;
+
+/**
+ *
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class IgniteCacheAtomicLocalOnheapExpiryPolicyTest extends IgniteCacheAtomicLocalExpiryPolicyTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java
index f71a4e3..59e370f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicOnheapExpiryPolicyTest.java
@@ -18,6 +18,12 @@
 
 package org.apache.ignite.internal.processors.cache.expiry;
 
+import org.junit.Ignore;
+
+/**
+ *
+ */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class IgniteCacheAtomicOnheapExpiryPolicyTest extends IgniteCacheAtomicExpiryPolicyTest {
     /** {@inheritDoc} */
     @Override protected boolean onheapCacheEnabled() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java
index b54c26d..d361991 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyTestSuite.java
@@ -32,9 +32,9 @@ import org.junit.runners.Suite;
     IgniteCacheLargeValueExpireTest.class,
 
     IgniteCacheAtomicLocalExpiryPolicyTest.class,
-    //IgniteCacheAtomicLocalOnheapExpiryPolicyTest.class,
+    IgniteCacheAtomicLocalOnheapExpiryPolicyTest.class,
     IgniteCacheAtomicExpiryPolicyTest.class,
-    //IgniteCacheAtomicOnheapExpiryPolicyTest.class,
+    IgniteCacheAtomicOnheapExpiryPolicyTest.class,
     IgniteCacheAtomicWithStoreExpiryPolicyTest.class,
     IgniteCacheAtomicReplicatedExpiryPolicyTest.class,
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
index f6ba354..4acaec7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
@@ -26,11 +26,13 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.processors.cache.distributed.CachePutAllFailoverAbstractTest;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Ignore;
 
 /**
  * Failover cache test with putAll operations executed with presence of BaselineTopology
  * when one random node from BLT is constantly restarted during the load.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class IgniteStableBaselineCachePutAllFailoverTest extends CachePutAllFailoverAbstractTest {
     /** */
     private static final int GRIDS_COUNT = 3;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
index eda485d..de92749 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Ignore;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -40,6 +41,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
  * Failover cache test with remove operations executed with presence of BaselineTopology
  * when one random node from BLT is constantly restarted during the load.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class IgniteStableBaselineCacheRemoveFailoverTest extends GridCacheAbstractRemoveFailureTest {
     /** */
     private static final int GRIDS_COUNT = 3;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java
index 225ff0d..f74850f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java
@@ -57,6 +57,7 @@ import org.apache.ignite.testframework.GridStringLogger;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
@@ -65,6 +66,8 @@ import static org.apache.ignite.internal.processors.cache.persistence.file.FileP
  * Sandbox test to measure progress of grid write operations. If no progress occur during period of time, then thread
  * dumps are generated.
  */
+// Benchmark.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13728")
 public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest {
     /** Cache name. Random to cover external stores possible problems. */
     public static final String CACHE_NAME = "partitioned" + new Random().nextInt(10000000);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionAfterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionAfterRestartTest.java
index a984a17..6e65e1a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionAfterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionAfterRestartTest.java
@@ -40,11 +40,13 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.events.EventType.EVT_WAL_SEGMENT_COMPACTED;
 
 /** */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13723")
 public class WalCompactionAfterRestartTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String name) throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerTestSuit.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerTestSuit.java
index f905281..1bdb56b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerTestSuit.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/diagnostic/pagelocktracker/PageLockTrackerTestSuit.java
@@ -37,6 +37,7 @@ import org.junit.runners.Suite;
     OffHeapLockLogTest.class,
     HeapArrayLockStackTest.class,
     OffHeapLockStackTest.class,
+    PageLockTrackerMXBeanImplTest.class
 })
 
 public class PageLockTrackerTestSuit {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
index 753f741..22fdd87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
@@ -23,11 +23,13 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
 import org.apache.ignite.internal.util.typedef.F;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9081")
 public class IgniteChangeGlobalStateCacheTest extends IgniteChangeGlobalStateAbstractTest {
     /**
      *
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
index 7ff9779..6b7540d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.testframework.GridTestUtils.runAsync;
@@ -34,6 +35,7 @@ import static org.apache.ignite.testframework.GridTestUtils.runAsync;
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9081")
 public class IgniteChangeGlobalStateDataStructureTest extends IgniteChangeGlobalStateAbstractTest {
     /**
      * @throws Exception If failed.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
index fcb74de..58940b5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
@@ -31,6 +31,7 @@ import org.junit.Test;
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9081")
 public class IgniteChangeGlobalStateServiceTest extends IgniteChangeGlobalStateAbstractTest {
     /** {@inheritDoc} */
     @Override protected int backUpClientNodes() {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
index 00bb5ca..81ad5b5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
@@ -40,6 +40,7 @@ import static org.apache.ignite.testframework.GridTestUtils.runAsync;
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9081")
 public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstractTest {
     /**
      * @throws Exception if fail.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
index d8ef809..4307fd4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
@@ -34,10 +34,12 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 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.junit.Ignore;
 
 /**
  *
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-9214")
 public class GridActivateExtensionTest extends GridCacheAbstractFullApiSelfTest {
     /** Condition id. */
     private int condId;
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
index 967992d..672934a 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
@@ -44,6 +44,7 @@ import org.apache.ignite.spi.communication.CommunicationSpi;
 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.Ignore;
 import org.junit.Test;
 
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL;
@@ -51,6 +52,8 @@ import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUB
 /**
  *
  */
+// Benchmark.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13728")
 public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
     /** */
     public static final int CONCUR_MSGS = 10 * 1024;
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLogTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLogTest.java
index eb38738..1642384 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLogTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiLogTest.java
@@ -37,11 +37,13 @@ import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.ListeningTestLogger;
 import org.apache.ignite.testframework.LogListener;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Class for {@link TcpCommunicationSpi} logging tests.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13723")
 public class GridTcpCommunicationSpiLogTest extends GridCommonAbstractTest {
     /** Listener log messages. */
     private static ListeningTestLogger srvTestLog;
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 0e1ce96..2fcfbe0 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -19,6 +19,7 @@ package org.apache.ignite.testsuites;
 
 import org.apache.ignite.ClassPathContentLoggingTest;
 import org.apache.ignite.GridSuppressedExceptionSelfTest;
+import org.apache.ignite.cache.RemoveAllDeadlockTest;
 import org.apache.ignite.events.ClusterActivationStartedEventTest;
 import org.apache.ignite.failure.ExchangeWorkerWaitingForTaskTest;
 import org.apache.ignite.failure.FailureHandlerTriggeredTest;
@@ -65,7 +66,9 @@ import org.apache.ignite.internal.processors.affinity.GridAffinityProcessorRende
 import org.apache.ignite.internal.processors.affinity.GridHistoryAffinityAssignmentTest;
 import org.apache.ignite.internal.processors.affinity.GridHistoryAffinityAssignmentTestNoOptimization;
 import org.apache.ignite.internal.processors.cache.CacheLocalGetSerializationTest;
+import org.apache.ignite.internal.processors.cache.CacheLockCandidatesThreadTest;
 import org.apache.ignite.internal.processors.cache.GridLocalIgniteSerializationTest;
+import org.apache.ignite.internal.processors.cache.GridLongRunningInitNewCrdFutureDiagnosticsTest;
 import org.apache.ignite.internal.processors.cache.GridProjectionForCachesOnDaemonNodeSelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteDaemonNodeMarshallerCacheTest;
 import org.apache.ignite.internal.processors.cache.IgniteMarshallerCacheClassNameConflictTest;
@@ -259,6 +262,7 @@ import org.junit.runners.Suite;
     RebalanceWithDifferentThreadPoolSizeTest.class,
 
     ListeningTestLoggerTest.class,
+    GridLongRunningInitNewCrdFutureDiagnosticsTest.class,
 
     MessageOrderLogListenerTest.class,
 
@@ -300,6 +304,10 @@ import org.junit.runners.Suite;
     IgniteThreadGroupNodeRestartTest.class,
 
     LinkMapTest.class,
+
+    // Other tests
+    CacheLockCandidatesThreadTest.class,
+    RemoveAllDeadlockTest.class
 })
 public class IgniteBasicTestSuite {
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java
index 2f1ba8f..25a8f8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java
@@ -23,6 +23,7 @@ import org.apache.ignite.failure.SystemWorkersBlockingTest;
 import org.apache.ignite.failure.SystemWorkersTerminationTest;
 import org.apache.ignite.internal.ClusterBaselineNodesMetricsSelfTest;
 import org.apache.ignite.internal.GridNodeMetricsLogPdsSelfTest;
+import org.apache.ignite.internal.cluster.FullyConnectedComponentSearcherTest;
 import org.apache.ignite.internal.cluster.IgniteClusterIdTagTest;
 import org.apache.ignite.internal.encryption.CacheGroupKeyChangeTest;
 import org.apache.ignite.internal.encryption.CacheGroupReencryptionTest;
@@ -37,10 +38,12 @@ import org.apache.ignite.internal.encryption.EncryptionMXBeanTest;
 import org.apache.ignite.internal.encryption.MasterKeyChangeConsistencyCheckTest;
 import org.apache.ignite.internal.encryption.MasterKeyChangeTest;
 import org.apache.ignite.internal.processors.cache.persistence.CheckpointReadLockFailureTest;
+import org.apache.ignite.internal.processors.cache.persistence.CommonPoolStarvationCheckpointTest;
 import org.apache.ignite.internal.processors.cache.persistence.SingleNodePersistenceSslTest;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotSelfTest;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotMXBeanTest;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManagerSelfTest;
+import org.apache.ignite.internal.processors.performancestatistics.CacheStartTest;
 import org.apache.ignite.internal.processors.performancestatistics.ForwardReadTest;
 import org.apache.ignite.internal.processors.performancestatistics.PerformanceStatisticsMultipleStartTest;
 import org.apache.ignite.internal.processors.performancestatistics.PerformanceStatisticsPropertiesTest;
@@ -65,6 +68,7 @@ import org.junit.runners.Suite;
     FailureHandlingConfigurationTest.class,
     SystemWorkersBlockingTest.class,
     CheckpointReadLockFailureTest.class,
+    CommonPoolStarvationCheckpointTest.class,
 
     GridInternalTaskUnusedWalSegmentsTest.class,
 
@@ -93,6 +97,7 @@ import org.junit.runners.Suite;
     IgniteSnapshotMXBeanTest.class,
 
     IgniteClusterIdTagTest.class,
+    FullyConnectedComponentSearcherTest.class,
 
     PerformanceStatisticsSelfTest.class,
     PerformanceStatisticsThinClientTest.class,
@@ -101,7 +106,8 @@ import org.junit.runners.Suite;
     StringCacheTest.class,
     PerformanceStatisticsPropertiesTest.class,
     PerformanceStatisticsMultipleStartTest.class,
-    ForwardReadTest.class
+    ForwardReadTest.class,
+    CacheStartTest.class
 })
 public class IgniteBasicWithPersistenceTestSuite {
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
index a102526..15881cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
@@ -58,15 +58,15 @@ public class IgniteBinaryCacheTestSuite {
      * @return Test suite.
      */
     public static List<Class<?>> suite(Collection<Class> ignoredTests) {
+        List<Class<?>> suite = new ArrayList<>(IgniteCacheTestSuite.suite(ignoredTests));
+
         // Tests below have a special version for Binary Marshaller
-        ignoredTests.add(GridCacheAffinityRoutingSelfTest.class);
-        ignoredTests.add(IgniteCacheAtomicLocalExpiryPolicyTest.class);
-        ignoredTests.add(GridCacheEntryMemorySizeSelfTest.class);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheAffinityRoutingSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, IgniteCacheAtomicLocalExpiryPolicyTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheEntryMemorySizeSelfTest.class, ignoredTests);
 
         // Tests that are not ready to be used with BinaryMarshaller
-        ignoredTests.add(GridCacheMvccSelfTest.class);
-
-        List<Class<?>> suite = new ArrayList<>(IgniteCacheTestSuite.suite(ignoredTests));
+        GridTestUtils.addTestIfNeeded(suite, GridCacheMvccSelfTest.class, ignoredTests);
 
         GridTestUtils.addTestIfNeeded(suite, GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheBinariesNearPartitionedByteArrayValuesSelfTest.class, ignoredTests);
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index e049c09..d882f24 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -72,12 +72,17 @@ import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreBi
 import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreObjectsSelfTest;
 import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataMultinodeTest;
 import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataTest;
+import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest;
 import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledSelfTest;
+import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicOnheapSelfTest;
 import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicSelfTest;
+import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest;
 import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledSelfTest;
+import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedOnheapSelfTest;
 import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedSelfTest;
 import org.apache.ignite.internal.processors.cache.binary.distributed.replicated.GridCacheBinaryObjectsReplicatedSelfTest;
 import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsAtomicLocalSelfTest;
+import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalOnheapSelfTest;
 import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteBinaryMetadataUpdateChangingTopologySelfTest;
 import org.junit.runner.RunWith;
@@ -134,17 +139,17 @@ import org.junit.runners.Suite;
     BinaryFooterOffsetsOffheapNonCompactSelfTest.class,
 
     GridCacheBinaryObjectsLocalSelfTest.class,
-    //GridCacheBinaryObjectsLocalOnheapSelfTest.class,
+    GridCacheBinaryObjectsLocalOnheapSelfTest.class,
     GridCacheBinaryObjectsAtomicLocalSelfTest.class,
     GridCacheBinaryObjectsReplicatedSelfTest.class,
     GridCacheBinaryObjectsPartitionedSelfTest.class,
     GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.class,
-    //GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.class,
-    //GridCacheBinaryObjectsPartitionedOnheapSelfTest.class,
+    GridCacheBinaryObjectsPartitionedNearDisabledOnheapSelfTest.class,
+    GridCacheBinaryObjectsPartitionedOnheapSelfTest.class,
     GridCacheBinaryObjectsAtomicSelfTest.class,
-    //GridCacheBinaryObjectsAtomicOnheapSelfTest.class,
+    GridCacheBinaryObjectsAtomicOnheapSelfTest.class,
     GridCacheBinaryObjectsAtomicNearDisabledSelfTest.class,
-    //GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.class,
+    GridCacheBinaryObjectsAtomicNearDisabledOnheapSelfTest.class,
 
     GridCacheBinaryStoreObjectsSelfTest.class,
     GridCacheBinaryStoreBinariesDefaultMappersSelfTest.class,
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 4a1abc1..dc0810d 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -38,6 +38,7 @@ import org.apache.ignite.internal.processors.cache.datastructures.IgniteCountDow
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureUniqueNameTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureWithJobTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructuresCreateDeniedInClusterReadOnlyMode;
+import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructuresNoClassOnServerTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteQueueClusterReadOnlyTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteSequenceInternalCleanupTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteSetClusterReadOnlyTest;
@@ -59,6 +60,7 @@ import org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueMultiNodeSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueRotativeMultiNodeTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicReferenceApiSelfTest;
+import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicReferenceMultiNodeTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicSequenceMultiThreadedTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicSequenceTxSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicSetFailoverSelfTest;
@@ -81,10 +83,12 @@ import org.apache.ignite.internal.processors.cache.datastructures.partitioned.Gr
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetWithNodeFilterSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedAtomicLongApiSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedCountDownLatchSelfTest;
+import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedLockSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedQueueNoBackupsTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSemaphoreSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.partitioned.IgnitePartitionedSetNoBackupsSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicReferenceApiSelfTest;
+import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicReferenceMultiNodeTest;
 import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedAtomicStampedApiSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedDataStructuresFailoverSelfTest;
 import org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedQueueApiSelfTest;
@@ -157,8 +161,7 @@ import org.junit.runners.Suite;
     IgnitePartitionedSemaphoreSelfTest.class,
     SemaphoreFailoverSafeReleasePermitsTest.class,
     SemaphoreFailoverNoWaitingAcquirerTest.class,
-    // TODO IGNITE-3141, enabled when fixed.
-    // suite.addTest(new JUnit4TestAdapter(IgnitePartitionedLockSelfTest.class,
+    IgnitePartitionedLockSelfTest.class,
 
     GridCachePartitionedSetFailoverSelfTest.class,
     GridCachePartitionedAtomicSetFailoverSelfTest.class,
@@ -185,14 +188,14 @@ import org.junit.runners.Suite;
     GridCachePartitionedAtomicReferenceApiSelfTest.class,
     GridCacheReplicatedAtomicReferenceApiSelfTest.class,
 
-    //suite.addTest(new JUnit4TestAdapter(GridCachePartitionedAtomicReferenceMultiNodeTest.class,
-    //suite.addTest(new JUnit4TestAdapter(GridCacheReplicatedAtomicReferenceMultiNodeTest.class,
+    GridCachePartitionedAtomicReferenceMultiNodeTest.class,
+    GridCacheReplicatedAtomicReferenceMultiNodeTest.class,
 
     GridCachePartitionedNodeRestartTxSelfTest.class,
     GridCachePartitionedQueueJoinedNodeSelfTest.class,
 
     IgniteDataStructureUniqueNameTest.class,
-    //suite.addTest(new JUnit4TestAdapter(IgniteDataStructuresNoClassOnServerTest.class,
+    IgniteDataStructuresNoClassOnServerTest.class,
 
     IgniteClientDataStructuresTest.class,
     IgniteClientDiscoveryDataStructuresTest.class,
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
index 6d965f1..b8514bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite2.java
@@ -30,6 +30,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedFailoverSelfTest;
 import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteChangingBaselineDownCachePutAllFailoverTest;
 import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteChangingBaselineUpCachePutAllFailoverTest;
+import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteStableBaselineCachePutAllFailoverTest;
+import org.apache.ignite.internal.processors.cache.persistence.baseline.IgniteStableBaselineCacheRemoveFailoverTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -52,8 +54,8 @@ import org.junit.runners.Suite;
 
     CachePutAllFailoverAtomicTest.class,
     CachePutAllFailoverTxTest.class,
-    //suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineCachePutAllFailoverTest.class,
-    //suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineCacheRemoveFailoverTest.class,
+    IgniteStableBaselineCachePutAllFailoverTest.class,
+    IgniteStableBaselineCacheRemoveFailoverTest.class,
     IgniteChangingBaselineDownCachePutAllFailoverTest.class,
     IgniteChangingBaselineUpCachePutAllFailoverTest.class
 })
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
index f5065a5..67142a9 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java
@@ -82,6 +82,7 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicWit
 import org.apache.ignite.internal.processors.cache.local.GridCacheLocalFullApiMultithreadedSelfTest;
 import org.apache.ignite.internal.processors.cache.local.GridCacheLocalFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.local.GridCacheLocalWithGroupFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.persistence.standbycluster.extended.GridActivateExtensionTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -175,7 +176,7 @@ import org.junit.runners.Suite;
     IgniteNearCacheInvokeClusterReadOnlyModeSelfTest.class,
     IgniteCacheStoreClusterReadOnlyModeSelfTest.class,
 
-    //suite.addTest(new JUnit4TestAdapter(GridActivateExtensionTest.class));
+    GridActivateExtensionTest.class
 })
 public class IgniteCacheFullApiSelfTestSuite {
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
index adafe96..38c9185 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.testsuites;
 
+import org.apache.ignite.internal.MemoryLeaksOnRestartNodeTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheCreateRestartSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheNearRestartRollbackSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledOptimisticTxNodeRestartTest;
@@ -39,7 +40,9 @@ import org.junit.runners.Suite;
     IgniteCacheNearRestartRollbackSelfTest.class,
     NearCacheMultithreadedUpdateTest.class,
 
-    IgniteCacheCreateRestartSelfTest.class
+    IgniteCacheCreateRestartSelfTest.class,
+
+    MemoryLeaksOnRestartNodeTest.class
 })
 public class IgniteCacheRestartTestSuite {
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java
index fc73b2b..354c26c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java
@@ -20,6 +20,7 @@ package org.apache.ignite.testsuites;
 import org.apache.ignite.internal.processors.cache.GridCachePutAllFailoverSelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPutAllFailoverSelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteCachePutAllRestartTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteBinaryMetadataUpdateNodeRestartTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheAtomicNodeRestartTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheGetRestartTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheAtomicReplicatedNodeRestartSelfTest;
@@ -38,8 +39,7 @@ import org.junit.runners.Suite;
     IgniteCachePutAllRestartTest.class,
     GridCachePutAllFailoverSelfTest.class,
 
-    // TODO IGNITE-4768.
-    //suite.addTest(new JUnit4TestAdapter(IgniteBinaryMetadataUpdateNodeRestartTest.class,
+    IgniteBinaryMetadataUpdateNodeRestartTest.class,
 
     IgniteCacheGetRestartTest.class
 })
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index d60ef3d..0795fae 100755
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -56,6 +56,7 @@ import org.apache.ignite.internal.processors.cache.CacheAffinityKeyConfiguration
 import org.apache.ignite.internal.processors.cache.CacheAtomicSingleMessageCountSelfTest;
 import org.apache.ignite.internal.processors.cache.CacheDeferredDeleteQueueTest;
 import org.apache.ignite.internal.processors.cache.CacheDeferredDeleteSanitySelfTest;
+import org.apache.ignite.internal.processors.cache.CacheEntryProcessorCopySelfTest;
 import org.apache.ignite.internal.processors.cache.CacheFutureExceptionSelfTest;
 import org.apache.ignite.internal.processors.cache.CachePutEventListenerErrorSelfTest;
 import org.apache.ignite.internal.processors.cache.CacheTxFastFinishTest;
@@ -87,6 +88,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheNearTxStoreException
 import org.apache.ignite.internal.processors.cache.GridCacheObjectToStringSelfTest;
 import org.apache.ignite.internal.processors.cache.GridCacheOffHeapAtomicMultiThreadedUpdateSelfTest;
 import org.apache.ignite.internal.processors.cache.GridCacheOffHeapMultiThreadedUpdateSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheP2PUndeploySelfTest;
 import org.apache.ignite.internal.processors.cache.GridCachePartitionedLocalStoreSelfTest;
 import org.apache.ignite.internal.processors.cache.GridCacheReplicatedLocalStoreSelfTest;
 import org.apache.ignite.internal.processors.cache.GridCacheReplicatedTxStoreExceptionSelfTest;
@@ -95,6 +97,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheReturnValueTransferS
 import org.apache.ignite.internal.processors.cache.GridCacheSlowTxWarnTest;
 import org.apache.ignite.internal.processors.cache.GridCacheStopSelfTest;
 import org.apache.ignite.internal.processors.cache.GridCacheStoreValueBytesSelfTest;
+import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerEvictionSelfTest;
 import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerLoadTest;
 import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerSelfTest;
 import org.apache.ignite.internal.processors.cache.GridCacheTxPartitionedLocalStoreSelfTest;
@@ -161,6 +164,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheGlob
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionsStateValidationTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionsStateValidatorSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionsUpdateCountersAndSizeTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheConcurrentPutGetRemoveTest;
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheGetStoreErrorSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearTxExceptionSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedStorePutSelfTest;
@@ -225,10 +229,7 @@ public class IgniteCacheTestSuite {
         GridTestUtils.addTestIfNeeded(suite, IgniteCrossCacheTxStoreSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheEntryProcessorSequentialCallTest.class, ignoredTests);
 
-        // TODO GG-11148: include test when implemented.
-        // Test fails due to incorrect handling of CacheConfiguration#getCopyOnRead() and
-        // CacheObjectContext#storeValue() properties. Heap storage should be redesigned in this ticket.
-        //GridTestUtils.addTestIfNeeded(suite, CacheEntryProcessorCopySelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, CacheEntryProcessorCopySelfTest.class, ignoredTests);
 
         GridTestUtils.addTestIfNeeded(suite, IgnitePutAllLargeBatchSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgnitePutAllUpdateNonPreloadedPartitionSelfTest.class, ignoredTests);
@@ -256,8 +257,7 @@ public class IgniteCacheTestSuite {
         GridTestUtils.addTestIfNeeded(suite, GridCacheMvccSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheMvccPartitionedSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheMvccManagerSelfTest.class, ignoredTests);
-        // TODO GG-11141.
-        // GridTestUtils.addTestIfNeeded(suite, GridCacheP2PUndeploySelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheP2PUndeploySelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheConfigurationValidationSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheConfigurationConsistencySelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, CacheAffinityKeyConfigurationMismatchTest.class, ignoredTests);
@@ -296,7 +296,7 @@ public class IgniteCacheTestSuite {
         GridTestUtils.addTestIfNeeded(suite, GridCacheAsyncOperationsLimitSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheManyAsyncOperationsTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheTtlManagerSelfTest.class, ignoredTests);
-//        GridTestUtils.addTestIfNeeded(suite, GridCacheTtlManagerEvictionSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheTtlManagerEvictionSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheLifecycleAwareSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheAtomicStopBusySelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheTransactionalStopBusySelfTest.class, ignoredTests);
@@ -331,6 +331,7 @@ public class IgniteCacheTestSuite {
         GridTestUtils.addTestIfNeeded(suite, GridCachePartitionsStateValidatorSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCachePartitionsStateValidationTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCachePartitionsUpdateCountersAndSizeTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, IgniteCacheConcurrentPutGetRemoveTest.class, ignoredTests);
 
         suite.addAll(IgniteCacheTcpClientDiscoveryTestSuite.suite(ignoredTests));
 
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index 1e4f59c..49c7280 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -64,13 +64,18 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEvictionEventSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedGetAndTransformStoreSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedLockSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMarshallerTxTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeLockSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedNodeFailureSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOnheapFullApiSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedOnheapMultiNodeFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedP2PDisabledByteArrayValuesSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedP2PEnabledByteArrayValuesSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedPreloadEventsSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxConcurrentGetTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxMultiThreadedSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxReadTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxSingleThreadedSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxTimeoutSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheSyncReplicatedPreloadSelfTest;
@@ -133,11 +138,11 @@ public class IgniteCacheTestSuite3 {
 
         GridTestUtils.addTestIfNeeded(suite, CacheLockChangingTopologyTest.class, ignoredTests);
 
-        //GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedMarshallerTxTest.class, ignoredTests);
-        //GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedOnheapFullApiSelfTest.class, ignoredTests);
-        //GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.class, ignoredTests);
-        //GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedTxConcurrentGetTest.class, ignoredTests);
-        //GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedTxReadTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedMarshallerTxTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedOnheapFullApiSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedTxConcurrentGetTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedTxReadTest.class, ignoredTests);
 
         GridTestUtils.addTestIfNeeded(suite, CacheStartupInDeploymentModesTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheConditionalDeploymentSelfTest.class, ignoredTests);
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
index d96d929..b1f7823 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
@@ -60,6 +60,7 @@ import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheGroups
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCachePartitionLossPolicySelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheTxIteratorSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.NotMappedPartitionInTxTest;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicPreloadSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCacheAtomicProtocolTest;
 import org.apache.ignite.internal.processors.cache.distributed.rebalancing.CacheManualRebalancingTest;
 import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheSyncRebalanceModeSelfTest;
@@ -149,7 +150,7 @@ public class IgniteCacheTestSuite5 {
         GridTestUtils.addTestIfNeeded(suite, ClientSlowDiscoveryTopologyChangeTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, ClientSlowDiscoveryTransactionRemapTest.class, ignoredTests);
 
-        //GridTestUtils.addTestIfNeeded(suite, GridCacheAtomicPreloadSelfTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheAtomicPreloadSelfTest.class, ignoredTests);
 
         return suite;
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
index 0d6eac0..9fb6c24 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
@@ -24,6 +24,7 @@ import org.apache.ignite.cache.affinity.PendingExchangeTest;
 import org.apache.ignite.internal.processors.cache.CacheIgniteOutOfMemoryExceptionTest;
 import org.apache.ignite.internal.processors.cache.CacheNoAffinityExchangeTest;
 import org.apache.ignite.internal.processors.cache.ClientFastReplyCoordinatorFailureTest;
+import org.apache.ignite.internal.processors.cache.IgniteOutOfMemoryPropagationTest;
 import org.apache.ignite.internal.processors.cache.PartitionedAtomicCacheGetsDistributionTest;
 import org.apache.ignite.internal.processors.cache.PartitionedTransactionalOptimisticCacheGetsDistributionTest;
 import org.apache.ignite.internal.processors.cache.PartitionedTransactionalPessimisticCacheGetsDistributionTest;
@@ -34,12 +35,14 @@ import org.apache.ignite.internal.processors.cache.ReplicatedTransactionalPessim
 import org.apache.ignite.internal.processors.cache.SysCacheInconsistencyInternalKeyTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteExchangeLatchManagerCoordinatorFailTest;
 import org.apache.ignite.internal.processors.cache.datastructures.IgniteExchangeLatchManagerDiscoHistoryTest;
+import org.apache.ignite.internal.processors.cache.distributed.CacheClientsConcurrentStartTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheExchangeMergeTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheParallelStartTest;
 import org.apache.ignite.internal.processors.cache.distributed.CachePartitionLossWithRestartsTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheTryLockMultithreadedTest;
 import org.apache.ignite.internal.processors.cache.distributed.ExchangeMergeStaleServerNodesTest;
 import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionEvictionDuringReadThroughSelfTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientMultiNodeUpdateTopologyLockTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheMultiClientsStartTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheThreadLocalTxTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeTest;
@@ -47,6 +50,7 @@ import org.apache.ignite.internal.processors.cache.distributed.IgnitePessimistic
 import org.apache.ignite.internal.processors.cache.distributed.OnePhaseCommitAndNodeLeftTest;
 import org.apache.ignite.internal.processors.cache.distributed.PartitionsExchangeAwareTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.ExchangeLatchManagerTest;
+import org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingOrderingTest;
 import org.apache.ignite.internal.processors.cache.transactions.TxLabelTest;
 import org.apache.ignite.internal.processors.cache.transactions.TxLocalDhtMixedCacheModesTest;
 import org.apache.ignite.internal.processors.cache.transactions.TxMultiCacheAsyncOpsTest;
@@ -120,8 +124,7 @@ public class IgniteCacheTestSuite6 {
 
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheMultiClientsStartTest.class, ignoredTests);
 
-//        TODO enable this test after IGNITE-6753, now it takes too long
-//        GridTestUtils.addTestIfNeeded(suite, IgniteOutOfMemoryPropagationTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, IgniteOutOfMemoryPropagationTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, CacheIgniteOutOfMemoryExceptionTest.class, ignoredTests);
 
         GridTestUtils.addTestIfNeeded(suite, ReplicatedAtomicCacheGetsDistributionTest.class, ignoredTests);
@@ -151,9 +154,9 @@ public class IgniteCacheTestSuite6 {
 
         GridTestUtils.addTestIfNeeded(suite, TxLocalDhtMixedCacheModesTest.class, ignoredTests);
 
-        //GridTestUtils.addTestIfNeeded(suite, CacheClientsConcurrentStartTest.class, ignoredTests);
-        //GridTestUtils.addTestIfNeeded(suite, GridCacheRebalancingOrderingTest.class, ignoredTests);
-        //GridTestUtils.addTestIfNeeded(suite, IgniteCacheClientMultiNodeUpdateTopologyLockTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, CacheClientsConcurrentStartTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, GridCacheRebalancingOrderingTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, IgniteCacheClientMultiNodeUpdateTopologyLockTest.class, ignoredTests);
 
         GridTestUtils.addTestIfNeeded(suite, TxRollbackOnMapOnInvalidTopologyTest.class, ignoredTests);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
index 1d7636b..9a2feb5 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
@@ -25,6 +25,7 @@ import org.apache.ignite.internal.processors.cache.persistence.IgniteDataStorage
 import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCacheStartStopWithFreqCheckpointTest;
 import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCorruptedStoreTest;
 import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsExchangeDuringCheckpointTest;
+import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsNoSpaceLeftOnDeviceTest;
 import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsPageSizesTest;
 import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsPartitionFilesDestroyTest;
 import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsPartitionsStateRecoveryTest;
@@ -195,6 +196,7 @@ public class IgnitePdsTestSuite2 {
         GridTestUtils.addTestIfNeeded(suite, IgniteWalFlushLogOnlySelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteWalFlushLogOnlyWithMmapBufferSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteWalFormatFileFailoverTest.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, IgnitePdsNoSpaceLeftOnDeviceTest.class, ignoredTests);
 
         // Test suite uses Standalone WAL iterator to verify PDS content.
         GridTestUtils.addTestIfNeeded(suite, IgniteWalReaderTest.class, ignoredTests);
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteStandByClusterSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteStandByClusterSuite.java
index 1031b73..48521c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteStandByClusterSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteStandByClusterSuite.java
@@ -21,8 +21,12 @@ import org.apache.ignite.cluster.GridClusterStateChangeSelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteClusterActivateDeactivateTest;
 import org.apache.ignite.internal.processors.cache.distributed.CacheBaselineTopologyTest;
 import org.apache.ignite.internal.processors.cache.persistence.IgniteBaselineAffinityTopologyActivationTest;
+import org.apache.ignite.internal.processors.cache.persistence.standbycluster.IgniteChangeGlobalStateCacheTest;
 import org.apache.ignite.internal.processors.cache.persistence.standbycluster.IgniteChangeGlobalStateDataStreamerTest;
+import org.apache.ignite.internal.processors.cache.persistence.standbycluster.IgniteChangeGlobalStateDataStructureTest;
 import org.apache.ignite.internal.processors.cache.persistence.standbycluster.IgniteChangeGlobalStateFailOverTest;
+import org.apache.ignite.internal.processors.cache.persistence.standbycluster.IgniteChangeGlobalStateServiceTest;
+import org.apache.ignite.internal.processors.cache.persistence.standbycluster.IgniteChangeGlobalStateTest;
 import org.apache.ignite.internal.processors.cache.persistence.standbycluster.IgniteNoParrallelClusterIsAllowedTest;
 import org.apache.ignite.internal.processors.cache.persistence.standbycluster.IgniteStandByClusterTest;
 import org.apache.ignite.internal.processors.cache.persistence.standbycluster.join.JoinActiveNodeToActiveCluster;
@@ -59,10 +63,10 @@ import org.junit.runners.Suite;
     JoinInActiveNodeToActiveClusterWithPersistence.class,
     JoinInActiveNodeToInActiveClusterWithPersistence.class,
 
-//TODO https://issues.apache.org/jira/browse/IGNITE-9081 IgniteChangeGlobalStateTest.class,
-//TODO https://issues.apache.org/jira/browse/IGNITE-9081 IgniteChangeGlobalStateCacheTest.class,
-//TODO https://issues.apache.org/jira/browse/IGNITE-9081 IgniteChangeGlobalStateDataStructureTest.class,
-//TODO https://issues.apache.org/jira/browse/IGNITE-9081 IgniteChangeGlobalStateServiceTest.class,
+    IgniteChangeGlobalStateTest.class,
+    IgniteChangeGlobalStateCacheTest.class,
+    IgniteChangeGlobalStateDataStructureTest.class,
+    IgniteChangeGlobalStateServiceTest.class,
 
     IgniteChangeGlobalStateDataStreamerTest.class,
     IgniteChangeGlobalStateFailOverTest.class,
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
index 99b380d..baa7730 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
@@ -64,6 +64,7 @@ import org.apache.ignite.util.GridSpinReadWriteLockSelfTest;
 import org.apache.ignite.util.GridStringBuilderFactorySelfTest;
 import org.apache.ignite.util.GridTopologyHeapSizeSelfTest;
 import org.apache.ignite.util.GridTransientTest;
+import org.apache.ignite.util.mbeans.GridMBeanBaselineTest;
 import org.apache.ignite.util.mbeans.GridMBeanDisableSelfTest;
 import org.apache.ignite.util.mbeans.GridMBeanExoticNamesSelfTest;
 import org.apache.ignite.util.mbeans.GridMBeanSelfTest;
@@ -88,6 +89,7 @@ import org.junit.runners.Suite;
     GridByteArrayListSelfTest.class,
     GridMBeanSelfTest.class,
     GridMBeanDisableSelfTest.class,
+    GridMBeanBaselineTest.class,
     GridMBeanExoticNamesSelfTest.class,
     GridLongListSelfTest.class,
     GridThreadTest.class,
diff --git a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java
index 4ccffd7..41408ab 100644
--- a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java
+++ b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java
@@ -18,6 +18,7 @@ package org.apache.ignite.testsuites;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.ignite.internal.processors.cache.persistence.file.IgniteFileIOTest;
 import org.apache.ignite.internal.processors.cache.persistence.file.IgniteNativeIoWithNoPersistenceTest;
 import org.apache.ignite.testframework.junits.DynamicSuite;
 import org.junit.runner.RunWith;
@@ -39,6 +40,7 @@ public class IgnitePdsNativeIoTestSuite {
         suite.add(IgnitePdsReplacementNativeIoTest.class);
 
         suite.add(IgniteNativeIoWithNoPersistenceTest.class);
+        suite.add(IgniteFileIOTest.class);
 
         return suite;
     }
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
index 7362d4a..723e329 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java
@@ -37,11 +37,14 @@ import org.apache.ignite.internal.util.GridRandom;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  *
  */
+// Benchmark.
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13728")
 public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest {
     /** */
     private Ignite ignite;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/ComplexSecondaryKeyUnwrapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/ComplexSecondaryKeyUnwrapSelfTest.java
index 308cfdc..0abdcc0 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/ComplexSecondaryKeyUnwrapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/ComplexSecondaryKeyUnwrapSelfTest.java
@@ -24,11 +24,13 @@ import java.util.Map;
 import org.apache.ignite.cache.query.SqlFieldsQuery;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
 import org.apache.ignite.internal.IgniteEx;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Test of creating and using secondary indexes for tables created through SQL.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13723")
 @SuppressWarnings({"unchecked", "ThrowableResultOfMethodCallIgnored"})
 public class ComplexSecondaryKeyUnwrapSelfTest extends AbstractIndexingCommonTest {
     /** Counter to generate unique table names. */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
index 2a044a2..25e35a0 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java
@@ -43,11 +43,13 @@ import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionState;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Tests to check behavior regarding transactions started via SQL.
  */
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13723")
 public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest {
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index d31b994..3c2a5d3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -75,6 +75,7 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheJoinPartitionedAnd
 import org.apache.ignite.internal.processors.cache.IgniteCacheJoinPartitionedAndReplicatedTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheJoinQueryWithAffinityKeyTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheLargeResultSelfTest;
+import org.apache.ignite.internal.processors.cache.IgniteCacheMergeSqlQueryFailingTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheMergeSqlQuerySelfTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheMultipleIndexedTypesTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheNoClassQuerySelfTest;
@@ -131,6 +132,7 @@ import org.apache.ignite.internal.processors.cache.index.BasicIndexTest;
 import org.apache.ignite.internal.processors.cache.index.BasicJavaTypesIndexTest;
 import org.apache.ignite.internal.processors.cache.index.BasicSqlTypesIndexTest;
 import org.apache.ignite.internal.processors.cache.index.ComplexPrimaryKeyUnwrapSelfTest;
+import org.apache.ignite.internal.processors.cache.index.ComplexSecondaryKeyUnwrapSelfTest;
 import org.apache.ignite.internal.processors.cache.index.DuplicateKeyValueClassesSelfTest;
 import org.apache.ignite.internal.processors.cache.index.DynamicIndexClientBasicSelfTest;
 import org.apache.ignite.internal.processors.cache.index.DynamicIndexServerBasicSelfTest;
@@ -171,6 +173,7 @@ import org.apache.ignite.internal.processors.cache.index.QueryEntityValidationSe
 import org.apache.ignite.internal.processors.cache.index.SchemaExchangeSelfTest;
 import org.apache.ignite.internal.processors.cache.index.SqlPartitionEvictionTest;
 import org.apache.ignite.internal.processors.cache.index.SqlTransactionCommandsWithMvccDisabledSelfTest;
+import org.apache.ignite.internal.processors.cache.index.SqlTransactionsSelfTest;
 import org.apache.ignite.internal.processors.cache.index.StopNodeOnRebuildIndexFailureTest;
 import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalAtomicQuerySelfTest;
 import org.apache.ignite.internal.processors.cache.local.IgniteCacheLocalFieldsQuerySelfTest;
@@ -247,6 +250,7 @@ import org.apache.ignite.internal.processors.query.h2.QueryDataPageScanTest;
 import org.apache.ignite.internal.processors.query.h2.QueryParserMetricsHolderSelfTest;
 import org.apache.ignite.internal.processors.query.h2.RowCountTableStatisticsSurvivesNodeRestartTest;
 import org.apache.ignite.internal.processors.query.h2.RowCountTableStatisticsUsageTest;
+import org.apache.ignite.internal.processors.query.h2.ThreadLocalObjectPoolSelfTest;
 import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest;
 import org.apache.ignite.internal.processors.query.h2.sql.ExplainSelfTest;
 import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest;
@@ -295,6 +299,7 @@ import org.junit.runners.Suite;
     AffinityKeyNameAndValueFieldNameConflictTest.class,
     DmlInsideTransactionTest.class,
     ComplexPrimaryKeyUnwrapSelfTest.class,
+    ComplexSecondaryKeyUnwrapSelfTest.class,
     SqlNestedQuerySelfTest.class,
     ExplainSelfTest.class,
     RunningQueriesTest.class,
@@ -414,6 +419,7 @@ import org.junit.runners.Suite;
 
     // DML.
     IgniteCacheMergeSqlQuerySelfTest.class,
+    IgniteCacheMergeSqlQueryFailingTest.class,
     IgniteCacheInsertSqlQuerySelfTest.class,
     IgniteCacheUpdateSqlQuerySelfTest.class,
     IgniteCacheDeleteSqlQuerySelfTest.class,
@@ -553,6 +559,7 @@ import org.junit.runners.Suite;
     CheckIndexesInlineSizeOnNodeJoinMultiJvmTest.class,
 
     SqlTransactionCommandsWithMvccDisabledSelfTest.class,
+    SqlTransactionsSelfTest.class,
 
     IgniteSqlDefaultValueTest.class,
     IgniteDecimalSelfTest.class,
@@ -573,6 +580,8 @@ import org.junit.runners.Suite;
     IgniteCacheReplicatedTransactionalColumnConstraintsTest.class,
     IgniteCacheReplicatedTransactionalSnapshotColumnConstraintTest.class,
 
+    ThreadLocalObjectPoolSelfTest.class,
+
     // H2 Rows on-heap cache
     H2RowCacheSelfTest.class,
     H2RowCachePageEvictionTest.class,
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java
index 62cee09..23e89ee 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java
@@ -156,7 +156,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
     IgniteCacheMvccSqlTestSuite.MvccPartitionedPrimaryNodeFailureRecoveryTest.class,
     IgniteCacheMvccSqlTestSuite.MvccPartitionedTwoBackupsPrimaryNodeFailureRecoveryTest.class,
     IgniteCacheMvccSqlTestSuite.MvccColocatedTxPessimisticOriginatingNodeFailureRecoveryTest.class,
-    IgniteCacheMvccSqlTestSuite.MvccReplicatedTxPessimisticOriginatingNodeFailureRecoveryTest.class
+    IgniteCacheMvccSqlTestSuite.MvccReplicatedTxPessimisticOriginatingNodeFailureRecoveryTest.class,
+    CacheMvccTxRecoveryTest.class
 })
 public class IgniteCacheMvccSqlTestSuite {
     /** */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java
index da2b696..76f61a7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java
@@ -70,7 +70,8 @@ import org.junit.runners.Suite;
     StaticCacheDdlKeepStaticConfigurationTest.class,
     MemLeakOnSqlWithClientReconnectTest.class,
     CacheContinuousQueryFilterDeploymentFailedTest.class,
-    PerformanceStatisticsQueryTest.class
+    PerformanceStatisticsQueryTest.class,
+    CacheContinuousQueryFilterDeploymentFailedTest.class
 })
 public class IgniteCacheQuerySelfTestSuite6 {
 }
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/composition/CompositionTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/composition/CompositionTestSuite.java
index bf0943c..eb741ea 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/composition/CompositionTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/composition/CompositionTestSuite.java
@@ -19,6 +19,8 @@ package org.apache.ignite.ml.composition;
 
 import org.apache.ignite.ml.composition.bagging.BaggingTest;
 import org.apache.ignite.ml.composition.boosting.GDBTrainerTest;
+import org.apache.ignite.ml.composition.boosting.convergence.mean.MeanAbsValueConvergenceCheckerTest;
+import org.apache.ignite.ml.composition.boosting.convergence.median.MedianOfMedianConvergenceCheckerTest;
 import org.apache.ignite.ml.composition.predictionsaggregator.MeanValuePredictionsAggregatorTest;
 import org.apache.ignite.ml.composition.predictionsaggregator.OnMajorityPredictionsAggregatorTest;
 import org.apache.ignite.ml.composition.predictionsaggregator.WeightedPredictionsAggregatorTest;
@@ -35,7 +37,9 @@ import org.junit.runners.Suite;
     OnMajorityPredictionsAggregatorTest.class,
     BaggingTest.class,
     StackingTest.class,
-    WeightedPredictionsAggregatorTest.class
+    WeightedPredictionsAggregatorTest.class,
+    MedianOfMedianConvergenceCheckerTest.class,
+    MeanAbsValueConvergenceCheckerTest.class
 })
 public class CompositionTestSuite {
 }
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java
index d2b5ce2..7c6c516 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java
@@ -18,10 +18,12 @@
 package org.apache.ignite.ml.dataset;
 
 import org.apache.ignite.ml.dataset.feature.ObjectHistogramTest;
+import org.apache.ignite.ml.dataset.feature.extractor.VectorizerTest;
 import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetBuilderTest;
 import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetTest;
 import org.apache.ignite.ml.dataset.impl.cache.util.ComputeUtilsTest;
 import org.apache.ignite.ml.dataset.impl.cache.util.DatasetAffinityFunctionWrapperTest;
+import org.apache.ignite.ml.dataset.impl.cache.util.IteratorWithConcurrentModificationCheckerTest;
 import org.apache.ignite.ml.dataset.impl.cache.util.PartitionDataStorageTest;
 import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilderTest;
 import org.apache.ignite.ml.dataset.primitive.DatasetWrapperTest;
@@ -37,6 +39,7 @@ import org.junit.runners.Suite;
 @Suite.SuiteClasses({
     DatasetWrapperTest.class,
     DatasetAffinityFunctionWrapperTest.class,
+    IteratorWithConcurrentModificationCheckerTest.class,
     PartitionDataStorageTest.class,
     LocalDatasetBuilderTest.class,
     SimpleDatasetTest.class,
@@ -45,7 +48,8 @@ import org.junit.runners.Suite;
     ObjectHistogramTest.class,
     ComputeUtilsTest.class,
     CacheBasedDatasetBuilderTest.class,
-    CacheBasedDatasetTest.class
+    CacheBasedDatasetTest.class,
+    VectorizerTest.class
 })
 public class DatasetTestSuite {
 }
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java
index 0ccde0f..05a9e50 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplLocalTestSuite.java
@@ -36,6 +36,8 @@ import org.apache.ignite.ml.math.primitives.vector.SparseVectorConstructorTest;
 import org.apache.ignite.ml.math.primitives.vector.VectorArrayStorageTest;
 import org.apache.ignite.ml.math.primitives.vector.VectorAttributesTest;
 import org.apache.ignite.ml.math.primitives.vector.VectorFoldMapTest;
+import org.apache.ignite.ml.math.primitives.vector.VectorImplementationsTest;
+import org.apache.ignite.ml.math.primitives.vector.VectorNormCasesTest;
 import org.apache.ignite.ml.math.primitives.vector.VectorNormTest;
 import org.apache.ignite.ml.math.primitives.vector.VectorToMatrixTest;
 import org.apache.ignite.ml.math.primitives.vector.VectorViewTest;
@@ -62,10 +64,13 @@ import org.junit.runners.Suite;
     VectorToMatrixTest.class,
     VectorNormTest.class,
     VectorFoldMapTest.class,
+    VectorNormCasesTest.class,
     // Vector storage tests
     VectorArrayStorageTest.class,
     DenseVectorStorageTest.class,
     SparseVectorStorageTest.class,
+    VectorImplementationsTest.class,
+    VectorUtilsTest.class,
     // Matrix storage tests.
     MatrixStorageImplementationTest.class,
     MatrixArrayStorageTest.class,
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/DistancesTestSuite.java
similarity index 68%
copy from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java
copy to modules/ml/src/test/java/org/apache/ignite/ml/math/distances/DistancesTestSuite.java
index bb44a4d..7ac7787 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalOnheapSelfTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/distances/DistancesTestSuite.java
@@ -13,14 +13,23 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package org.apache.ignite.internal.processors.cache.binary.local;
+package org.apache.ignite.ml.math.distances;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-public class GridCacheBinaryObjectsLocalOnheapSelfTest extends GridCacheBinaryObjectsLocalSelfTest {
-    /** {@inheritDoc} */
-    @Override protected boolean onheapCacheEnabled() {
-        return true;
-    }
+/**
+ *
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    JensenShannonDistanceTest.class,
+    JensenShannonDistanceTest.class,
+    CanberraDistanceTest.class,
+    BrayCurtisDistanceTest.class,
+    WeightedMinkowskiDistanceTest.class
+})
+public class DistancesTestSuite {
 }
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/NaiveBayesTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/NaiveBayesTestSuite.java
new file mode 100644
index 0000000..380f727
--- /dev/null
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/naivebayes/NaiveBayesTestSuite.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.naivebayes;
+
+import org.apache.ignite.ml.naivebayes.compound.CompoundNaiveBayesModelTest;
+import org.apache.ignite.ml.naivebayes.compound.CompoundNaiveBayesTest;
+import org.apache.ignite.ml.naivebayes.compound.CompoundNaiveBayesTrainerTest;
+import org.apache.ignite.ml.naivebayes.discrete.DiscreteNaiveBayesModelTest;
+import org.apache.ignite.ml.naivebayes.discrete.DiscreteNaiveBayesTest;
+import org.apache.ignite.ml.naivebayes.discrete.DiscreteNaiveBayesTrainerTest;
+import org.apache.ignite.ml.naivebayes.gaussian.GaussianNaiveBayesModelTest;
+import org.apache.ignite.ml.naivebayes.gaussian.GaussianNaiveBayesTest;
+import org.apache.ignite.ml.naivebayes.gaussian.GaussianNaiveBayesTrainerTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ *
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GaussianNaiveBayesModelTest.class,
+    GaussianNaiveBayesTest.class,
+    GaussianNaiveBayesTrainerTest.class,
+    DiscreteNaiveBayesModelTest.class,
+    DiscreteNaiveBayesTest.class,
+    DiscreteNaiveBayesTrainerTest.class,
+    CompoundNaiveBayesModelTest.class,
+    CompoundNaiveBayesTest.class,
+    CompoundNaiveBayesTrainerTest.class
+})
+public class NaiveBayesTestSuite {
+}
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/preprocessing/PreprocessingTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/preprocessing/PreprocessingTestSuite.java
index babffb2..6b43b76 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/preprocessing/PreprocessingTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/preprocessing/PreprocessingTestSuite.java
@@ -24,12 +24,17 @@ import org.apache.ignite.ml.preprocessing.encoding.FrequencyEncoderPreprocessorT
 import org.apache.ignite.ml.preprocessing.encoding.LabelEncoderPreprocessorTest;
 import org.apache.ignite.ml.preprocessing.encoding.OneHotEncoderPreprocessorTest;
 import org.apache.ignite.ml.preprocessing.encoding.StringEncoderPreprocessorTest;
+import org.apache.ignite.ml.preprocessing.encoding.TargetEncoderPreprocessorTest;
 import org.apache.ignite.ml.preprocessing.imputing.ImputerPreprocessorTest;
 import org.apache.ignite.ml.preprocessing.imputing.ImputerTrainerTest;
+import org.apache.ignite.ml.preprocessing.maxabsscaling.MaxAbsScalerPreprocessorTest;
+import org.apache.ignite.ml.preprocessing.maxabsscaling.MaxAbsScalerTrainerTest;
 import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerPreprocessorTest;
 import org.apache.ignite.ml.preprocessing.minmaxscaling.MinMaxScalerTrainerTest;
 import org.apache.ignite.ml.preprocessing.normalization.NormalizationPreprocessorTest;
 import org.apache.ignite.ml.preprocessing.normalization.NormalizationTrainerTest;
+import org.apache.ignite.ml.preprocessing.standardscaling.StandardScalerPreprocessorTest;
+import org.apache.ignite.ml.preprocessing.standardscaling.StandardScalerTrainerTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -48,10 +53,16 @@ import org.junit.runners.Suite;
     OneHotEncoderPreprocessorTest.class,
     FrequencyEncoderPreprocessorTest.class,
     StringEncoderPreprocessorTest.class,
+    TargetEncoderPreprocessorTest.class,
     LabelEncoderPreprocessorTest.class,
     NormalizationTrainerTest.class,
-    NormalizationPreprocessorTest.class
+    NormalizationPreprocessorTest.class,
 
+    StandardScalerTrainerTest.class,
+    StandardScalerPreprocessorTest.class,
+
+    MaxAbsScalerTrainerTest.class,
+    MaxAbsScalerPreprocessorTest.class
 })
 public class PreprocessingTestSuite {
     // No-op.
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
index 1502850..08072ca 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
@@ -22,9 +22,12 @@ import org.apache.ignite.ml.selection.paramgrid.ParameterSetGeneratorTest;
 import org.apache.ignite.ml.selection.scoring.cursor.CacheBasedLabelPairCursorTest;
 import org.apache.ignite.ml.selection.scoring.cursor.LocalLabelPairCursorTest;
 import org.apache.ignite.ml.selection.scoring.evaluator.BinaryClassificationEvaluatorTest;
+import org.apache.ignite.ml.selection.scoring.evaluator.RegressionEvaluatorTest;
 import org.apache.ignite.ml.selection.scoring.evaluator.aggregator.BinaryClassificationPointwiseMetricStatsAggregatorTest;
 import org.apache.ignite.ml.selection.scoring.evaluator.aggregator.RegressionMetricStatsAggregatorTest;
 import org.apache.ignite.ml.selection.scoring.evaluator.context.BinaryClassificationEvaluationContextTest;
+import org.apache.ignite.ml.selection.scoring.metric.classification.BinaryClassificationMetricsTest;
+import org.apache.ignite.ml.selection.scoring.metric.regression.RegressionMetricsTest;
 import org.apache.ignite.ml.selection.split.TrainTestDatasetSplitterTest;
 import org.apache.ignite.ml.selection.split.mapper.SHA256UniformMapperTest;
 import org.junit.runner.RunWith;
@@ -42,9 +45,12 @@ import org.junit.runners.Suite;
     TrainTestDatasetSplitterTest.class,
     CacheBasedLabelPairCursorTest.class,
     BinaryClassificationEvaluatorTest.class,
+    RegressionEvaluatorTest.class,
     BinaryClassificationPointwiseMetricStatsAggregatorTest.class,
     RegressionMetricStatsAggregatorTest.class,
-    BinaryClassificationEvaluationContextTest.class
+    BinaryClassificationEvaluationContextTest.class,
+    BinaryClassificationMetricsTest.class,
+    RegressionMetricsTest.class
 })
 public class SelectionTestSuite {
 }
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java
index e344ab3..eb832fa 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.ml.tree;
 
 import org.apache.ignite.ml.tree.data.DecisionTreeDataTest;
+import org.apache.ignite.ml.tree.data.TreeDataIndexTest;
 import org.apache.ignite.ml.tree.impurity.gini.GiniImpurityMeasureCalculatorTest;
 import org.apache.ignite.ml.tree.impurity.gini.GiniImpurityMeasureTest;
 import org.apache.ignite.ml.tree.impurity.mse.MSEImpurityMeasureCalculatorTest;
@@ -42,7 +43,8 @@ import org.junit.runners.Suite;
     StepFunctionTest.class,
     SimpleStepFunctionCompressorTest.class,
     DecisionTreeRegressionTrainerIntegrationTest.class,
-    DecisionTreeClassificationTrainerIntegrationTest.class
+    DecisionTreeClassificationTrainerIntegrationTest.class,
+    TreeDataIndexTest.class
 })
 public class DecisionTreeTestSuite {
 }
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestTreeTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestTreeTestSuite.java
index 6752652..5610a6c 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestTreeTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestTreeTestSuite.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.ml.tree.randomforest;
 
+import org.apache.ignite.ml.tree.randomforest.data.TreeNodeTest;
 import org.apache.ignite.ml.tree.randomforest.data.impurity.GiniFeatureHistogramTest;
 import org.apache.ignite.ml.tree.randomforest.data.impurity.MSEHistogramTest;
 import org.apache.ignite.ml.tree.randomforest.data.statistics.NormalDistributionStatisticsComputerTest;
@@ -34,7 +35,8 @@ import org.junit.runners.Suite;
     MSEHistogramTest.class,
     NormalDistributionStatisticsComputerTest.class,
     RandomForestTest.class,
-    RandomForestIntegrationTest.class
+    RandomForestIntegrationTest.class,
+    TreeNodeTest.class
 })
 public class RandomForestTreeTestSuite {
 }
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala
index e9ebbd0..a9ee6c4 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/testsuites/ScalarSelfTestSuite.scala
@@ -20,9 +20,7 @@ package org.apache.ignite.scalar.testsuites
 import org.apache.ignite.IgniteSystemProperties._
 import org.apache.ignite.scalar.tests._
 import org.apache.ignite.testframework.GridTestUtils
-
 import org.junit.runner.RunWith
-
 import org.scalatest._
 import org.scalatest.junit.JUnitRunner
 
diff --git a/modules/spark-2.4/src/test/scala/org/apache/ignite/spark/IgniteDataFrameSuite.scala b/modules/spark-2.4/src/test/scala/org/apache/ignite/spark/IgniteDataFrameSuite.scala
index 728cde6..84c2fb0 100644
--- a/modules/spark-2.4/src/test/scala/org/apache/ignite/spark/IgniteDataFrameSuite.scala
+++ b/modules/spark-2.4/src/test/scala/org/apache/ignite/spark/IgniteDataFrameSuite.scala
@@ -18,11 +18,14 @@
 package org.apache.ignite.spark
 
 import org.apache.spark.sql.ignite.IgniteSparkSessionSpec
+import org.junit.runner.RunWith
 import org.scalatest.Suites
+import org.scalatest.junit.JUnitRunner
 
 /**
   * Test suite for Spark DataFrame API implementation.
   */
+@RunWith(classOf[JUnitRunner])
 class IgniteDataFrameSuite extends Suites (
     new IgniteDataFrameSchemaSpec,
     new IgniteSQLDataFrameSpec,
@@ -38,5 +41,6 @@ class IgniteDataFrameSuite extends Suites (
     new IgniteOptimizationJoinSpec,
     new IgniteOptimizationDateFuncSpec,
     new IgniteOptimizationDisableEnableSpec,
-    new IgniteSparkSessionSpec
+    new IgniteSparkSessionSpec,
+    new IgniteRDDSpec
 )
diff --git a/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteDataFrameSuite.scala b/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteDataFrameSuite.scala
index 728cde6..84c2fb0 100644
--- a/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteDataFrameSuite.scala
+++ b/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteDataFrameSuite.scala
@@ -18,11 +18,14 @@
 package org.apache.ignite.spark
 
 import org.apache.spark.sql.ignite.IgniteSparkSessionSpec
+import org.junit.runner.RunWith
 import org.scalatest.Suites
+import org.scalatest.junit.JUnitRunner
 
 /**
   * Test suite for Spark DataFrame API implementation.
   */
+@RunWith(classOf[JUnitRunner])
 class IgniteDataFrameSuite extends Suites (
     new IgniteDataFrameSchemaSpec,
     new IgniteSQLDataFrameSpec,
@@ -38,5 +41,6 @@ class IgniteDataFrameSuite extends Suites (
     new IgniteOptimizationJoinSpec,
     new IgniteOptimizationDateFuncSpec,
     new IgniteOptimizationDisableEnableSpec,
-    new IgniteSparkSessionSpec
+    new IgniteSparkSessionSpec,
+    new IgniteRDDSpec
 )
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 12d97d5..7286ff2 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -54,10 +54,53 @@
                 <src.javaspecific.dir>src/main/java8</src.javaspecific.dir>
             </properties>
         </profile>
+
+        <profile>
+            <!--
+            This profile is used to provide a check that all tests are defined in at least one suite.
+            Here we provide a custom surefire test provider to collect info about tests and suites.
+            -->
+            <id>check-test-suites</id>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.2.0</version>
+                        <executions>
+                            <execution>
+                                <id>copy-resources</id>
+                                <!-- here the phase you need -->
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${basedir}/target/classes/META-INF/services</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>src/main/resources/META-INF/services</directory>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -113,7 +156,19 @@
         <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>maven-surefire-common</artifactId>
-            <version>3.0.0-M4</version>
+            <version>${surefire.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-api</artifactId>
+            <version>${surefire.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>common-junit48</artifactId>
+            <version>${surefire.version}</version>
         </dependency>
 
         <dependency>
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/AssertOnOrphanedTests.java b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/AssertOnOrphanedTests.java
new file mode 100644
index 0000000..d5a59b0
--- /dev/null
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/AssertOnOrphanedTests.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.tools.surefire.testsuites;
+
+import java.util.Set;
+
+/**
+ * Assert if Ignite repository contains some orphaned (non-suited) tests.
+ */
+public class AssertOnOrphanedTests {
+    /** */
+    public static void main(String[] args) throws Exception {
+        OrphanedTestCollection orphanedTestCollection = new OrphanedTestCollection();
+
+        Set<String> orphanedTests = orphanedTestCollection.getOrphanedTests();
+
+        if (orphanedTests.isEmpty()) {
+            System.out.println("No issues with test and suites are found.");
+            return;
+        }
+
+        StringBuilder builder = new StringBuilder("All test classes must be include in any test suite")
+            .append(" or mark with the @Ignore annotation.")
+            .append("\nList of non-suited classes (")
+            .append(orphanedTests.size())
+            .append(" items):\n");
+
+        for (String test : orphanedTests)
+            builder.append("\t").append(test).append("\n");
+
+        builder
+            .append("\nList of orphaned tests persisted in: ")
+            .append(orphanedTestCollection.getPath())
+            .append("\n");
+
+        AssertionError err = new AssertionError(builder.toString());
+        err.setStackTrace(new StackTraceElement[] {});
+
+        throw err;
+    }
+}
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/CheckAllTestsInSuites.java b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/CheckAllTestsInSuites.java
new file mode 100644
index 0000000..d105ad1
--- /dev/null
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/CheckAllTestsInSuites.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.tools.surefire.testsuites;
+
+import java.lang.reflect.Modifier;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.Request;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Suite;
+
+/**
+ * Checks that all test classes are part of any suite.
+ *
+ * There are 2 inputs for this check:
+ * 1. All test classes for current maven module found by surefire plugin.
+ * 2. Orphaned tests by previous maven modules.
+ *
+ * This check never fails. It found orphaned tests for current maven module, aggregate them with tests from
+ * previous modules, then persist aggregated list to a file {@link OrphanedTestCollection}.
+ * After checking all modules the final list of orphaned tests is checked by {@link AssertOnOrphanedTests} job.
+ */
+public class CheckAllTestsInSuites {
+    /**
+     * List of test classes that is an input for this check. {@link IgniteTestsProvider} prepares it.
+     */
+    static Iterable<Class<?>> testClasses;
+
+    /** */
+    @Test
+    public void check() {
+        Set<String> suitedTestClasses = new HashSet<>();
+        Set<String> allTestClasses = new HashSet<>();
+        Set<String> suites = new HashSet<>();
+
+        // Workaround to handle cases when a class has descenders and it's OK to skip the base class.
+        // Also it works for DynamicSuite that can use a base class to create new test classes with reflection.
+        Set<String> superClasses = new HashSet<>();
+
+        for (Class<?> clazz : testClasses) {
+            if (Modifier.isAbstract(clazz.getModifiers()))
+                continue;
+
+            if (clazz.getAnnotation(Ignore.class) != null)
+                continue;
+
+            Description desc = Request.aClass(clazz).getRunner().getDescription();
+
+            if (isTestClass(desc)) {
+                allTestClasses.add(clazz.getName());
+                superClasses.add(clazz.getSuperclass().getName());
+            }
+            else
+                processSuite(desc, suitedTestClasses, suites, superClasses);
+        }
+
+        allTestClasses.removeAll(suitedTestClasses);
+        allTestClasses.removeAll(superClasses);
+
+        OrphanedTestCollection orphaned = new OrphanedTestCollection();
+
+        try {
+            Set<String> orphanedTests = orphaned.getOrphanedTests();
+
+            orphanedTests.removeAll(suitedTestClasses);
+
+            orphanedTests.addAll(allTestClasses);
+
+            orphaned.persistOrphanedTests(orphanedTests);
+
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to check orphaned tests.", e);
+        }
+    }
+
+    /**
+     * Recursively handle suites - mark all test classes as suited.
+     */
+    private void processSuite(Description suite, Set<String> suitedClasses,
+        Set<String> suites, Set<String> superClasses) {
+        suites.add(suite.getTestClass().getName());
+
+        for (Description desc: suite.getChildren()) {
+            if (!isTestClass(desc))
+                processSuite(desc, suitedClasses, suites, superClasses);
+            else {
+                suitedClasses.add(desc.getTestClass().getName());
+                superClasses.add(desc.getTestClass().getSuperclass().getName());
+            }
+        }
+    }
+
+    /**
+     * Check whether class is a test class or a suite.
+     *
+     * Suite classes are marked with RunWith annotation and value of it is a descender of Suite.class.
+     * For scala tests suite must be inherited from {@code org.scalatest.Suites} class.
+     * Exclusion of the rule is Parameterized.class, so classes are marked with it are test classes.
+     */
+    private boolean isTestClass(Description desc) {
+        RunWith runWith = desc.getAnnotation(RunWith.class);
+
+        return runWith == null
+            || runWith.value().equals(Parameterized.class)
+            || !(Suite.class.isAssignableFrom(runWith.value())
+            || "org.scalatest.Suites".equals(desc.getTestClass().getSuperclass().getName()));
+    }
+}
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
new file mode 100644
index 0000000..0d687f2
--- /dev/null
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.tools.surefire.testsuites;
+
+import java.util.Collections;
+import org.apache.maven.surefire.common.junit4.JUnit4StackTraceWriter;
+import org.apache.maven.surefire.common.junit48.JUnit48TestChecker;
+import org.apache.maven.surefire.providerapi.AbstractProvider;
+import org.apache.maven.surefire.providerapi.ProviderParameters;
+import org.apache.maven.surefire.report.ConsoleOutputReceiver;
+import org.apache.maven.surefire.report.ReporterFactory;
+import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.report.SimpleReportEntry;
+import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+import org.apache.maven.surefire.util.ScanResult;
+import org.apache.maven.surefire.util.ScannerFilter;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+
+import static org.apache.maven.surefire.report.ConsoleOutputCapture.startCapture;
+
+/**
+ * Goal of the provider to find unit tests that are not part of any test suite and notify user about it.
+ *
+ * This provider is used when command mvn:test is executed. It collect information about test classes
+ * and than checks it in {@link CheckAllTestsInSuites} test class.
+ */
+public class IgniteTestsProvider extends AbstractProvider {
+    /** Test class loader. */
+    private final ClassLoader testClsLdr;
+
+    /** */
+    private final ScanResult scanResult;
+
+    /** */
+    private final ReporterFactory reporterFactory;
+
+    /** */
+    public IgniteTestsProvider(ProviderParameters bootParams) {
+        testClsLdr = bootParams.getTestClassLoader();
+        scanResult = bootParams.getScanResult();
+        reporterFactory = bootParams.getReporterFactory();
+    }
+
+    /** {@inheritDoc} */
+    @Override public RunResult invoke(Object forkTestSet) throws TestSetFailedException {
+        ScannerFilter scannerFilter = new IgniteTestFilter(testClsLdr);
+
+        CheckAllTestsInSuites.testClasses = scanResult.applyFilter(scannerFilter, testClsLdr);
+
+        Result junitResult = JUnitCore.runClasses(CheckAllTestsInSuites.class);
+
+        RunResult surefireResult = new RunResult(
+            junitResult.getRunCount(), 0, junitResult.getFailureCount(), 0);
+
+        if (junitResult.getFailureCount() > 0)
+            writeFailureToOutput(junitResult.getFailures().get(0));
+
+        return surefireResult;
+    }
+
+    /** Override default junit test checker to handle Ignite specific classes. */
+    private static class IgniteTestFilter extends JUnit48TestChecker {
+        /** */
+        public IgniteTestFilter(ClassLoader testClsLdr) {
+            super(testClsLdr);
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean accept(Class aCls) {
+            boolean isValidJunitTestCls = super.accept(aCls);
+
+            if (!isValidJunitTestCls && shouldCheckSuperClass(aCls))
+                return super.accept(aCls.getSuperclass());
+
+            return isValidJunitTestCls;
+        }
+
+        /**
+         * We should check super class of {@code aCls} as there are cases when classes just extend
+         * real test class by overriding some non-test methods (e.g. #getConfiguration).
+         */
+        private boolean shouldCheckSuperClass(Class<?> aCls) {
+            Class<?> superCls = aCls.getSuperclass();
+
+            return superCls != null && !superCls.equals(Object.class);
+        }
+    }
+
+    /** Make info about non-suited test visible to user. */
+    private void writeFailureToOutput(Failure failure) throws TestSetFailedException {
+        try {
+            SimpleReportEntry report = SimpleReportEntry.withException(
+                failure.getDescription().getClassName(), null,
+                failure.getDescription().getMethodName(), null,
+                new JUnit4StackTraceWriter(failure));
+
+            RunListener reporter = reporterFactory.createReporter();
+
+            startCapture((ConsoleOutputReceiver) reporter);
+
+            reporter.testFailed(report);
+            reporter.testSetCompleted(report);
+
+        } catch (Exception e) {
+            throw new TestSetFailedException("Failed to dump exception to stdout");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public Iterable<Class<?>> getSuites() {
+        return Collections.singletonList(CheckAllTestsInSuites.class);
+    }
+}
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/OrphanedTestCollection.java b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/OrphanedTestCollection.java
new file mode 100644
index 0000000..4249bc4
--- /dev/null
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/OrphanedTestCollection.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.tools.surefire.testsuites;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Represents a persisted list of orphaned tests.
+ */
+public class OrphanedTestCollection {
+    /** File to persist orphaned tests. */
+    private final Path path = initPath();
+
+    /** */
+    public Set<String> getOrphanedTests() throws Exception {
+        if (Files.notExists(path))
+            return new HashSet<>();
+
+        try (
+            BufferedReader testReader = new BufferedReader(new FileReader(path.toFile()))
+        ) {
+            String testClsName = testReader.readLine();
+
+            Set<String> testClasses = new HashSet<>();
+
+            while (testClsName != null) {
+                testClasses.add(testClsName);
+
+                testClsName = testReader.readLine();
+            }
+
+            return testClasses;
+        }
+    }
+
+    /** */
+    public void persistOrphanedTests(Collection<String> testClasses) throws Exception {
+        try (
+            BufferedWriter testWriter = new BufferedWriter(new FileWriter(path.toFile()))
+        ) {
+            for (String cls: testClasses) {
+                testWriter.write(cls);
+                testWriter.newLine();
+            }
+        }
+    }
+
+    /** */
+    public Path getPath() {
+        return path;
+    }
+
+    /**
+     * Structure of Ignite modules is flat but there are some exceptions. Unfortunately it's impossible to
+     * get access to root directory of repository so use this hack to find it.
+     */
+    private static Path initPath() {
+        Path curPath = Paths.get("").toAbsolutePath();
+
+        while (!curPath.equals(curPath.getRoot())) {
+            if (curPath.resolve("modules").toFile().exists()) {
+                Path targetPath = curPath.resolve("target");
+
+                if (!targetPath.toFile().exists()) {
+                    try {
+                        Files.createDirectory(targetPath);
+                    }
+                    catch (IOException e) {
+                        throw new RuntimeException("Failed to create target directory.", e);
+                    }
+                }
+
+                return curPath.resolve("target").resolve("orphaned_tests.txt");
+            }
+
+            curPath = curPath.getParent();
+        }
+
+        throw new IllegalStateException("Can't find repository root directory.");
+    }
+}
diff --git a/modules/tools/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider b/modules/tools/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
new file mode 100644
index 0000000..e706195
--- /dev/null
+++ b/modules/tools/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
@@ -0,0 +1 @@
+org.apache.ignite.tools.surefire.testsuites.IgniteTestsProvider
diff --git a/parent/pom.xml b/parent/pom.xml
index bbbb0f5..8b4e5ed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -130,6 +130,7 @@
         <spring-5.2.version>5.2.3.RELEASE</spring-5.2.version>
         <spring41.osgi.feature.version>4.1.7.RELEASE_1</spring41.osgi.feature.version>
         <storm.version>1.1.1</storm.version>
+        <surefire.version>3.0.0-M4</surefire.version>
         <tomcat.version>9.0.10</tomcat.version>
         <twitter.hbc.version>2.2.0</twitter.hbc.version>
         <yammer.metrics.annotation.version>2.2.0</yammer.metrics.annotation.version>
@@ -598,7 +599,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M4</version>
+                <version>${surefire.version}</version>
                 <configuration>
                     <forkCount>0</forkCount>
                     <statelessTestsetInfoReporter implementation="org.apache.ignite.tools.surefire.TestSuiteAwareTestsetReporter"/>
@@ -608,6 +609,10 @@
                             <value>org.apache.ignite.tools.junit.JUnitTeamcityReporter</value>
                         </property>
                     </properties>
+                    <includes>
+                        <!-- Check all classes that may have any test. -->
+                        <include>**/*.java</include>
+                    </includes>
                 </configuration>
                 <dependencies>
                     <dependency>
diff --git a/pom.xml b/pom.xml
index e75a29f..43c63639d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -760,6 +760,75 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <!--
+            This profile is used to provide a check that all tests are defined in at least one suite.
+
+            Some Ignite tests can be declared within one maven module but ran in a suite declared in a different module.
+            Then it's impossible to create an isolated check for every module. We should aggregate info from all modules
+            and make a final decision on the aggregation result.
+
+            The maven project apache-ignite:pom is the last that is built for the maven reactor.
+            We leverage on that and provide clean and assertion tasks here.
+            -->
+            <id>check-test-suites</id>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <!-- Clean up custom surefire test provider. -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.7</version>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <delete>
+                                            <fileset dir="${basedir}/modules/tools/target/classes/META-INF/services" />
+                                        </delete>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <!-- Check final list of orphaned tests. -->
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.3.2</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.ignite</groupId>
+                                <artifactId>ignite-tools</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <includePluginDependencies>true</includePluginDependencies>
+                            <mainClass>org.apache.ignite.tools.surefire.testsuites.AssertOnOrphanedTests</mainClass>
+                            <arguments>
+                                <argument>${project.modules}</argument>
+                            </arguments>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <build>