diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java
deleted file mode 100644
index 603fdb31b1d..00000000000
--- a/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.cli;
-
-import org.junit.Test;
-
-public class CliCommonTest extends CliBaseTest {
-    @Test
-    public void help() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void wrongArgument() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void simple() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void duplicateSources() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void duplicateSourcesInModule() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void nonexistentPathInModule() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void nonexistentScript() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void diagnosticsOrder() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void multipleTextRangesInDiagnosticsOrder() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void suppressAllWarningsJvm() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void suppressAllWarningsJS() throws Exception {
-        executeCompilerCompareOutputJS();
-    }
-
-    @Test
-    public void pluginSimple() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-
-    @Test
-    public void pluginSimpleUsage() throws Exception {
-        executeCompilerCompareOutputJVM();
-    }
-}
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java
index 180921a0a38..8cb22c35949 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java
@@ -89,4 +89,9 @@ public class K2JsCliTest extends CliBaseTest {
     public void notValidLibraryDir() throws Exception {
         executeCompilerCompareOutputJS();
     }
+
+    @Test
+    public void suppressAllWarningsJS() throws Exception {
+        executeCompilerCompareOutputJS();
+    }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java
index 1dff8e5d9d3..da83e636c42 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java
@@ -64,4 +64,64 @@ public class K2JvmCliTest extends CliBaseTest {
     public void warningsInDummy() throws Exception {
         executeCompilerCompareOutputJVM();
     }
+
+    @Test
+    public void help() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void wrongArgument() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void simple() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void duplicateSources() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void duplicateSourcesInModule() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void nonexistentPathInModule() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void nonexistentScript() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void diagnosticsOrder() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void multipleTextRangesInDiagnosticsOrder() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void suppressAllWarningsJvm() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void pluginSimple() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
+
+    @Test
+    public void pluginSimpleUsage() throws Exception {
+        executeCompilerCompareOutputJVM();
+    }
 }