(ignite) branch master updated: IGNITE-28829 Split more overloaded test suites to bring RunAll suites under ~30 minutes (#13289)

av Sat, 27 Jun 2026 15:18:25 -0700

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

anton-vinogradov 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 ef52e103395 IGNITE-28829 Split more overloaded test suites to bring 
RunAll suites under ~30 minutes (#13289)
ef52e103395 is described below

commit ef52e1033954751bec83f8c7ed76e438c3bfa41d
Author: Anton Vinogradov <[email protected]>
AuthorDate: Sun Jun 28 01:18:09 2026 +0300

    IGNITE-28829 Split more overloaded test suites to bring RunAll suites under 
~30 minutes (#13289)
    
    Follow-up to IGNITE-28828. Splits 3 more overloaded core test suites
    into balanced halves. Test-infrastructure only; no production code
    changed; each split is an exact partition of the original suite (no test
    added/removed).
    
    **New suites:** `IgniteCacheTestSuite18` (from Cache 4),
    `IgniteCacheTestSuite19` (from Cache 8 — moves the Eviction sub-suite +
    rebalancing tests), `IgniteCacheDataStructuresSelfTestSuite2`.
    
    **Verified:** `ignite-core` compiles, strict `-Pcheckstyle` passes, and
    each split's class set exactly equals the original (no coverage lost).
    
    **Note:** new TeamCity build configs for these suites must be added to
    the RunAll chain for them to actually run in CI.
    
    Jira: https://issues.apache.org/jira/browse/IGNITE-28829
    
    🤖 Generated with [Claude Code](https://claude.com/claude-code)
    
    Co-authored-by: Claude Opus 4.8 <[email protected]>
---
 .../IgniteCacheDataStructuresSelfTestSuite.java    |  88 -----------
 ...> IgniteCacheDataStructuresSelfTestSuite2.java} | 102 +-----------
 ...TestSuite4.java => IgniteCacheTestSuite18.java} | 175 +--------------------
 ...TestSuite8.java => IgniteCacheTestSuite19.java} |  21 +--
 .../ignite/testsuites/IgniteCacheTestSuite4.java   | 166 +------------------
 .../ignite/testsuites/IgniteCacheTestSuite8.java   |  35 -----
 6 files changed, 14 insertions(+), 573 deletions(-)

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 dc7ab1d7765..84a12b092f8 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
@@ -17,77 +17,43 @@
 
 package org.apache.ignite.testsuites;
 
-import 
org.apache.ignite.internal.processors.cache.AtomicCacheAffinityConfigurationTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueCleanupSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueClientDisconnectTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueMultiNodeConsistencySelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicLongClusterReadOnlyTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicReferenceClusterReadOnlyTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicSequenceClusterReadOnlyTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicStampedClusterReadOnlyTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDataStructuresTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteCountDownLatchClusterReadOnlyTest;
-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;
 import 
org.apache.ignite.internal.processors.cache.datastructures.OutOfMemoryVolatileRegionTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.SemaphoreFailoverNoWaitingAcquirerTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.SemaphoreFailoverSafeReleasePermitsTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest;
 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;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicSetSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicStampedApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedDataStructuresFailoverSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedNodeRestartTxSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueCreateMultiNodeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueEntryMoveSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueFailoverDataConsistencySelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueJoinedNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueMultiNodeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueRotativeMultiNodeTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSequenceApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSequenceMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetFailoverSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetWithClientSelfTest;
-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;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedQueueMultiNodeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedQueueRotativeMultiNodeTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSequenceApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSequenceMultiNodeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetWithClientSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetWithNodeFilterSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedAtomicLongApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedCountDownLatchSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedLockSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedSemaphoreSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheAtomicReplicatedNodeRestartSelfTest;
-import 
org.apache.ignite.internal.processors.datastructures.GridCacheReplicatedQueueRemoveSelfTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -96,98 +62,44 @@ import org.junit.runners.Suite;
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    GridCachePartitionedQueueFailoverDataConsistencySelfTest.class,
-    GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.class,
-
-    GridCacheReplicatedSequenceApiSelfTest.class,
     GridCacheReplicatedSequenceMultiNodeSelfTest.class,
-    GridCacheReplicatedQueueApiSelfTest.class,
-    GridCacheReplicatedQueueMultiNodeSelfTest.class,
-    GridCacheReplicatedQueueRotativeMultiNodeTest.class,
-    GridCacheReplicatedSetSelfTest.class,
     GridCacheReplicatedSetWithClientSelfTest.class,
-    GridCacheReplicatedSetWithNodeFilterSelfTest.class,
-    GridCacheReplicatedDataStructuresFailoverSelfTest.class,
     IgniteReplicatedCountDownLatchSelfTest.class,
     IgniteReplicatedSemaphoreSelfTest.class,
     IgniteReplicatedLockSelfTest.class,
     IgniteCacheAtomicReplicatedNodeRestartSelfTest.class,
-    GridCacheReplicatedQueueRemoveSelfTest.class,
     OutOfMemoryVolatileRegionTest.class,
-
-    GridCachePartitionedSequenceApiSelfTest.class,
     GridCachePartitionedSequenceMultiNodeSelfTest.class,
     GridCachePartitionedQueueApiSelfTest.class,
     GridCachePartitionedAtomicQueueApiSelfTest.class,
     GridCachePartitionedQueueMultiNodeSelfTest.class,
     GridCachePartitionedAtomicQueueMultiNodeSelfTest.class,
     GridCacheQueueClientDisconnectTest.class,
-
     GridCachePartitionedQueueCreateMultiNodeSelfTest.class,
     GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class,
     GridCachePartitionedSetSelfTest.class,
-    GridCachePartitionedSetWithClientSelfTest.class,
-    GridCachePartitionedSetWithNodeFilterSelfTest.class,
-    IgnitePartitionedSetNoBackupsSelfTest.class,
-    GridCachePartitionedAtomicSetSelfTest.class,
     IgnitePartitionedCountDownLatchSelfTest.class,
     IgniteDataStructureWithJobTest.class,
     IgnitePartitionedSemaphoreSelfTest.class,
-    SemaphoreFailoverSafeReleasePermitsTest.class,
     SemaphoreFailoverNoWaitingAcquirerTest.class,
     IgnitePartitionedLockSelfTest.class,
-
     GridCachePartitionedSetFailoverSelfTest.class,
     GridCachePartitionedAtomicSetFailoverSelfTest.class,
-
-    GridCachePartitionedQueueRotativeMultiNodeTest.class,
-    GridCachePartitionedAtomicQueueRotativeMultiNodeTest.class,
     GridCacheQueueCleanupSelfTest.class,
-
-    GridCachePartitionedQueueEntryMoveSelfTest.class,
-
     GridCachePartitionedDataStructuresFailoverSelfTest.class,
     GridCacheQueueMultiNodeConsistencySelfTest.class,
-
-    IgnitePartitionedAtomicLongApiSelfTest.class,
     IgniteReplicatedAtomicLongApiSelfTest.class,
-
     GridCachePartitionedAtomicSequenceMultiThreadedTest.class,
     GridCachePartitionedAtomicSequenceTxSelfTest.class,
-
-    GridCachePartitionedAtomicStampedApiSelfTest.class,
-    GridCacheReplicatedAtomicStampedApiSelfTest.class,
-
-    GridCachePartitionedAtomicReferenceApiSelfTest.class,
     GridCacheReplicatedAtomicReferenceApiSelfTest.class,
-
     GridCachePartitionedAtomicReferenceMultiNodeTest.class,
     GridCacheReplicatedAtomicReferenceMultiNodeTest.class,
-
-    GridCachePartitionedNodeRestartTxSelfTest.class,
-    GridCachePartitionedQueueJoinedNodeSelfTest.class,
-
-    IgniteDataStructureUniqueNameTest.class,
     IgniteDataStructuresNoClassOnServerTest.class,
-
-    IgniteClientDataStructuresTest.class,
-
     IgnitePartitionedQueueNoBackupsTest.class,
-
     IgniteSequenceInternalCleanupTest.class,
-
-    AtomicCacheAffinityConfigurationTest.class,
-
     IgniteCacheDataStructuresBinarySelfTestSuite.class,
-
     IgniteAtomicLongClusterReadOnlyTest.class,
     IgniteAtomicReferenceClusterReadOnlyTest.class,
-    IgniteAtomicSequenceClusterReadOnlyTest.class,
-    IgniteAtomicStampedClusterReadOnlyTest.class,
-    IgniteCountDownLatchClusterReadOnlyTest.class,
-    IgniteDataStructuresCreateDeniedInClusterReadOnlyMode.class,
-    IgniteQueueClusterReadOnlyTest.class,
-    IgniteSetClusterReadOnlyTest.class
 })
 public class IgniteCacheDataStructuresSelfTestSuite {
 }
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite2.java
similarity index 51%
copy from 
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
copy to 
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite2.java
index dc7ab1d7765..36163ed4e42 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite2.java
@@ -18,176 +18,82 @@
 package org.apache.ignite.testsuites;
 
 import 
