diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java
index e6da699b05ffe..e9f80ae26bef3 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java
@@ -17,7 +17,10 @@
 
 package org.apache.ignite.spi.discovery.tcp;
 
+import java.util.Arrays;
 import java.util.concurrent.Callable;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.ssl.SslContextFactory;
@@ -104,6 +107,27 @@ public void testOneCommonCipherSuite() throws Exception {
      */
     @Test
     public void testNoCommonCipherSuite() throws Exception {
+        String[] tlsVers = {"TLSv1.2", "TLSv1.3"};
+
+        for (String tlsVer : tlsVers) {
+            try {
+                SSLContext ctx = SSLContext.getInstance(tlsVer);
+                ctx.init(null, null, null);
+                SSLSocketFactory factory = ctx.getSocketFactory();
+
+                String[] ciphers = factory.getDefaultCipherSuites();
+                System.out.println("\n" + tlsVer + " — Default ciphers (" + ciphers.length + "):");
+                Arrays.stream(ciphers).sorted().forEach(cipher -> System.out.println("  " + cipher));
+
+                ciphers = factory.getSupportedCipherSuites();
+                System.out.println("\n" + tlsVer + " — Supported ciphers (" + ciphers.length + "):");
+                Arrays.stream(ciphers).sorted().forEach(cipher -> System.out.println("  " + cipher));
+            }
+            catch (Exception e) {
+                System.err.println("Error for " + tlsVer + ": " + e.getMessage());
+            }
+        }
+
         checkDiscoveryFailure(
             new String[][] {
                 new String[] {
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 c3587ca0b3cbb..9ecfc37e006a1 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
@@ -33,6 +33,7 @@
 import org.apache.ignite.internal.GridStartStopSelfTest;
 import org.apache.ignite.internal.GridStopWithCancelSelfTest;
 import org.apache.ignite.internal.GridStopWithCollisionSpiTest;
+import org.apache.ignite.internal.IgniteDiscoveryMassiveNodeFailTest;
 import org.apache.ignite.internal.IgniteLocalNodeMapBeforeStartTest;
 import org.apache.ignite.internal.IgniteSlowClientDetectionSelfTest;
 import org.apache.ignite.internal.TransactionsMXBeanImplTest;
@@ -41,6 +42,7 @@
 import org.apache.ignite.internal.managers.communication.CompressedMessageTest;
 import org.apache.ignite.internal.managers.communication.DefaultEnumMapperTest;
 import org.apache.ignite.internal.managers.communication.ErrorMessageSelfTest;
+import org.apache.ignite.internal.managers.discovery.IgniteDiscoveryMessageSerializationTest;
 import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentV2Test;
 import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentV2TestNoOptimizations;
 import org.apache.ignite.internal.processors.affinity.GridAffinityProcessorRendezvousSelfTest;
@@ -68,7 +70,74 @@
 import org.apache.ignite.messaging.GridMessagingSelfTest;
 import org.apache.ignite.messaging.IgniteMessagingSendAsyncTest;
 import org.apache.ignite.messaging.IgniteMessagingWithClientTest;
+import org.apache.ignite.spi.ExponentialBackoffTimeoutStrategyTest;
 import org.apache.ignite.spi.GridSpiLocalHostInjectionTest;
+import org.apache.ignite.spi.GridTcpSpiForwardingSelfTest;
+import org.apache.ignite.spi.discovery.AuthenticationRestartTest;
+import org.apache.ignite.spi.discovery.DiscoverySpiDataExchangeTest;
+import org.apache.ignite.spi.discovery.FilterDataForClientNodeDiscoveryTest;
+import org.apache.ignite.spi.discovery.IgniteClientReconnectEventHandlingTest;
+import org.apache.ignite.spi.discovery.IgniteDiscoveryCacheReuseSelfTest;
+import org.apache.ignite.spi.discovery.LongClientConnectToClusterTest;
+import org.apache.ignite.spi.discovery.datacenter.MultiDataCenterClientRoutingTest;
+import org.apache.ignite.spi.discovery.datacenter.MultiDataCenterDeploymentTest;
+import org.apache.ignite.spi.discovery.tcp.DiscoveryClientSocketTest;
+import org.apache.ignite.spi.discovery.tcp.DiscoveryUnmarshalVulnerabilityTest;
+import org.apache.ignite.spi.discovery.tcp.IgniteClientConnectSslTest;
+import org.apache.ignite.spi.discovery.tcp.IgniteClientConnectTest;
+import org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownSslTest;
+import org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownTest;
+import org.apache.ignite.spi.discovery.tcp.IgniteMetricsOverflowTest;
+import org.apache.ignite.spi.discovery.tcp.MultiDataCenterRingTest;
+import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoveryMarshallerCheckSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiCoordinatorChangeTest;
+import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiFailureTimeoutSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiMulticastTest;
+import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoveryUnresolvedHostTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryClientSuspensionSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryConcurrentStartTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryCoordinatorFailureTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryDeadNodeAddressResolvingTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryFailedJoinTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryIpFinderCleanerTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryIpFinderFailureTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMdcSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMetricsWarnLogTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMultiThreadedTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNetworkIssuesTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNodeAttributesUpdateOnReconnectTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNodeConfigConsistentIdSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNodeConsistentIdSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNodeJoinAndFailureTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryPendingMessageDeliveryMdcReversedTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryPendingMessageDeliveryMdcTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryPendingMessageDeliveryTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryReconnectUnstableTopologyTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryRestartTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySegmentationPolicyTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySnapshotHistoryTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiConfigSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiFailureTimeoutSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiMBeanTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiReconnectDelayTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiSslSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiStartStopSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiWildcardSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslSecuredUnsecuredTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslTrustedSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslTrustedUntrustedTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryWithAddressFilterTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryWithWrongServerTest;
+import org.apache.ignite.spi.discovery.tcp.TestMetricUpdateFailure;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinderSelfTest;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinderSelfTest;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinderSelfTest;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinderDnsResolveTest;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinderSelfTest;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTestSelfTest;
 import org.apache.ignite.testframework.junits.multijvm.JavaVersionCommandParserTest;
 import org.junit.runner.RunWith;
@@ -151,7 +220,108 @@
     ErrorMessageSelfTest.class,
     DefaultEnumMapperTest.class,
     IgniteDataTransferObjectProcessorTest.class,
-    CompressedMessageTest.class
+    CompressedMessageTest.class,
+    TcpDiscoveryVmIpFinderDnsResolveTest.class,
+    TcpDiscoveryVmIpFinderSelfTest.class,
+    TcpDiscoverySharedFsIpFinderSelfTest.class,
+    TcpDiscoveryJdbcIpFinderSelfTest.class,
+    TcpDiscoveryMulticastIpFinderSelfTest.class,
+    TcpDiscoveryIpFinderCleanerTest.class,
+
+    TcpDiscoverySelfTest.class,
+    TcpDiscoverySpiSelfTest.class,
+    TcpDiscoverySpiSslSelfTest.class,
+    TcpDiscoverySpiWildcardSelfTest.class,
+    TcpDiscoverySpiFailureTimeoutSelfTest.class,
+    TcpDiscoverySpiMBeanTest.class,
+    TcpDiscoverySpiStartStopSelfTest.class,
+    TcpDiscoverySpiConfigSelfTest.class,
+    TcpDiscoverySnapshotHistoryTest.class,
+    TcpDiscoveryNodeJoinAndFailureTest.class,
+
+    GridTcpSpiForwardingSelfTest.class,
+
+    ExponentialBackoffTimeoutStrategyTest.class,
+
+    TcpClientDiscoverySpiSelfTest.class,
+    LongClientConnectToClusterTest.class,
+    TcpClientDiscoveryMarshallerCheckSelfTest.class,
+    TcpClientDiscoverySpiCoordinatorChangeTest.class,
+    TcpClientDiscoverySpiMulticastTest.class,
+    TcpClientDiscoverySpiFailureTimeoutSelfTest.class,
+    TcpClientDiscoveryUnresolvedHostTest.class,
+
+    TcpDiscoveryNodeConsistentIdSelfTest.class,
+    TcpDiscoveryNodeConfigConsistentIdSelfTest.class,
+
+    TcpDiscoveryRestartTest.class,
+    TcpDiscoveryMultiThreadedTest.class,
+    TcpDiscoveryMetricsWarnLogTest.class,
+    TcpDiscoveryConcurrentStartTest.class,
+
+    TcpDiscoverySegmentationPolicyTest.class,
+
+    TcpDiscoveryNodeAttributesUpdateOnReconnectTest.class,
+    AuthenticationRestartTest.class,
+
+    TcpDiscoveryWithWrongServerTest.class,
+
+    TcpDiscoveryWithAddressFilterTest.class,
+
+    TcpDiscoverySpiReconnectDelayTest.class,
+
+    TcpDiscoveryNetworkIssuesTest.class,
+
+    IgniteDiscoveryMassiveNodeFailTest.class,
+    TcpDiscoveryCoordinatorFailureTest.class,
+
+    TestMetricUpdateFailure.class,
+
+    // Client connect.
+    IgniteClientConnectTest.class,
+    IgniteClientConnectSslTest.class,
+    IgniteClientReconnectMassiveShutdownTest.class,
+    IgniteClientReconnectMassiveShutdownSslTest.class,
+    TcpDiscoveryClientSuspensionSelfTest.class,
+    IgniteClientReconnectEventHandlingTest.class,
+
+    TcpDiscoveryFailedJoinTest.class,
+
+    // SSL.
+    TcpDiscoverySslSelfTest.class,
+    TcpDiscoverySslTrustedSelfTest.class,
+    TcpDiscoverySslSecuredUnsecuredTest.class,
+    TcpDiscoverySslTrustedUntrustedTest.class,
+    // Disco cache reuse.
+    IgniteDiscoveryCacheReuseSelfTest.class,
+
+    DiscoveryUnmarshalVulnerabilityTest.class,
+
+    FilterDataForClientNodeDiscoveryTest.class,
+
+    TcpDiscoveryPendingMessageDeliveryTest.class,
+
+    TcpDiscoveryReconnectUnstableTopologyTest.class,
+
+    IgniteMetricsOverflowTest.class,
+
+    DiscoveryClientSocketTest.class,
+
+    DiscoverySpiDataExchangeTest.class,
+
+    TcpDiscoveryIpFinderFailureTest.class,
+
+    TcpDiscoveryDeadNodeAddressResolvingTest.class,
+
+    // MDC.
+    TcpDiscoveryMdcSelfTest.class,
+    TcpDiscoveryPendingMessageDeliveryMdcTest.class,
+    TcpDiscoveryPendingMessageDeliveryMdcReversedTest.class,
+    MultiDataCenterDeploymentTest.class,
+    MultiDataCenterRingTest.class,
+    MultiDataCenterClientRoutingTest.class,
+
+    IgniteDiscoveryMessageSerializationTest.class
 })
 public class IgniteBasicTestSuite {
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
index af3cd558edddc..9b182211ebbc1 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
@@ -17,76 +17,7 @@
 
 package org.apache.ignite.testsuites;
 
-import org.apache.ignite.internal.IgniteDiscoveryMassiveNodeFailTest;
-import org.apache.ignite.internal.managers.discovery.IgniteDiscoveryMessageSerializationTest;
-import org.apache.ignite.spi.ExponentialBackoffTimeoutStrategyTest;
-import org.apache.ignite.spi.GridTcpSpiForwardingSelfTest;
-import org.apache.ignite.spi.discovery.AuthenticationRestartTest;
-import org.apache.ignite.spi.discovery.DiscoverySpiDataExchangeTest;
-import org.apache.ignite.spi.discovery.FilterDataForClientNodeDiscoveryTest;
-import org.apache.ignite.spi.discovery.IgniteClientReconnectEventHandlingTest;
-import org.apache.ignite.spi.discovery.IgniteDiscoveryCacheReuseSelfTest;
-import org.apache.ignite.spi.discovery.LongClientConnectToClusterTest;
-import org.apache.ignite.spi.discovery.datacenter.MultiDataCenterClientRoutingTest;
-import org.apache.ignite.spi.discovery.datacenter.MultiDataCenterDeploymentTest;
-import org.apache.ignite.spi.discovery.tcp.DiscoveryClientSocketTest;
-import org.apache.ignite.spi.discovery.tcp.DiscoveryUnmarshalVulnerabilityTest;
-import org.apache.ignite.spi.discovery.tcp.IgniteClientConnectSslTest;
-import org.apache.ignite.spi.discovery.tcp.IgniteClientConnectTest;
-import org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownSslTest;
-import org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownTest;
-import org.apache.ignite.spi.discovery.tcp.IgniteMetricsOverflowTest;
-import org.apache.ignite.spi.discovery.tcp.MultiDataCenterRingTest;
-import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoveryMarshallerCheckSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiCoordinatorChangeTest;
-import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiFailureTimeoutSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiMulticastTest;
-import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoveryUnresolvedHostTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryClientSuspensionSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryConcurrentStartTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryCoordinatorFailureTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryDeadNodeAddressResolvingTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryFailedJoinTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryIpFinderCleanerTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryIpFinderFailureTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMdcSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMetricsWarnLogTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMultiThreadedTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNetworkIssuesTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNodeAttributesUpdateOnReconnectTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNodeConfigConsistentIdSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNodeConsistentIdSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryNodeJoinAndFailureTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryPendingMessageDeliveryMdcReversedTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryPendingMessageDeliveryMdcTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryPendingMessageDeliveryTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryReconnectUnstableTopologyTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryRestartTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySegmentationPolicyTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySnapshotHistoryTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiConfigSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiFailureTimeoutSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiMBeanTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiReconnectDelayTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiSslSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiStartStopSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiWildcardSelfTest;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslParametersTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslSecuredUnsecuredTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslTrustedSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslTrustedUntrustedTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryWithAddressFilterTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryWithWrongServerTest;
-import org.apache.ignite.spi.discovery.tcp.TestMetricUpdateFailure;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinderSelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinderSelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinderSelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinderDnsResolveTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinderSelfTest;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
@@ -99,109 +30,7 @@
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    TcpDiscoveryVmIpFinderDnsResolveTest.class,
-    TcpDiscoveryVmIpFinderSelfTest.class,
-    TcpDiscoverySharedFsIpFinderSelfTest.class,
-    TcpDiscoveryJdbcIpFinderSelfTest.class,
-    TcpDiscoveryMulticastIpFinderSelfTest.class,
-    TcpDiscoveryIpFinderCleanerTest.class,
-
-    TcpDiscoverySelfTest.class,
-    TcpDiscoverySpiSelfTest.class,
-    TcpDiscoverySpiSslSelfTest.class,
-    TcpDiscoverySpiWildcardSelfTest.class,
-    TcpDiscoverySpiFailureTimeoutSelfTest.class,
-    TcpDiscoverySpiMBeanTest.class,
-    TcpDiscoverySpiStartStopSelfTest.class,
-    TcpDiscoverySpiConfigSelfTest.class,
-    TcpDiscoverySnapshotHistoryTest.class,
-    TcpDiscoveryNodeJoinAndFailureTest.class,
-
-    GridTcpSpiForwardingSelfTest.class,
-
-    ExponentialBackoffTimeoutStrategyTest.class,
-
-    TcpClientDiscoverySpiSelfTest.class,
-    LongClientConnectToClusterTest.class,
-    TcpClientDiscoveryMarshallerCheckSelfTest.class,
-    TcpClientDiscoverySpiCoordinatorChangeTest.class,
-    TcpClientDiscoverySpiMulticastTest.class,
-    TcpClientDiscoverySpiFailureTimeoutSelfTest.class,
-    TcpClientDiscoveryUnresolvedHostTest.class,
-
-    TcpDiscoveryNodeConsistentIdSelfTest.class,
-    TcpDiscoveryNodeConfigConsistentIdSelfTest.class,
-
-    TcpDiscoveryRestartTest.class,
-    TcpDiscoveryMultiThreadedTest.class,
-    TcpDiscoveryMetricsWarnLogTest.class,
-    TcpDiscoveryConcurrentStartTest.class,
-
-    TcpDiscoverySegmentationPolicyTest.class,
-
-    TcpDiscoveryNodeAttributesUpdateOnReconnectTest.class,
-    AuthenticationRestartTest.class,
-
-    TcpDiscoveryWithWrongServerTest.class,
-
-    TcpDiscoveryWithAddressFilterTest.class,
-
-    TcpDiscoverySpiReconnectDelayTest.class,
-
-    TcpDiscoveryNetworkIssuesTest.class,
-
-    IgniteDiscoveryMassiveNodeFailTest.class,
-    TcpDiscoveryCoordinatorFailureTest.class,
-
-    TestMetricUpdateFailure.class,
-
-    // Client connect.
-    IgniteClientConnectTest.class,
-    IgniteClientConnectSslTest.class,
-    IgniteClientReconnectMassiveShutdownTest.class,
-    IgniteClientReconnectMassiveShutdownSslTest.class,
-    TcpDiscoveryClientSuspensionSelfTest.class,
-    IgniteClientReconnectEventHandlingTest.class,
-
-    TcpDiscoveryFailedJoinTest.class,
-
-    // SSL.
-    TcpDiscoverySslSelfTest.class,
-    TcpDiscoverySslTrustedSelfTest.class,
-    TcpDiscoverySslSecuredUnsecuredTest.class,
-    TcpDiscoverySslTrustedUntrustedTest.class,
     TcpDiscoverySslParametersTest.class,
-
-    // Disco cache reuse.
-    IgniteDiscoveryCacheReuseSelfTest.class,
-
-    DiscoveryUnmarshalVulnerabilityTest.class,
-
-    FilterDataForClientNodeDiscoveryTest.class,
-
-    TcpDiscoveryPendingMessageDeliveryTest.class,
-
-    TcpDiscoveryReconnectUnstableTopologyTest.class,
-
-    IgniteMetricsOverflowTest.class,
-
-    DiscoveryClientSocketTest.class,
-
-    DiscoverySpiDataExchangeTest.class,
-
-    TcpDiscoveryIpFinderFailureTest.class,
-
-    TcpDiscoveryDeadNodeAddressResolvingTest.class,
-
-    // MDC.
-    TcpDiscoveryMdcSelfTest.class,
-    TcpDiscoveryPendingMessageDeliveryMdcTest.class,
-    TcpDiscoveryPendingMessageDeliveryMdcReversedTest.class,
-    MultiDataCenterDeploymentTest.class,
-    MultiDataCenterRingTest.class,
-    MultiDataCenterClientRoutingTest.class,
-
-    IgniteDiscoveryMessageSerializationTest.class
 })
 public class IgniteSpiDiscoverySelfTestSuite {
     /** */