http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java 
b/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java
index 886bc9e..bab4b73 100644
--- a/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java
+++ b/modules/mesos/src/test/java/org/apache/ignite/IgniteMesosTestSuite.java
@@ -17,25 +17,16 @@
 
 package org.apache.ignite;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.mesos.IgniteSchedulerSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Apache Mesos integration tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteSchedulerSelfTest.class
+})
 public class IgniteMesosTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache Mesos Integration Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteSchedulerSelfTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java 
b/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java
index d09207c..e6be10b 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/IgniteMLTestSuite.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.ml;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.clustering.ClusteringTestSuite;
 import org.apache.ignite.ml.common.CommonTestSuite;
 import org.apache.ignite.ml.composition.CompositionTestSuite;
@@ -38,40 +36,34 @@ import org.apache.ignite.ml.structures.StructuresTestSuite;
 import org.apache.ignite.ml.svm.SVMTestSuite;
 import org.apache.ignite.ml.tree.DecisionTreeTestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all module tests. IMPL NOTE tests in {@code 
org.apache.ignite.ml.tree.performance} are not
  * included here because these are intended only for manual execution.
  */
-@RunWith(AllTests.class)
-public class IgniteMLTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new 
TestSuite(IgniteMLTestSuite.class.getSimpleName());
-
-        /** JUnit 4 tests. */
-        suite.addTest(new JUnit4TestAdapter(MathImplMainTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(RegressionsTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(SVMTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(ClusteringTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(KNNTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(PipelineTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(PreprocessingTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(GAGridTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(CompositionTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(EnvironmentTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(StructuresTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(CommonTestSuite.class));
-        suite.addTest(new JUnit4TestAdapter(MultiClassTestSuite.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    MathImplMainTestSuite.class,
+    RegressionsTestSuite.class,
+    SVMTestSuite.class,
+    ClusteringTestSuite.class,
+    KNNTestSuite.class,
+    PipelineTestSuite.class,
+    PreprocessingTestSuite.class,
+    GAGridTestSuite.class,
+    CompositionTestSuite.class,
+    EnvironmentTestSuite.class,
+    StructuresTestSuite.class,
+    CommonTestSuite.class,
+    MultiClassTestSuite.class,
 
-        /** JUnit 3 tests. */
-        suite.addTest(DecisionTreeTestSuite.suite());
-        suite.addTest(MLPTestSuite.suite());
-        suite.addTest(InferenceTestSuite.suite());
-        suite.addTest(DatasetTestSuite.suite());
-        suite.addTest(SelectionTestSuite.suite());
-
-        return suite;
-    }
+    /** JUnit 3 tests. */
+    DecisionTreeTestSuite.class,
+    MLPTestSuite.class,
+    InferenceTestSuite.class,
+    DatasetTestSuite.class,
+    SelectionTestSuite.class
+})
+public class IgniteMLTestSuite {
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java 
b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java
index 8ab41c5..d2b5ce2 100644
--- 
a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java
+++ 
b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/DatasetTestSuite.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.ml.dataset;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.dataset.feature.ObjectHistogramTest;
 import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetBuilderTest;
 import org.apache.ignite.ml.dataset.impl.cache.CacheBasedDatasetTest;
@@ -30,29 +28,24 @@ import 
org.apache.ignite.ml.dataset.primitive.DatasetWrapperTest;
 import org.apache.ignite.ml.dataset.primitive.SimpleDatasetTest;
 import org.apache.ignite.ml.dataset.primitive.SimpleLabeledDatasetTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all tests located in org.apache.ignite.ml.dataset.* package.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    DatasetWrapperTest.class,
+    DatasetAffinityFunctionWrapperTest.class,
+    PartitionDataStorageTest.class,
+    LocalDatasetBuilderTest.class,
+    SimpleDatasetTest.class,
+    SimpleLabeledDatasetTest.class,
+    DatasetWrapperTest.class,
+    ObjectHistogramTest.class,
+    ComputeUtilsTest.class,
+    CacheBasedDatasetBuilderTest.class,
+    CacheBasedDatasetTest.class
+})
 public class DatasetTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new 
TestSuite(DatasetTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(DatasetWrapperTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(DatasetAffinityFunctionWrapperTest.class));
-        suite.addTest(new JUnit4TestAdapter(PartitionDataStorageTest.class));
-        suite.addTest(new JUnit4TestAdapter(LocalDatasetBuilderTest.class));
-        suite.addTest(new JUnit4TestAdapter(SimpleDatasetTest.class));
-        suite.addTest(new JUnit4TestAdapter(SimpleLabeledDatasetTest.class));
-        suite.addTest(new JUnit4TestAdapter(DatasetWrapperTest.class));
-        suite.addTest(new JUnit4TestAdapter(ObjectHistogramTest.class));
-        suite.addTest(new JUnit4TestAdapter(ComputeUtilsTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(CacheBasedDatasetBuilderTest.class));
-        suite.addTest(new JUnit4TestAdapter(CacheBasedDatasetTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java
 
b/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java
index 9908b65..c670629 100644
--- 
a/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java
+++ 
b/modules/ml/src/test/java/org/apache/ignite/ml/inference/InferenceTestSuite.java
@@ -17,31 +17,24 @@
 
 package org.apache.ignite.ml.inference;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import 
org.apache.ignite.ml.inference.builder.IgniteDistributedInfModelBuilderTest;
 import org.apache.ignite.ml.inference.builder.SingleInfModelBuilderTest;
 import org.apache.ignite.ml.inference.builder.ThreadedInfModelBuilderTest;
 import org.apache.ignite.ml.inference.storage.model.DefaultModelStorageTest;
 import org.apache.ignite.ml.inference.util.DirectorySerializerTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all tests located in {@link org.apache.ignite.ml.inference} 
package.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    SingleInfModelBuilderTest.class,
+    ThreadedInfModelBuilderTest.class,
+    DirectorySerializerTest.class,
+    DefaultModelStorageTest.class,
+    IgniteDistributedInfModelBuilderTest.class
+})
 public class InferenceTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new 
TestSuite(InferenceTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(SingleInfModelBuilderTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(ThreadedInfModelBuilderTest.class));
-        suite.addTest(new JUnit4TestAdapter(DirectorySerializerTest.class));
-        suite.addTest(new JUnit4TestAdapter(DefaultModelStorageTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteDistributedInfModelBuilderTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java 
b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java
index 58eea8d..6f01b7c 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/nn/MLPTestSuite.java
@@ -17,25 +17,18 @@
 
 package org.apache.ignite.ml.nn;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for multilayer perceptrons.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    MLPTest.class,
+    MLPTrainerTest.class,
+    LossFunctionsTest.class,
+    MLPTrainerIntegrationTest.class
+})
 public class MLPTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite(MLPTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(MLPTest.class));
-        suite.addTest(new JUnit4TestAdapter(MLPTrainerTest.class));
-        suite.addTest(new JUnit4TestAdapter(LossFunctionsTest.class));
-        suite.addTest(new JUnit4TestAdapter(MLPTrainerIntegrationTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
 
b/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
index 0f62c92..135ee64 100644
--- 
a/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
+++ 
b/modules/ml/src/test/java/org/apache/ignite/ml/selection/SelectionTestSuite.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.ml.selection;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.selection.cv.CrossValidationTest;
 import org.apache.ignite.ml.selection.paramgrid.ParameterSetGeneratorTest;
 import 
org.apache.ignite.ml.selection.scoring.cursor.CacheBasedLabelPairCursorTest;
@@ -34,33 +32,27 @@ import 
org.apache.ignite.ml.selection.scoring.metric.RecallTest;
 import org.apache.ignite.ml.selection.split.TrainTestDatasetSplitterTest;
 import org.apache.ignite.ml.selection.split.mapper.SHA256UniformMapperTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all tests located in org.apache.ignite.ml.selection.* 
package.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    CrossValidationTest.class,
+    ParameterSetGeneratorTest.class,
+    LocalLabelPairCursorTest.class,
+    AccuracyTest.class,
+    PrecisionTest.class,
+    RecallTest.class,
+    FmeasureTest.class,
+    SHA256UniformMapperTest.class,
+    TrainTestDatasetSplitterTest.class,
+    EvaluatorTest.class,
+    CacheBasedLabelPairCursorTest.class,
+    BinaryClassificationMetricsTest.class,
+    BinaryClassificationMetricsValuesTest.class,
+    BinaryClassificationEvaluatorTest.class,
+})
 public class SelectionTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new 
TestSuite(SelectionTestSuite.class.getSimpleName());
-
-        suite.addTest(new JUnit4TestAdapter(CrossValidationTest.class));
-        suite.addTest(new JUnit4TestAdapter(ParameterSetGeneratorTest.class));
-        suite.addTest(new JUnit4TestAdapter(LocalLabelPairCursorTest.class));
-        suite.addTest(new JUnit4TestAdapter(AccuracyTest.class));
-        suite.addTest(new JUnit4TestAdapter(PrecisionTest.class));
-        suite.addTest(new JUnit4TestAdapter(RecallTest.class));
-        suite.addTest(new JUnit4TestAdapter(FmeasureTest.class));
-        suite.addTest(new JUnit4TestAdapter(SHA256UniformMapperTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(TrainTestDatasetSplitterTest.class));
-        suite.addTest(new JUnit4TestAdapter(EvaluatorTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(CacheBasedLabelPairCursorTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(BinaryClassificationMetricsTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(BinaryClassificationMetricsValuesTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(BinaryClassificationEvaluatorTest.class));
-
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java 
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java
index 7c984c1..e344ab3 100644
--- 
a/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java
+++ 
b/modules/ml/src/test/java/org/apache/ignite/ml/tree/DecisionTreeTestSuite.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.ml.tree;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.ml.tree.data.DecisionTreeDataTest;
 import 
org.apache.ignite.ml.tree.impurity.gini.GiniImpurityMeasureCalculatorTest;
 import org.apache.ignite.ml.tree.impurity.gini.GiniImpurityMeasureTest;
@@ -27,29 +25,24 @@ import 
org.apache.ignite.ml.tree.impurity.mse.MSEImpurityMeasureTest;
 import 
org.apache.ignite.ml.tree.impurity.util.SimpleStepFunctionCompressorTest;
 import org.apache.ignite.ml.tree.impurity.util.StepFunctionTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for all tests located in {@link org.apache.ignite.ml.tree} 
package.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    DecisionTreeClassificationTrainerTest.class,
+    DecisionTreeRegressionTrainerTest.class,
+    DecisionTreeDataTest.class,
+    GiniImpurityMeasureCalculatorTest.class,
+    GiniImpurityMeasureTest.class,
+    MSEImpurityMeasureCalculatorTest.class,
+    MSEImpurityMeasureTest.class,
+    StepFunctionTest.class,
+    SimpleStepFunctionCompressorTest.class,
+    DecisionTreeRegressionTrainerIntegrationTest.class,
+    DecisionTreeClassificationTrainerIntegrationTest.class
+})
 public class DecisionTreeTestSuite {
-    /** */
-    public static TestSuite suite() {
-        TestSuite suite = new 
TestSuite(DecisionTreeTestSuite.class.getSimpleName());
-
-        suite.addTest(new 
JUnit4TestAdapter(DecisionTreeClassificationTrainerTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(DecisionTreeRegressionTrainerTest.class));
-        suite.addTest(new JUnit4TestAdapter(DecisionTreeDataTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GiniImpurityMeasureCalculatorTest.class));
-        suite.addTest(new JUnit4TestAdapter(GiniImpurityMeasureTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(MSEImpurityMeasureCalculatorTest.class));
-        suite.addTest(new JUnit4TestAdapter(MSEImpurityMeasureTest.class));
-        suite.addTest(new JUnit4TestAdapter(StepFunctionTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(SimpleStepFunctionCompressorTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(DecisionTreeRegressionTrainerIntegrationTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(DecisionTreeClassificationTrainerIntegrationTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java
 
b/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java
index 8a53e51..069726c 100644
--- 
a/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java
+++ 
b/modules/rest-http/src/test/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridRestSuite.java
@@ -16,24 +16,15 @@
  */
 package org.apache.ignite.internal.processors.rest.protocols.http.jetty;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Integration tests for Grid REST functionality; Jetty is under the hood.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    RestSetupSimpleTest.class
+})
 public class GridRestSuite {
-    /**
-     * @return Suite that contains all tests for REST.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache Ignite REST Api suite");
-
-        suite.addTest(new JUnit4TestAdapter(RestSetupSimpleTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java
 
b/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java
index 8649a13..c0d502b 100644
--- 
a/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java
+++ 
b/modules/rocketmq/src/test/java/org/apache/ignite/stream/rocketmq/RocketMQStreamerTestSuite.java
@@ -17,24 +17,15 @@
 
 package org.apache.ignite.stream.rocketmq;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Apache RocketMQ streamers tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    RocketMQStreamerTest.class
+})
 public class RocketMQStreamerTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache RocketMQ streamer Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(RocketMQStreamerTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
 
b/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
index e1b95a7..2476acf 100644
--- 
a/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
+++ 
b/modules/schedule/src/test/java/org/apache/ignite/testsuites/IgniteSchedulerTestSuite.java
@@ -17,25 +17,16 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.processors.schedule.GridScheduleSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Scheduler tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridScheduleSelfTest.class
+})
 public class IgniteSchedulerTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Grid Scheduler Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridScheduleSelfTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java
 
b/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java
index 25deaea..d8088bf 100644
--- 
a/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java
+++ 
b/modules/slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java
@@ -17,25 +17,16 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.logger.slf4j.Slf4jLoggerMarkerTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Slf4j logging tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    Slf4jLoggerMarkerTest.class
+})
 public class IgniteSlf4jTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Slf4j Logging Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(Slf4jLoggerMarkerTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
 
b/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
index e963dd1..b1ec515 100644
--- 
a/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
+++ 
b/modules/spark/src/test/java/org/apache/ignite/testsuites/IgniteRDDTestSuite.java
@@ -17,27 +17,18 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.spark.JavaEmbeddedIgniteRDDSelfTest;
 import org.apache.ignite.spark.JavaStandaloneIgniteRDDSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Test suit for Ignite RDD
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    JavaEmbeddedIgniteRDDSelfTest.class,
+    JavaStandaloneIgniteRDDSelfTest.class
+})
 public class IgniteRDDTestSuite {
-    /**
-     * @return Java Ignite RDD test suit.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Java Ignite RDD tests (standalone and 
embedded modes");
-
-        suite.addTest(new 
JUnit4TestAdapter(JavaEmbeddedIgniteRDDSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(JavaStandaloneIgniteRDDSelfTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java
 
b/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java
index 4fb9605..4b7d7f3 100644
--- 
a/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java
+++ 
b/modules/spring-data-2.0/src/test/java/org/apache/ignite/testsuites/IgniteSpringData2TestSuite.java
@@ -17,27 +17,18 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.springdata.IgniteSpringDataCrudSelfTest;
 import org.apache.ignite.springdata.IgniteSpringDataQueriesSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Ignite Spring Data 2.0 test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteSpringDataCrudSelfTest.class,
+    IgniteSpringDataQueriesSelfTest.class
+})
 public class IgniteSpringData2TestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Spring Data 2.0 Test Suite");
-
-        suite.addTest(new 
JUnit4TestAdapter(IgniteSpringDataCrudSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteSpringDataQueriesSelfTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java
 
b/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java
index 503c820..1b6c967 100644
--- 
a/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java
+++ 
b/modules/spring-data/src/test/java/org/apache/ignite/testsuites/IgniteSpringDataTestSuite.java
@@ -17,28 +17,19 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.springdata.IgniteSpringDataCrudSelfTest;
 import org.apache.ignite.springdata.IgniteSpringDataQueriesSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Ignite Spring Data test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteSpringDataCrudSelfTest.class,
+    IgniteSpringDataQueriesSelfTest.class
+})
 public class IgniteSpringDataTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Spring Data Test Suite");
-
-        suite.addTest(new 
JUnit4TestAdapter(IgniteSpringDataCrudSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteSpringDataQueriesSelfTest.class));
-
-        return suite;
-    }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java
 
b/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java
index 085b755..94d4437 100644
--- 
a/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java
+++ 
b/modules/storm/src/test/java/org/apache/ignite/stream/storm/IgniteStormStreamerSelfTestSuite.java
@@ -17,24 +17,15 @@
 
 package org.apache.ignite.stream.storm;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Apache Storm streamer tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    StormIgniteStreamerSelfTest.class
+})
 public class IgniteStormStreamerSelfTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache Storm streamer Test Suite");
-
-        suite.addTest(new 
JUnit4TestAdapter(StormIgniteStreamerSelfTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
 
b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
index 5a0730a..5234af7 100644
--- 
a/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
+++ 
b/modules/twitter/src/test/java/org/apache/ignite/stream/twitter/IgniteTwitterStreamerTestSuite.java
@@ -17,24 +17,15 @@
 
 package org.apache.ignite.stream.twitter;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Twitter streamer tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteTwitterStreamerTest.class
+})
 public class IgniteTwitterStreamerTestSuite {
-    /**
-     * @return Twitter streamer tests suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Twitter streamed Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteTwitterStreamerTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
 
b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
index 0cc6b17..6c8d923 100644
--- 
a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
+++ 
b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteToolsSelfTestSuite.java
@@ -17,25 +17,16 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.tools.GridToolsSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Tools self-test suite.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridToolsSelfTest.class
+})
 public class IgniteToolsSelfTestSuite {
-    /**
-     * @return Grid ant tasks tests suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Ignite Ant Tasks Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(GridToolsSelfTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
 
b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
index 41cb70f..1741179 100644
--- 
a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
+++ 
b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/IgniteUriDeploymentTestSuite.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.GridTaskUriDeploymentDeadlockSelfTest;
 import org.apache.ignite.p2p.GridP2PDisabledSelfTest;
 import 
org.apache.ignite.spi.deployment.uri.GridUriDeploymentClassLoaderMultiThreadedSelfTest;
@@ -33,39 +31,35 @@ import 
org.apache.ignite.spi.deployment.uri.GridUriDeploymentSimpleSelfTest;
 import 
org.apache.ignite.spi.deployment.uri.scanners.file.GridFileDeploymentSelfTest;
 import 
org.apache.ignite.spi.deployment.uri.scanners.file.GridFileDeploymentUndeploySelfTest;
 import 
org.apache.ignite.spi.deployment.uri.scanners.http.GridHttpDeploymentSelfTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Tests against {@link org.apache.ignite.spi.deployment.uri.UriDeploymentSpi}.
  */
-public class IgniteUriDeploymentTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("URI Deployment Spi Test Suite");
-
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentConfigSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentSimpleSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentClassloaderRegisterSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentFileProcessorSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentClassLoaderSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentClassLoaderMultiThreadedSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentMultiScannersSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentConfigSelfTest.class));
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridUriDeploymentConfigSelfTest.class,
+    GridUriDeploymentSimpleSelfTest.class,
+    GridUriDeploymentClassloaderRegisterSelfTest.class,
+    GridUriDeploymentFileProcessorSelfTest.class,
+    GridUriDeploymentClassLoaderSelfTest.class,
+    GridUriDeploymentClassLoaderMultiThreadedSelfTest.class,
+    GridUriDeploymentMultiScannersSelfTest.class,
+    GridUriDeploymentConfigSelfTest.class,
 
-        suite.addTest(new 
JUnit4TestAdapter(GridFileDeploymentUndeploySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridHttpDeploymentSelfTest.class));
+    GridFileDeploymentUndeploySelfTest.class,
+    GridHttpDeploymentSelfTest.class,
 
-        suite.addTest(new JUnit4TestAdapter(GridFileDeploymentSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentMultiScannersErrorThrottlingTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridUriDeploymentMd5CheckSelfTest.class));
+    GridFileDeploymentSelfTest.class,
+    GridUriDeploymentMultiScannersErrorThrottlingTest.class,
+    GridUriDeploymentMd5CheckSelfTest.class,
 
-        // GAR Ant task tests.
-        suite.addTest(IgniteToolsSelfTestSuite.suite());
+    // GAR Ant task tests.
+    IgniteToolsSelfTestSuite.class,
 
-        suite.addTest(new 
JUnit4TestAdapter(GridTaskUriDeploymentDeadlockSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridP2PDisabledSelfTest.class));
-
-        return suite;
-    }
+    GridTaskUriDeploymentDeadlockSelfTest.class,
+    GridP2PDisabledSelfTest.class
+})
+public class IgniteUriDeploymentTestSuite {
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/yarn/src/test/java/org/apache/ignite/IgniteYarnTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/yarn/src/test/java/org/apache/ignite/IgniteYarnTestSuite.java 
b/modules/yarn/src/test/java/org/apache/ignite/IgniteYarnTestSuite.java
index f144dd6..9bc5c28 100644
--- a/modules/yarn/src/test/java/org/apache/ignite/IgniteYarnTestSuite.java
+++ b/modules/yarn/src/test/java/org/apache/ignite/IgniteYarnTestSuite.java
@@ -17,25 +17,16 @@
 
 package org.apache.ignite;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.yarn.IgniteApplicationMasterSelfTest;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * Apache Hadoop Yarn integration tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteApplicationMasterSelfTest.class
+})
 public class IgniteYarnTestSuite {
-    /**
-     * @return Test suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("Apache Yarn Integration Test Suite");
-
-        suite.addTest(new 
JUnit4TestAdapter(IgniteApplicationMasterSelfTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTestSuite.java
 
b/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTestSuite.java
index 0e80631..93f4f47 100644
--- 
a/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTestSuite.java
+++ 
b/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTestSuite.java
@@ -17,24 +17,15 @@
 
 package org.apache.ignite.stream.zeromq;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import org.junit.runners.Suite;
 
 /**
  * ZeroMQ streamer tests.
  */
-@RunWith(AllTests.class)
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    IgniteZeroMqStreamerTest.class
+})
 public class IgniteZeroMqStreamerTestSuite {
-    /**
-     * @return ZeroMQ streamer tests suite.
-     */
-    public static TestSuite suite() {
-        TestSuite suite = new TestSuite("ZeroMQ streamed Test Suite");
-
-        suite.addTest(new JUnit4TestAdapter(IgniteZeroMqStreamerTest.class));
-
-        return suite;
-    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/IgniteCacheEntryListenerWithZkDiscoAtomicTest.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/IgniteCacheEntryListenerWithZkDiscoAtomicTest.java
 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/IgniteCacheEntryListenerWithZkDiscoAtomicTest.java
index 689daae..7064435 100644
--- 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/IgniteCacheEntryListenerWithZkDiscoAtomicTest.java
+++ 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/IgniteCacheEntryListenerWithZkDiscoAtomicTest.java
@@ -17,6 +17,7 @@
 package org.apache.ignite.spi.discovery.zk;
 
 import 
org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicTest;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -30,8 +31,9 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 public class IgniteCacheEntryListenerWithZkDiscoAtomicTest extends 
IgniteCacheEntryListenerAtomicTest {
     /** {@inheritDoc} */
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-8109";)
     @Test
     @Override public void testConcurrentRegisterDeregister() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-8109";);
+        // No-op.
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java
 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java
index bd2891f..e357477 100644
--- 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java
+++ 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.zk;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import junit.framework.TestSuite;
 import org.apache.curator.test.InstanceSpec;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
 import org.apache.ignite.IgniteException;
@@ -32,7 +31,7 @@ import 
org.apache.ignite.testframework.config.GridTestProperties;
 /**
  * Allows to run regular Ignite tests with {@link 
org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi}.
  */
-public abstract class ZookeeperDiscoverySpiAbstractTestSuite extends TestSuite 
{
+public abstract class ZookeeperDiscoverySpiAbstractTestSuite {
     /** */
     private static TestingCluster testingCluster;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java
 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java
index c6a67f3..78c660e 100644
--- 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java
+++ 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java
@@ -17,40 +17,33 @@
 
 package org.apache.ignite.spi.discovery.zk;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.IgniteClientReconnectCacheTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeFullApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNodeRestartTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeFullApiSelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
 import org.apache.ignite.util.GridCommandHandlerTest;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Regular Ignite tests executed with {@link 
org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi}.
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCachePartitionedNodeRestartTest.class,
+    IgniteCacheEntryListenerWithZkDiscoAtomicTest.class,
+    IgniteClientReconnectCacheTest.class,
+    GridCachePartitionedMultiNodeFullApiSelfTest.class,
+    GridCacheReplicatedMultiNodeFullApiSelfTest.class,
+    GridCommandHandlerTest.class
+})
 public class ZookeeperDiscoverySpiTestSuite2 extends 
ZookeeperDiscoverySpiAbstractTestSuite {
     /** */
-    private static TestingCluster testingCluster;
-
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
+    @BeforeClass
+    public static void init() throws Exception {
         System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm 
tests.
 
         initSuite();
-
-        TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
-
-        suite.addTest(new 
JUnit4TestAdapter(GridCachePartitionedNodeRestartTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteCacheEntryListenerWithZkDiscoAtomicTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteClientReconnectCacheTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCachePartitionedMultiNodeFullApiSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCacheReplicatedMultiNodeFullApiSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridCommandHandlerTest.class));
-
-        return suite;
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
index 403232d..35cc6af 100644
--- 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
+++ 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite3.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.spi.discovery.zk;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import 
org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDataStructuresTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedNodeRestartTxSelfTest;
 import 
org.apache.ignite.internal.processors.cache.datastructures.partitioned.GridCachePartitionedSequenceApiSelfTest;
@@ -28,36 +26,31 @@ import 
org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicMulti
 import 
org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmFullApiSelfTest;
 import 
org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest;
 import org.apache.ignite.p2p.GridP2PContinuousDeploymentSelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Regular Ignite tests executed with {@link ZookeeperDiscoverySpi}.
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    GridCacheReplicatedNodeRestartSelfTest.class,
+    GridEventConsumeSelfTest.class,
+    GridCachePartitionedNodeRestartTxSelfTest.class,
+    IgniteClientDataStructuresTest.class,
+    GridCacheReplicatedSequenceApiSelfTest.class,
+    GridCachePartitionedSequenceApiSelfTest.class,
+    GridCacheAtomicMultiJvmFullApiSelfTest.class,
+    GridCachePartitionedMultiJvmFullApiSelfTest.class,
+    GridP2PContinuousDeploymentSelfTest.class
+})
 public class ZookeeperDiscoverySpiTestSuite3 extends 
ZookeeperDiscoverySpiAbstractTestSuite {
     /** */
-    private static TestingCluster testingCluster;
-
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
+    @BeforeClass
+    public static void init() throws Exception {
         System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm 
tests.
 
         initSuite();
-
-        TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
-
-        suite.addTest(new 
JUnit4TestAdapter(GridCacheReplicatedNodeRestartSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridEventConsumeSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCachePartitionedNodeRestartTxSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteClientDataStructuresTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCacheReplicatedSequenceApiSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCachePartitionedSequenceApiSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCacheAtomicMultiJvmFullApiSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCachePartitionedMultiJvmFullApiSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridP2PContinuousDeploymentSelfTest.class));
-
-        return suite;
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
index 5726260..4f1a824 100644
--- 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
+++ 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite4.java
@@ -17,42 +17,35 @@
 
 package org.apache.ignite.spi.discovery.zk;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.TestSuite;
 import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicMultiNodeFullApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicMultiNodeFullApiSelfTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedQuerySelfTest;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.zk.curator.TestingCluster;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Regular Ignite tests executed with {@link ZookeeperDiscoverySpi}.
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    ZookeeperDiscoverySuitePreprocessorTest.class,
+    IgniteCachePutRetryAtomicSelfTest.class,
+    IgniteCachePutRetryTransactionalSelfTest.class,
+    ClusterNodeMetricsUpdateTest.class,
+    GridCacheAtomicMultiNodeFullApiSelfTest.class,
+    GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class,
+    IgniteCacheReplicatedQuerySelfTest.class
+})
 public class ZookeeperDiscoverySpiTestSuite4 extends 
ZookeeperDiscoverySpiAbstractTestSuite {
     /** */
-    private static TestingCluster testingCluster;
-
-    /**
-     * @return Test suite.
-     * @throws Exception Thrown in case of the failure.
-     */
-    public static TestSuite suite() throws Exception {
+    @BeforeClass
+    public static void init() throws Exception {
         System.setProperty("H2_JDBC_CONNECTIONS", "500"); // For multi-jvm 
tests.
 
         initSuite();
-
-        TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite");
-
-        suite.addTest(new 
JUnit4TestAdapter(ZookeeperDiscoverySuitePreprocessorTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteCachePutRetryAtomicSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteCachePutRetryTransactionalSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(ClusterNodeMetricsUpdateTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCacheAtomicMultiNodeFullApiSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class));
-        suite.addTest(new 
JUnit4TestAdapter(IgniteCacheReplicatedQuerySelfTest.class));
-
-        return suite;
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cc31cbde/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
index f9a6fa4..29f9632 100644
--- 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
+++ 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
@@ -139,9 +139,8 @@ import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.server.quorum.QuorumPeer;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -164,7 +163,6 @@ import static 
org.apache.zookeeper.ZooKeeper.ZOOKEEPER_CLIENT_CNXN_SOCKET;
  *
  */
 @SuppressWarnings("deprecation")
-@RunWith(JUnit4.class)
 public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest {
     /** */
     private static final String IGNITE_ZK_ROOT = 
ZookeeperDiscoverySpi.DFLT_ROOT_PATH;
@@ -3926,20 +3924,18 @@ public class ZookeeperDiscoverySpiTest extends 
GridCommonAbstractTest {
     /**
      * @throws Exception If failed.
      */
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-8178";)
     @Test
     public void testReconnectServersRestart_1() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-8178";);
-
         reconnectServersRestart(1);
     }
 
     /**
      * @throws Exception If failed.
      */
+    @Ignore("https://issues.apache.org/jira/browse/IGNITE-8178";)
     @Test
     public void testReconnectServersRestart_2() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-8178";);
-
         reconnectServersRestart(3);
     }
 

Reply via email to