org.apache.ignite.internal.processors.cache.AtomicCacheAffinityConfigurationTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueCleanupSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueClientDisconnectTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.GridCacheQueueMultiNodeConsistencySelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicLongClusterReadOnlyTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicReferenceClusterReadOnlyTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicSequenceClusterReadOnlyTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteAtomicStampedClusterReadOnlyTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDataStructuresTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteCountDownLatchClusterReadOnlyTest;
 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;
-import 
org.apache.ignite.internal.processors.cache.datastructures.OutOfMemoryVolatileRegionTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.SemaphoreFailoverNoWaitingAcquirerTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.SemaphoreFailoverSafeReleasePermitsTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueApiSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest;
-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;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicSetSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedAtomicStampedApiSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedDataStructuresFailoverSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedNodeRestartTxSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueApiSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueCreateMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueEntryMoveSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueFailoverDataConsistencySelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueJoinedNodeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedQueueRotativeMultiNodeTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSequenceApiSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSequenceMultiNodeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetFailoverSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSetWithClientSelfTest;
 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;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedQueueMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedQueueRotativeMultiNodeTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSequenceApiSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSequenceMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetWithClientSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.GridCacheReplicatedSetWithNodeFilterSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedAtomicLongApiSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedCountDownLatchSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedLockSelfTest;
-import 
org.apache.ignite.internal.processors.cache.datastructures.replicated.IgniteReplicatedSemaphoreSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheAtomicReplicatedNodeRestartSelfTest;
 import 
org.apache.ignite.internal.processors.datastructures.GridCacheReplicatedQueueRemoveSelfTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 /**
- * Test suite for cache data structures.
+ * Split off from {@link IgniteCacheDataStructuresSelfTestSuite} to reduce the 
single-suite
+ * runtime in CI; contains an independent subset of the same test classes.
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     GridCachePartitionedQueueFailoverDataConsistencySelfTest.class,
     GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.class,
-
     GridCacheReplicatedSequenceApiSelfTest.class,
-    GridCacheReplicatedSequenceMultiNodeSelfTest.class,
     GridCacheReplicatedQueueApiSelfTest.class,
     GridCacheReplicatedQueueMultiNodeSelfTest.class,
     GridCacheReplicatedQueueRotativeMultiNodeTest.class,
     GridCacheReplicatedSetSelfTest.class,
-    GridCacheReplicatedSetWithClientSelfTest.class,
     GridCacheReplicatedSetWithNodeFilterSelfTest.class,
     GridCacheReplicatedDataStructuresFailoverSelfTest.class,
-    IgniteReplicatedCountDownLatchSelfTest.class,
-    IgniteReplicatedSemaphoreSelfTest.class,
-    IgniteReplicatedLockSelfTest.class,
-    IgniteCacheAtomicReplicatedNodeRestartSelfTest.class,
     GridCacheReplicatedQueueRemoveSelfTest.class,
-    OutOfMemoryVolatileRegionTest.class,
-
     GridCachePartitionedSequenceApiSelfTest.class,
-    GridCachePartitionedSequenceMultiNodeSelfTest.class,
-    GridCachePartitionedQueueApiSelfTest.class,
-    GridCachePartitionedAtomicQueueApiSelfTest.class,
-    GridCachePartitionedQueueMultiNodeSelfTest.class,
-    GridCachePartitionedAtomicQueueMultiNodeSelfTest.class,
-    GridCacheQueueClientDisconnectTest.class,
-
-    GridCachePartitionedQueueCreateMultiNodeSelfTest.class,
-    GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class,
-    GridCachePartitionedSetSelfTest.class,
     GridCachePartitionedSetWithClientSelfTest.class,
     GridCachePartitionedSetWithNodeFilterSelfTest.class,
     IgnitePartitionedSetNoBackupsSelfTest.class,
     GridCachePartitionedAtomicSetSelfTest.class,
-    IgnitePartitionedCountDownLatchSelfTest.class,
-    IgniteDataStructureWithJobTest.class,
-    IgnitePartitionedSemaphoreSelfTest.class,
     SemaphoreFailoverSafeReleasePermitsTest.class,
-    SemaphoreFailoverNoWaitingAcquirerTest.class,
-    IgnitePartitionedLockSelfTest.class,
-
-    GridCachePartitionedSetFailoverSelfTest.class,
-    GridCachePartitionedAtomicSetFailoverSelfTest.class,
-
     GridCachePartitionedQueueRotativeMultiNodeTest.class,
     GridCachePartitionedAtomicQueueRotativeMultiNodeTest.class,
-    GridCacheQueueCleanupSelfTest.class,
-
     GridCachePartitionedQueueEntryMoveSelfTest.class,
-
-    GridCachePartitionedDataStructuresFailoverSelfTest.class,
-    GridCacheQueueMultiNodeConsistencySelfTest.class,
-
     IgnitePartitionedAtomicLongApiSelfTest.class,
-    IgniteReplicatedAtomicLongApiSelfTest.class,
-
-    GridCachePartitionedAtomicSequenceMultiThreadedTest.class,
-    GridCachePartitionedAtomicSequenceTxSelfTest.class,
-
     GridCachePartitionedAtomicStampedApiSelfTest.class,
     GridCacheReplicatedAtomicStampedApiSelfTest.class,
-
     GridCachePartitionedAtomicReferenceApiSelfTest.class,
-    GridCacheReplicatedAtomicReferenceApiSelfTest.class,
-
-    GridCachePartitionedAtomicReferenceMultiNodeTest.class,
-    GridCacheReplicatedAtomicReferenceMultiNodeTest.class,
-
     GridCachePartitionedNodeRestartTxSelfTest.class,
     GridCachePartitionedQueueJoinedNodeSelfTest.class,
-
     IgniteDataStructureUniqueNameTest.class,
-    IgniteDataStructuresNoClassOnServerTest.class,
-
     IgniteClientDataStructuresTest.class,
-
-    IgnitePartitionedQueueNoBackupsTest.class,
-
-    IgniteSequenceInternalCleanupTest.class,
-
     AtomicCacheAffinityConfigurationTest.class,
-
-    IgniteCacheDataStructuresBinarySelfTestSuite.class,
-
-    IgniteAtomicLongClusterReadOnlyTest.class,
-    IgniteAtomicReferenceClusterReadOnlyTest.class,
     IgniteAtomicSequenceClusterReadOnlyTest.class,
     IgniteAtomicStampedClusterReadOnlyTest.class,
     IgniteCountDownLatchClusterReadOnlyTest.class,
     IgniteDataStructuresCreateDeniedInClusterReadOnlyMode.class,
     IgniteQueueClusterReadOnlyTest.class,
-    IgniteSetClusterReadOnlyTest.class
+    IgniteSetClusterReadOnlyTest.class,
 })
-public class IgniteCacheDataStructuresSelfTestSuite {
+public class IgniteCacheDataStructuresSelfTestSuite2 {
 }
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite18.java
similarity index 51%
copy from 
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
copy to 
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite18.java
index bce6d557f1b..49018af640f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite18.java
@@ -21,140 +21,78 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import 
org.apache.ignite.cache.store.CacheStoreListenerRWThroughDisabledAtomicCacheTest;
-import 
org.apache.ignite.cache.store.CacheStoreListenerRWThroughDisabledTransactionalCacheTest;
 import 
org.apache.ignite.cache.store.CacheStoreSessionListenerLifecycleSelfTest;
-import 
org.apache.ignite.cache.store.CacheStoreSessionListenerWriteBehindEnabledTest;
 import org.apache.ignite.cache.store.CacheStoreWithIgniteTxFailureTest;
 import 
org.apache.ignite.cache.store.jdbc.CacheJdbcStoreSessionListenerSelfTest;
 import 
org.apache.ignite.internal.processors.GridCacheTxLoadFromStoreOnLockSelfTest;
-import org.apache.ignite.internal.processors.cache.CacheClientStoreSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheConnectionLeakStoreTxTest;
 import org.apache.ignite.internal.processors.cache.CacheEventWithTxLabelTest;
 import 
org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticReadCommittedSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticRepeatableReadSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticSerializableSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticReadCommittedSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticRepeatableReadSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticSerializableSelfTest;
 import org.apache.ignite.internal.processors.cache.CacheGetRemoveSkipStoreTest;
-import 
org.apache.ignite.internal.processors.cache.CacheOffheapMapEntrySelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheReadThroughAtomicRestartSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheReadThroughReplicatedAtomicRestartSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheReadThroughReplicatedRestartSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheReadThroughRestartSelfTest;
 import org.apache.ignite.internal.processors.cache.CacheRemoveAllSelfTest;
 import org.apache.ignite.internal.processors.cache.CacheStopAndDestroySelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeDynamicStartAtomicTest;
-import 
org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeDynamicStartTxTest;
 import 
org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeStaticStartAtomicTest;
-import 
org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeStaticStartTxTest;
-import 
org.apache.ignite.internal.processors.cache.CacheTxNotAllowReadFromBackupTest;
 import org.apache.ignite.internal.processors.cache.CrossCacheLockTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheMarshallingNodeJoinSelfTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateAtomicNearEnabledSelfTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateAtomicSelfTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateNearEnabledSelfTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateSelfTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheProcessorActiveTxTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheStoreManagerDeserializationTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheVersionMultinodeTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicCopyOnReadDisabledTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearEnabledStoreValueTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearPeekModesTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPeekModesTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicReplicatedPeekModesTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicStoreValueTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheConfigurationDefaultTemplateTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheConfigurationTemplateTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheContainsKeyAtomicTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheDynamicStopSelfTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheInvokeReadThroughSingleNodeTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheInvokeReadThroughTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheReadThroughStoreCallTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheStartTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxCopyOnReadDisabledTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxNearEnabledStoreValueTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxNearPeekModesTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheTxPeekModesTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxPreloadNoWriteTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxReplicatedPeekModesTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheTxStoreValueTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteClientCacheInitializationFailTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDiscoDataHandlingInNewClusterTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheFilterTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheMultinodeTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartCoordinatorFailoverTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartFailTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartNoExchangeTimeoutTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartSelfTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartStopConcurrentTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheWithConfigStartSelfTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicClientCacheStartSelfTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteExchangeFutureHistoryTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteInternalCacheTypesTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteStartCacheInTransactionSelfTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteSystemCacheOnClientTest;
-import 
org.apache.ignite.internal.processors.cache.MarshallerCacheJobRunNodeRestartTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheAffinityEarlyTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.CacheDirectoryNameTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.CacheDiscoveryDataConcurrentJoinTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheGetFutureHangsSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.CacheGroupsPreloadTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheNoValueClassOnServerNodeTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheResultIsNotNullOnPartitionLossTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheStartOnJoinTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutMultiNodeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheFailedUpdateResponseTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheReadFromBackupTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheSingleGetMessageTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtTxPreloadSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheLockFailoverSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheMultiTxLockSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCrossCacheTxSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearTxPreloadSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheNearOnlyTxTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheNearReadCommittedTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.replicated.GridReplicatedTxPreloadTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicLoadAllTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicLoaderWriterTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNearEnabledNoReadThroughTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNearEnabledNoWriteThroughTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNoLoadPreviousValueTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNoReadThroughTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNoWriteThroughTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicStoreSessionTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicStoreSessionWriteBehindTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheJdbcBlobStoreNodeRestartTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxLoadAllTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxLoaderWriterTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNearEnabledNoLoadPreviousValueTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNearEnabledNoReadThroughTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNearEnabledNoWriteThroughTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNoLoadPreviousValueTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNoReadThroughTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNoWriteThroughTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxStoreSessionTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxStoreSessionWriteBehindCoalescingTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxStoreSessionWriteBehindTest;
-import 
org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedAtomicSelfTest;
 import 
org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedTransactionalSelfTest;
 import 
org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedAtomicSelfTest;
-import 
org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedTransactionalSelfTest;
-import 
org.apache.ignite.internal.processors.query.ScanQueriesTopologyMappingTest;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.DynamicSuite;
 import org.junit.runner.RunWith;
 
 /**
- * Test suite.
+ * Split off from {@link IgniteCacheTestSuite4} to reduce the single-suite 
runtime in CI;
+ * contains an independent subset of the same test classes.
  */
 @RunWith(DynamicSuite.class)
