diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractBridgeTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractBridgeTest.kt
deleted file mode 100644
index 6bbcb48971c..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractBridgeTest.kt
+++ /dev/null
@@ -1,23 +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.js.test.semantics
-
-import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
-
-public abstract class AbstractBridgeTest : SingleFileTranslationTest("bridges/") {
-    override fun doTest(filename: String) = checkBlackBoxIsOkByPath(filename)
-}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractCallableReferenceTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractCallableReferenceTest.java
deleted file mode 100644
index bc09ae9e1b5..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractCallableReferenceTest.java
+++ /dev/null
@@ -1,27 +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.js.test.semantics;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
-
-public abstract class AbstractCallableReferenceTest extends SingleFileTranslationTest {
-
-    public AbstractCallableReferenceTest(@NotNull String main) {
-        super("callableReference/" + main);
-    }
-}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDefaultObjectTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDefaultObjectTest.kt
deleted file mode 100644
index e73cc3a2640..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDefaultObjectTest.kt
+++ /dev/null
@@ -1,21 +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.js.test.semantics
-
-import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
-
-public abstract class AbstractCompanionObjectTest : SingleFileTranslationTest("objectIntrinsics/")
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDynamicTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDynamicTest.kt
deleted file mode 100644
index 366e9789bbe..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDynamicTest.kt
+++ /dev/null
@@ -1,21 +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.js.test.semantics
-
-import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
-
-public abstract class AbstractDynamicTest : SingleFileTranslationTest("dynamic/")
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineEvaluationOrderTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineEvaluationOrderTest.kt
deleted file mode 100644
index b7fa4d149db..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineEvaluationOrderTest.kt
+++ /dev/null
@@ -1,21 +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.js.test.semantics
-
-import org.jetbrains.kotlin.js.test.AbstractSingleFileTranslationWithDirectivesTest
-
-public abstract class AbstractInlineEvaluationOrderTest : AbstractSingleFileTranslationWithDirectivesTest("inlineEvaluationOrder/")
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineJsStdlibTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineJsStdlibTest.java
deleted file mode 100644
index 06f67bb414d..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineJsStdlibTest.java
+++ /dev/null
@@ -1,25 +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.js.test.semantics;
-
-import org.jetbrains.kotlin.js.test.AbstractSingleFileTranslationWithDirectivesTest;
-
-public abstract class AbstractInlineJsStdlibTest extends AbstractSingleFileTranslationWithDirectivesTest {
-    public AbstractInlineJsStdlibTest() {
-        super("inlineStdlib/");
-    }
-}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineJsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineJsTest.java
deleted file mode 100644
index c574bc2dae9..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractInlineJsTest.java
+++ /dev/null
@@ -1,25 +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.js.test.semantics;
-
-import org.jetbrains.kotlin.js.test.AbstractSingleFileTranslationWithDirectivesTest;
-
-public abstract class AbstractInlineJsTest extends AbstractSingleFileTranslationWithDirectivesTest {
-    public AbstractInlineJsTest() {
-        super("inline/");
-    }
-}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractJsCodeTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractJsCodeTest.java
deleted file mode 100644
index 4673dcf8251..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractJsCodeTest.java
+++ /dev/null
@@ -1,25 +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.js.test.semantics;
-
-import org.jetbrains.kotlin.js.test.AbstractSingleFileTranslationWithDirectivesTest;
-
-public abstract class AbstractJsCodeTest extends AbstractSingleFileTranslationWithDirectivesTest {
-    public AbstractJsCodeTest() {
-        super("jsCode/");
-    }
-}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractLabelTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractLabelTest.java
deleted file mode 100644
index b44dc88a1b2..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractLabelTest.java
+++ /dev/null
@@ -1,25 +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.js.test.semantics;
-
-import org.jetbrains.kotlin.js.test.AbstractSingleFileTranslationWithDirectivesTest;
-
-public abstract class AbstractLabelTest extends AbstractSingleFileTranslationWithDirectivesTest {
-    public AbstractLabelTest() {
-        super("labels/");
-    }
-}
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractMultiModuleTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractMultiModuleTest.kt
deleted file mode 100644
index 5e07397a6ea..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractMultiModuleTest.kt
+++ /dev/null
@@ -1,21 +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.js.test.semantics
-
-import org.jetbrains.kotlin.js.test.MultipleModulesTranslationTest
-
-public abstract class AbstractMultiModuleTest : MultipleModulesTranslationTest("multiModule/")
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractReservedWordTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractReservedWordTest.kt
deleted file mode 100644
index 045cb123c9d..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractReservedWordTest.kt
+++ /dev/null
@@ -1,21 +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.js.test.semantics
-
-import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
-
-public abstract class AbstractReservedWordTest : SingleFileTranslationTest("reservedWords/")
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstarctClassesForGeneratedTests.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstarctClassesForGeneratedTests.kt
new file mode 100644
index 00000000000..2268b0c6b70
--- /dev/null
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstarctClassesForGeneratedTests.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.js.test.semantics
+
+import org.jetbrains.kotlin.js.test.AbstractSingleFileTranslationWithDirectivesTest
+import org.jetbrains.kotlin.js.test.MultipleModulesTranslationTest
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
+
+public abstract class AbstractBridgeTest : SingleFileTranslationTest("bridges/") {
+    override fun doTest(filename: String) = checkBlackBoxIsOkByPath(filename)
+}
+
+public abstract class AbstractCallableReferenceTest(main: String) : SingleFileTranslationTest("callableReference/" + main)
+
+public abstract class AbstractCompanionObjectTest : SingleFileTranslationTest("objectIntrinsics/")
+
+public abstract class AbstractDynamicTest : SingleFileTranslationTest("dynamic/")
+
+public abstract class AbstractInlineEvaluationOrderTest : AbstractSingleFileTranslationWithDirectivesTest("inlineEvaluationOrder/")
+
+public abstract class AbstractInlineJsStdlibTest : AbstractSingleFileTranslationWithDirectivesTest("inlineStdlib/")
+
+public abstract class AbstractInlineJsTest : AbstractSingleFileTranslationWithDirectivesTest("inline/")
+
+public abstract class AbstractJsCodeTest : AbstractSingleFileTranslationWithDirectivesTest("jsCode/")
+
+public abstract class AbstractLabelTest : AbstractSingleFileTranslationWithDirectivesTest("labels/")
+
+public abstract class AbstractMultiModuleTest : MultipleModulesTranslationTest("multiModule/")
+
+public abstract class AbstractReservedWordTest : SingleFileTranslationTest("reservedWords/")