diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8a5f615dc53..07f3873960b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -60,6 +60,7 @@
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" filepath="$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" group="ide/jps" />
       <module fileurl="file://$PROJECT_DIR$/compiler/light-classes/light-classes.iml" filepath="$PROJECT_DIR$/compiler/light-classes/light-classes.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" filepath="$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/plugins-tests/plugins-tests.iml" filepath="$PROJECT_DIR$/plugins/plugins-tests/plugins-tests.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/resolution/resolution.iml" filepath="$PROJECT_DIR$/compiler/resolution/resolution.iml" group="compiler" />
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index b5f86683d35..87b5166c4ee 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="backend" />
diff --git a/generators/generators.iml b/generators/generators.iml
index 159d838759e..b6db11cc352 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -33,6 +33,7 @@
     <orderEntry type="module" module-name="container" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="build-common" scope="TEST" />
+    <orderEntry type="module" module-name="plugins-tests" scope="TEST" />
     <orderEntry type="module" module-name="idea-android" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 9185526c121..59367f9c1ac 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -955,7 +955,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("plugins/android-extensions/android-extensions-compiler/tests", "plugins/android-extensions/android-extensions-compiler/testData") {
+    testGroup("plugins/plugins-tests/tests",  "plugins/android-extensions/android-extensions-compiler/testData") {
         testClass<AbstractAndroidSyntheticPropertyDescriptorTest>() {
             model("descriptors", recursive = false, extension = null)
         }
@@ -970,7 +970,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("plugins/annotation-collector/test", "plugins/annotation-collector/testData") {
+    testGroup("plugins/plugins-tests/tests", "plugins/annotation-collector/testData") {
         testClass<AbstractAnnotationProcessorBoxTest>() {
             model("collectToFile", recursive = false, extension = null)
         }
@@ -1000,7 +1000,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("plugins/android-extensions/android-extensions-jps/tests", "plugins/android-extensions/android-extensions-jps/testData") {
+    testGroup("plugins/plugins-tests/tests", "plugins/android-extensions/android-extensions-jps/testData") {
         testClass<AbstractAndroidJpsTestCase>() {
             model("android", recursive = false, extension = null)
         }
diff --git a/js/js.tests/js.tests.iml b/js/js.tests/js.tests.iml
index fbae8495c0f..c7caaf83ba3 100644
--- a/js/js.tests/js.tests.iml
+++ b/js/js.tests/js.tests.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Rhino" level="project" />
     <orderEntry type="module" module-name="js.translator" />
diff --git a/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml b/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml
index e97554691bf..318bfdaf25d 100644
--- a/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml
+++ b/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml
@@ -14,8 +14,5 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="backend" scope="PROVIDED" />
-    <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml b/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
index 574eadf8add..0b0240cf57b 100644
--- a/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
+++ b/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
@@ -13,21 +13,5 @@
     <orderEntry type="library" scope="PROVIDED" name="android-plugin" level="project" />
     <orderEntry type="module" module-name="android-extensions-compiler" />
     <orderEntry type="module" module-name="util" scope="PROVIDED" />
-    <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="idea-gradle-plugin">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
-        </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" />
-        <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
-      </library>
-    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/annotation-collector/annotation-collector.iml b/plugins/annotation-collector/annotation-collector.iml
index 63eb0fa2744..7cc838fd4ab 100644
--- a/plugins/annotation-collector/annotation-collector.iml
+++ b/plugins/annotation-collector/annotation-collector.iml
@@ -13,7 +13,6 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="light-classes" />
   </component>
diff --git a/plugins/plugins-tests/plugins-tests.iml b/plugins/plugins-tests/plugins-tests.iml
new file mode 100644
index 00000000000..364db075c9e
--- /dev/null
+++ b/plugins/plugins-tests/plugins-tests.iml
@@ -0,0 +1,34 @@
+<?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="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="android-extensions-compiler" />
+    <orderEntry type="module" module-name="android-extensions-jps" />
+    <orderEntry type="module" module-name="annotation-collector" scope="TEST" />
+    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module" module-name="cli" scope="TEST" />
+    <orderEntry type="module" module-name="backend" scope="TEST" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
+    <orderEntry type="library" name="jps-test" level="project" />
+    <orderEntry type="library" name="android-plugin" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library name="idea-gradle-plugin">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt
similarity index 100%
rename from plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt
diff --git a/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AnnotationProcessorBoxTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/AnnotationProcessorBoxTestGenerated.java
similarity index 100%
rename from plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AnnotationProcessorBoxTestGenerated.java
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/AnnotationProcessorBoxTestGenerated.java
diff --git a/plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
similarity index 100%
rename from plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
diff --git a/plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
similarity index 100%
rename from plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
diff --git a/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
similarity index 100%
rename from plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
diff --git a/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
similarity index 100%
rename from plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
diff --git a/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt
similarity index 100%
rename from plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt
diff --git a/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java
similarity index 100%
rename from plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java
diff --git a/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java
similarity index 100%
rename from plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java
diff --git a/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java
similarity index 100%
rename from plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java
diff --git a/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
similarity index 100%
rename from plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt