diff --git a/.idea/modules.xml b/.idea/modules.xml
index 86992a19673..1c7f1c23919 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -54,7 +54,6 @@
       <module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" group="compiler/ir" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.tests/ir.tests.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.tests/ir.tests.iml" group="compiler/ir" />
       <module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" group="compiler/ir" />
       <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
       <module fileurl="file://$PROJECT_DIR$/plugins/java-model-wrappers/java-model-wrappers.iml" filepath="$PROJECT_DIR$/plugins/java-model-wrappers/java-model-wrappers.iml" group="plugins" />
diff --git a/compiler/ir/ir.tests/ir.tests.iml b/compiler/ir/ir.tests/ir.tests.iml
deleted file mode 100644
index dd62ebb2b25..00000000000
--- a/compiler/ir/ir.tests/ir.tests.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="frontend" scope="TEST" />
-    <orderEntry type="module" module-name="ir.tree" scope="TEST" />
-    <orderEntry type="module" module-name="ir.psi2ir" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="module" module-name="backend.common" scope="TEST" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 69a3b2f9385..f26b8a69ced 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -66,6 +66,10 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="ir.tests" scope="TEST" />
+    <orderEntry type="module" module-name="ir.tree" scope="TEST" />
+    <orderEntry type="module" module-name="ir.tree" scope="TEST" />
+    <orderEntry type="module" module-name="ir.tree" scope="TEST" />
+    <orderEntry type="module" module-name="backend.common" scope="TEST" />
+    <orderEntry type="module" module-name="ir.psi2ir" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt b/compiler/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt
similarity index 100%
rename from compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt
rename to compiler/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt
diff --git a/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt b/compiler/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt
similarity index 100%
rename from compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt
rename to compiler/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt
diff --git a/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt b/compiler/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
similarity index 98%
rename from compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
rename to compiler/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
index 76c62efe051..b5c3d281327 100644
--- a/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
+++ b/compiler/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
@@ -24,8 +24,6 @@ import org.jetbrains.kotlin.ir.util.dumpTreesFromLineNumber
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.utils.rethrow
 import java.io.File
-import java.io.FileWriter
-import java.io.PrintWriter
 import java.util.*
 import java.util.regex.Pattern
 
diff --git a/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt b/compiler/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt
similarity index 100%
rename from compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt
rename to compiler/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt
diff --git a/compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt b/compiler/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt
similarity index 100%
rename from compiler/ir/ir.tests/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt
rename to compiler/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt
diff --git a/generators/generators.iml b/generators/generators.iml
index a1e8fc9b08a..d590b297bfd 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -40,6 +40,5 @@
     <orderEntry type="module" module-name="idea-android-output-parser" scope="TEST" />
     <orderEntry type="module" module-name="idea-maven" scope="TEST" />
     <orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
-    <orderEntry type="module" module-name="ir.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file