diff --git a/plugins/android/android.iml b/plugins/android/android.iml
index a54152fbf818..6ebec214ae24 100644
--- a/plugins/android/android.iml
+++ b/plugins/android/android.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="debugger-impl" />
     <orderEntry type="module" module-name="xdebugger-impl" />
-    <orderEntry type="module" module-name="testFramework-java" />
+    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="smRunner" />
     <orderEntry type="module" module-name="junit" />
diff --git a/plugins/ant/ant.iml b/plugins/ant/ant.iml
index 11684085e81e..ad37b5ddc3f7 100644
--- a/plugins/ant/ant.iml
+++ b/plugins/ant/ant.iml
@@ -9,7 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="testFramework-java" />
+    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" exported="" name="Ant" level="project" />
     <orderEntry type="module" module-name="compiler-impl" />
diff --git a/plugins/git4idea/git4idea.iml b/plugins/git4idea/git4idea.iml
index 100a53b37a3e..493b34155e74 100644
--- a/plugins/git4idea/git4idea.iml
+++ b/plugins/git4idea/git4idea.iml
@@ -28,11 +28,12 @@
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="lvcs-api" />
-    <orderEntry type="module" module-name="testFramework" />
+    <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="TestNG" level="project" />
     <orderEntry type="module" module-name="platform-api" />
     <orderEntry type="library" name="commons-lang" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="lang-impl" />
   </component>
 </module>
 
diff --git a/plugins/svn4idea/svn4idea-tests.iml b/plugins/svn4idea/svn4idea-tests.iml
index 798757278775..9a38eff3d508 100644
--- a/plugins/svn4idea/svn4idea-tests.iml
+++ b/plugins/svn4idea/svn4idea-tests.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="svn4idea" />
     <orderEntry type="module" module-name="vcs-api" />
     <orderEntry type="module" module-name="vcs-impl" />
@@ -23,7 +23,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="testFramework" />
+    <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module-library">
       <library>
diff --git a/plugins/testng/testng.iml b/plugins/testng/testng.iml
index a7bb4468737c..86c89479d8a4 100644
--- a/plugins/testng/testng.iml
+++ b/plugins/testng/testng.iml
@@ -12,12 +12,12 @@
     <orderEntry type="module" module-name="execution-impl" />
     <orderEntry type="module" module-name="debugger-impl" />
     <orderEntry type="module" module-name="debugger-openapi" />
-    <orderEntry type="library" name="JUnit3" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="module" module-name="testRunner" />
     <orderEntry type="module" module-name="java-runtime" />
     <orderEntry type="module" module-name="testng_rt" />
     <orderEntry type="module" module-name="java-i18n" />
-    <orderEntry type="module" module-name="testFramework-java" />
+    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="jsp-openapi" />