-public class IgniteCacheTestSuite4 {
+public class IgniteCacheTestSuite18 {
     /**
-     * @return IgniteCache test suite.
+     * @return Test suite.
      */
     public static List<Class<?>> suite() {
         return suite(null);
@@ -167,173 +105,68 @@ public class IgniteCacheTestSuite4 {
     public static List<Class<?>> suite(Collection<Class> ignoredTests) {
         List<Class<?>> suite = new ArrayList<>();
 
-        // Multi node update.
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateNearEnabledSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateAtomicSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicLoadAllTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, IgniteCacheTxLoadAllTest.class, 
ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicLoaderWriterTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxLoaderWriterTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicStoreSessionTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxStoreSessionTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicStoreSessionWriteBehindTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxStoreSessionWriteBehindTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxStoreSessionWriteBehindCoalescingTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNoReadThroughTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearEnabledNoReadThroughTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNoReadThroughTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearEnabledNoReadThroughTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheGetRemoveSkipStoreTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNoLoadPreviousValueTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNoLoadPreviousValueTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearEnabledNoLoadPreviousValueTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNoWriteThroughTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearEnabledNoWriteThroughTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNoWriteThroughTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearEnabledNoWriteThroughTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicPeekModesTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearPeekModesTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicReplicatedPeekModesTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheTxPeekModesTest.class, 
ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearPeekModesTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxReplicatedPeekModesTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheInvokeReadThroughSingleNodeTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheInvokeReadThroughTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheReadThroughStoreCallTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheVersionMultinodeTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheNearReadCommittedTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicCopyOnReadDisabledTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxCopyOnReadDisabledTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxPreloadNoWriteTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheMultinodeTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartFailTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartCoordinatorFailoverTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheWithConfigStartSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheDynamicStopSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartStopConcurrentTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheConfigurationTemplateTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheConfigurationDefaultTemplateTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicClientCacheStartSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartNoExchangeTimeoutTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, CacheAffinityEarlyTest.class, 
ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheCreatePutMultiNodeSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, IgniteCacheCreatePutTest.class, 
ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, CacheStartOnJoinTest.class, 
ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, IgniteCacheStartTest.class, 
ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDiscoDataHandlingInNewClusterTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheDiscoveryDataConcurrentJoinTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteClientCacheInitializationFailTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
ScanQueriesTopologyMappingTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheFailedUpdateResponseTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheTxLoadFromStoreOnLockSelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheMarshallingNodeJoinSelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheJdbcBlobStoreNodeRestartTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicStoreValueTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearEnabledStoreValueTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxStoreValueTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearEnabledStoreValueTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheLockFailoverSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheMultiTxLockSelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteInternalCacheTypesTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteExchangeFutureHistoryTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CacheNoValueClassOnServerNodeTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteSystemCacheOnClientTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, CacheRemoveAllSelfTest.class, 
ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryOptimisticReadCommittedSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryOptimisticRepeatableReadSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryOptimisticSerializableSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryPessimisticReadCommittedSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryPessimisticRepeatableReadSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryPessimisticSerializableSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheTxNotAllowReadFromBackupTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CacheStopAndDestroySelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CacheOffheapMapEntrySelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CacheJdbcStoreSessionListenerSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreSessionListenerLifecycleSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreListenerRWThroughDisabledAtomicCacheTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreListenerRWThroughDisabledTransactionalCacheTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreSessionListenerWriteBehindEnabledTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreWithIgniteTxFailureTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, CacheClientStoreSelfTest.class, 
ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreUsageMultinodeStaticStartAtomicTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreUsageMultinodeStaticStartTxTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreUsageMultinodeDynamicStartAtomicTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreUsageMultinodeDynamicStartTxTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheConnectionLeakStoreTxTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheStoreManagerDeserializationTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteStartCacheInTransactionSelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CacheReadThroughRestartSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheReadThroughReplicatedRestartSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheReadThroughReplicatedAtomicRestartSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheReadThroughAtomicRestartSelfTest.class, ignoredTests);
-
-        // Versioned entry tests
-        GridTestUtils.addTestIfNeeded(suite, 
CacheVersionedEntryPartitionedAtomicSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheVersionedEntryPartitionedTransactionalSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheVersionedEntryReplicatedAtomicSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheVersionedEntryReplicatedTransactionalSelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheDhtTxPreloadSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheNearTxPreloadSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridReplicatedTxPreloadTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, CacheGroupsPreloadTest.class, 
ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheFilterTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, CrossCacheLockTest.class, 
ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, IgniteCrossCacheTxSelfTest.class, 
ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CacheGetFutureHangsSelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheSingleGetMessageTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheReadFromBackupTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
MarshallerCacheJobRunNodeRestartTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheNearOnlyTxTest.class, 
ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheContainsKeyAtomicTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CacheResultIsNotNullOnPartitionLossTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, CacheEventWithTxLabelTest.class, 
ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheProcessorActiveTxTest.class, ignoredTests);
 
-        GridTestUtils.addTestIfNeeded(suite, CacheDirectoryNameTest.class, 
ignoredTests);
-
         return suite;
     }
 }
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite8.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite19.java
similarity index 90%
copy from 
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite8.java
copy to 
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite19.java
index 7e238e85f0b..686ef4aa7b2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite8.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite19.java
@@ -38,12 +38,13 @@ import org.apache.ignite.testframework.junits.DynamicSuite;
 import org.junit.runner.RunWith;
 
 /**
- * Test suite.
+ * Split off from {@link IgniteCacheTestSuite8} to reduce the single-suite 
runtime in CI;
+ * contains an independent subset of the same test classes.
  */
 @RunWith(DynamicSuite.class)
-public class IgniteCacheTestSuite8 {
+public class IgniteCacheTestSuite19 {
     /**
-     * @return IgniteCache test suite.
+     * @return Test suite.
      */
     public static List<Class<?>> suite() {
         return suite(null);
@@ -56,19 +57,10 @@ public class IgniteCacheTestSuite8 {
     public static List<Class<?>> suite(Collection<Class> ignoredTests) {
         List<Class<?>> suite = new ArrayList<>();
 
-        // Cache metrics.
-        suite.addAll(IgniteCacheMetricsSelfTestSuite.suite(ignoredTests));
-
-        // Topology validator.
-        suite.addAll(IgniteTopologyValidatorTestSuite.suite(ignoredTests));
-
         // Eviction.
         suite.addAll(IgniteCacheEvictionSelfTestSuite.suite(ignoredTests));
 
-        // Iterators.
-        suite.addAll(IgniteCacheIteratorsSelfTestSuite.suite(ignoredTests));
-
-        // Rebalancing.
+        // Rebalancing and other cache tests.
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheOrderedPreloadingSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalanceOrderTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalancingSyncSelfTest.class, ignoredTests);
@@ -78,12 +70,9 @@ public class IgniteCacheTestSuite8 {
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalancingCancelTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, MultiDcRebalancingTest.class, 
ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreTxPutAllMultiNodeTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CleanupRestoredCachesSlowTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
ClientCreateCacheGroupOnJoinNodeMapsTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCachePutKeyAttachedBinaryObjectTest.class, ignoredTests);
 
         return suite;
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index bce6d557f1b..bef893765b2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -20,128 +20,67 @@ package org.apache.ignite.testsuites;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import 
org.apache.ignite.cache.store.CacheStoreListenerRWThroughDisabledAtomicCacheTest;
 import 
org.apache.ignite.cache.store.CacheStoreListenerRWThroughDisabledTransactionalCacheTest;
-import 
org.apache.ignite.cache.store.CacheStoreSessionListenerLifecycleSelfTest;
 import 
org.apache.ignite.cache.store.CacheStoreSessionListenerWriteBehindEnabledTest;
-import org.apache.ignite.cache.store.CacheStoreWithIgniteTxFailureTest;
-import 
org.apache.ignite.cache.store.jdbc.CacheJdbcStoreSessionListenerSelfTest;
-import 
org.apache.ignite.internal.processors.GridCacheTxLoadFromStoreOnLockSelfTest;
 import org.apache.ignite.internal.processors.cache.CacheClientStoreSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheConnectionLeakStoreTxTest;
-import org.apache.ignite.internal.processors.cache.CacheEventWithTxLabelTest;
-import 
org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticReadCommittedSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticRepeatableReadSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheGetEntryOptimisticSerializableSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticReadCommittedSelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticRepeatableReadSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheGetEntryPessimisticSerializableSelfTest;
-import org.apache.ignite.internal.processors.cache.CacheGetRemoveSkipStoreTest;
 import 
org.apache.ignite.internal.processors.cache.CacheOffheapMapEntrySelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheReadThroughAtomicRestartSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheReadThroughReplicatedAtomicRestartSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheReadThroughReplicatedRestartSelfTest;
 import 
org.apache.ignite.internal.processors.cache.CacheReadThroughRestartSelfTest;
-import org.apache.ignite.internal.processors.cache.CacheRemoveAllSelfTest;
-import org.apache.ignite.internal.processors.cache.CacheStopAndDestroySelfTest;
-import 
org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeDynamicStartAtomicTest;
 import 
org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeDynamicStartTxTest;
-import 
org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeStaticStartAtomicTest;
 import 
org.apache.ignite.internal.processors.cache.CacheStoreUsageMultinodeStaticStartTxTest;
 import 
org.apache.ignite.internal.processors.cache.CacheTxNotAllowReadFromBackupTest;
-import org.apache.ignite.internal.processors.cache.CrossCacheLockTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheMarshallingNodeJoinSelfTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateAtomicNearEnabledSelfTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateAtomicSelfTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateNearEnabledSelfTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheMultinodeUpdateSelfTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheProcessorActiveTxTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheStoreManagerDeserializationTest;
 import 
org.apache.ignite.internal.processors.cache.GridCacheVersionMultinodeTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicCopyOnReadDisabledTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearEnabledStoreValueTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicNearPeekModesTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPeekModesTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicReplicatedPeekModesTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheAtomicStoreValueTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheConfigurationDefaultTemplateTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheConfigurationTemplateTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheContainsKeyAtomicTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheDynamicStopSelfTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheInvokeReadThroughSingleNodeTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheInvokeReadThroughTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheReadThroughStoreCallTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheStartTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxCopyOnReadDisabledTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxNearEnabledStoreValueTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxNearPeekModesTest;
-import org.apache.ignite.internal.processors.cache.IgniteCacheTxPeekModesTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxPreloadNoWriteTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheTxReplicatedPeekModesTest;
 import org.apache.ignite.internal.processors.cache.IgniteCacheTxStoreValueTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteClientCacheInitializationFailTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDiscoDataHandlingInNewClusterTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheFilterTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheMultinodeTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartCoordinatorFailoverTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartFailTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartNoExchangeTimeoutTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartSelfTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheStartStopConcurrentTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteDynamicCacheWithConfigStartSelfTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteDynamicClientCacheStartSelfTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteExchangeFutureHistoryTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteInternalCacheTypesTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteStartCacheInTransactionSelfTest;
 import 
org.apache.ignite.internal.processors.cache.IgniteSystemCacheOnClientTest;
 import 
org.apache.ignite.internal.processors.cache.MarshallerCacheJobRunNodeRestartTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.CacheAffinityEarlyTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheDirectoryNameTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheDiscoveryDataConcurrentJoinTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.CacheGetFutureHangsSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.CacheGroupsPreloadTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.CacheNoValueClassOnServerNodeTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.CacheResultIsNotNullOnPartitionLossTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.CacheStartOnJoinTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutMultiNodeSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheFailedUpdateResponseTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheReadFromBackupTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheSingleGetMessageTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtTxPreloadSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheLockFailoverSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheMultiTxLockSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCrossCacheTxSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearTxPreloadSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheNearOnlyTxTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheNearReadCommittedTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.replicated.GridReplicatedTxPreloadTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicLoadAllTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicLoaderWriterTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNearEnabledNoReadThroughTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNearEnabledNoWriteThroughTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNoLoadPreviousValueTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNoReadThroughTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicNoWriteThroughTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicStoreSessionTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheAtomicStoreSessionWriteBehindTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheJdbcBlobStoreNodeRestartTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxLoadAllTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxLoaderWriterTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNearEnabledNoLoadPreviousValueTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNearEnabledNoReadThroughTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNearEnabledNoWriteThroughTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNoLoadPreviousValueTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNoReadThroughTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxNoWriteThroughTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxStoreSessionTest;
 import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxStoreSessionWriteBehindCoalescingTest;
-import 
org.apache.ignite.internal.processors.cache.integration.IgniteCacheTxStoreSessionWriteBehindTest;
 import 
org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedAtomicSelfTest;
-import 
org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryPartitionedTransactionalSelfTest;
-import 
org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedAtomicSelfTest;
 import 
org.apache.ignite.internal.processors.cache.version.CacheVersionedEntryReplicatedTransactionalSelfTest;
 import 
org.apache.ignite.internal.processors.query.ScanQueriesTopologyMappingTest;
 import org.apache.ignite.testframework.GridTestUtils;
@@ -154,7 +93,7 @@ import org.junit.runner.RunWith;
 @RunWith(DynamicSuite.class)
 public class IgniteCacheTestSuite4 {
     /**
-     * @return IgniteCache test suite.
+     * @return Test suite.
      */
     public static List<Class<?>> suite() {
         return suite(null);
@@ -167,171 +106,68 @@ public class IgniteCacheTestSuite4 {
     public static List<Class<?>> suite(Collection<Class> ignoredTests) {
         List<Class<?>> suite = new ArrayList<>();
 
-        // Multi node update.
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateNearEnabledSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateAtomicSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicLoadAllTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheTxLoadAllTest.class, 
ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicLoaderWriterTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxLoaderWriterTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicStoreSessionTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxStoreSessionTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicStoreSessionWriteBehindTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxStoreSessionWriteBehindTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxStoreSessionWriteBehindCoalescingTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNoReadThroughTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearEnabledNoReadThroughTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNoReadThroughTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearEnabledNoReadThroughTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheGetRemoveSkipStoreTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNoLoadPreviousValueTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNoLoadPreviousValueTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearEnabledNoLoadPreviousValueTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNoWriteThroughTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearEnabledNoWriteThroughTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNoWriteThroughTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearEnabledNoWriteThroughTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicPeekModesTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearPeekModesTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicReplicatedPeekModesTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, IgniteCacheTxPeekModesTest.class, 
ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearPeekModesTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxReplicatedPeekModesTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheInvokeReadThroughSingleNodeTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheInvokeReadThroughTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheReadThroughStoreCallTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheVersionMultinodeTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheNearReadCommittedTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicCopyOnReadDisabledTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxCopyOnReadDisabledTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxPreloadNoWriteTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheMultinodeTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartFailTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartCoordinatorFailoverTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheWithConfigStartSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheDynamicStopSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartStopConcurrentTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheConfigurationTemplateTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheConfigurationDefaultTemplateTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicClientCacheStartSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheStartNoExchangeTimeoutTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, CacheAffinityEarlyTest.class, 
ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheCreatePutMultiNodeSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheCreatePutTest.class, 
ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, CacheStartOnJoinTest.class, 
ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCacheStartTest.class, 
ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteDiscoDataHandlingInNewClusterTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheDiscoveryDataConcurrentJoinTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteClientCacheInitializationFailTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
ScanQueriesTopologyMappingTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheFailedUpdateResponseTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheTxLoadFromStoreOnLockSelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheMarshallingNodeJoinSelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheJdbcBlobStoreNodeRestartTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicStoreValueTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheAtomicNearEnabledStoreValueTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxStoreValueTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheTxNearEnabledStoreValueTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheLockFailoverSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheMultiTxLockSelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteInternalCacheTypesTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteExchangeFutureHistoryTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CacheNoValueClassOnServerNodeTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
IgniteSystemCacheOnClientTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, CacheRemoveAllSelfTest.class, 
ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryOptimisticReadCommittedSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryOptimisticRepeatableReadSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryOptimisticSerializableSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryPessimisticReadCommittedSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryPessimisticRepeatableReadSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheGetEntryPessimisticSerializableSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheTxNotAllowReadFromBackupTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStopAndDestroySelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CacheOffheapMapEntrySelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CacheJdbcStoreSessionListenerSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreSessionListenerLifecycleSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreListenerRWThroughDisabledAtomicCacheTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreListenerRWThroughDisabledTransactionalCacheTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreSessionListenerWriteBehindEnabledTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreWithIgniteTxFailureTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, CacheClientStoreSelfTest.class, 
ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreUsageMultinodeStaticStartAtomicTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreUsageMultinodeStaticStartTxTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreUsageMultinodeDynamicStartAtomicTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheStoreUsageMultinodeDynamicStartTxTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheConnectionLeakStoreTxTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheStoreManagerDeserializationTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteStartCacheInTransactionSelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
CacheReadThroughRestartSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheReadThroughReplicatedRestartSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheReadThroughReplicatedAtomicRestartSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheReadThroughAtomicRestartSelfTest.class, ignoredTests);
-
-        // Versioned entry tests
         GridTestUtils.addTestIfNeeded(suite, 
CacheVersionedEntryPartitionedAtomicSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheVersionedEntryPartitionedTransactionalSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
CacheVersionedEntryReplicatedAtomicSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
CacheVersionedEntryReplicatedTransactionalSelfTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheDhtTxPreloadSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, 
GridCacheNearTxPreloadSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridReplicatedTxPreloadTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, CacheGroupsPreloadTest.class, 
ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
IgniteDynamicCacheFilterTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, CrossCacheLockTest.class, 
ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, IgniteCrossCacheTxSelfTest.class, 
ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CacheGetFutureHangsSelfTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheSingleGetMessageTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheReadFromBackupTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, 
MarshallerCacheJobRunNodeRestartTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, IgniteCacheNearOnlyTxTest.class, 
ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCacheContainsKeyAtomicTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CacheResultIsNotNullOnPartitionLossTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, CacheEventWithTxLabelTest.class, 
ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheProcessorActiveTxTest.class, ignoredTests);
-
         GridTestUtils.addTestIfNeeded(suite, CacheDirectoryNameTest.class, 
ignoredTests);
 
         return suite;
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite8.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite8.java
index 7e238e85f0b..2c0d0a796d8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite8.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite8.java
@@ -20,20 +20,6 @@ package org.apache.ignite.testsuites;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.apache.ignite.cache.ClientCreateCacheGroupOnJoinNodeMapsTest;
-import 
org.apache.ignite.internal.processors.cache.CacheStoreTxPutAllMultiNodeTest;
-import 
org.apache.ignite.internal.processors.cache.GridCacheOrderedPreloadingSelfTest;
-import 
org.apache.ignite.internal.processors.cache.IgniteCachePutKeyAttachedBinaryObjectTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRabalancingDelayedPartitionMapExchangeSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalanceOrderTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingAsyncSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingCancelTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingSyncCheckDataTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingSyncSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.rebalancing.GridCacheRebalancingUnmarshallingFailedSelfTest;
-import 
org.apache.ignite.internal.processors.cache.distributed.rebalancing.MultiDcRebalancingTest;
-import 
org.apache.ignite.internal.processors.cache.persistence.CleanupRestoredCachesSlowTest;
-import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.DynamicSuite;
 import org.junit.runner.RunWith;
 
@@ -62,30 +48,9 @@ public class IgniteCacheTestSuite8 {
         // Topology validator.
         suite.addAll(IgniteTopologyValidatorTestSuite.suite(ignoredTests));
 
-        // Eviction.
-        suite.addAll(IgniteCacheEvictionSelfTestSuite.suite(ignoredTests));
-
         // Iterators.
         suite.addAll(IgniteCacheIteratorsSelfTestSuite.suite(ignoredTests));
 
-        // Rebalancing.
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheOrderedPreloadingSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalanceOrderTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalancingSyncSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalancingSyncCheckDataTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalancingUnmarshallingFailedSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalancingAsyncSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
GridCacheRebalancingCancelTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, MultiDcRebalancingTest.class, 
ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CacheStoreTxPutAllMultiNodeTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
CleanupRestoredCachesSlowTest.class, ignoredTests);
-        GridTestUtils.addTestIfNeeded(suite, 
ClientCreateCacheGroupOnJoinNodeMapsTest.class, ignoredTests);
-
-        GridTestUtils.addTestIfNeeded(suite, 
IgniteCachePutKeyAttachedBinaryObjectTest.class, ignoredTests);
-
         return suite;
     }
 }

(ignite) branch master updated: IGNITE-28829 Split more overloaded test suites to bring RunAll suites under ~30 minutes (#13289)

Reply via email to