diff --git a/jps/plugins/appLauncher/jps-appLauncher.iml b/jps/plugins/appLauncher/jps-appLauncher.iml
index 9d7005eff21a..d9956ab5a6d8 100644
--- a/jps/plugins/appLauncher/jps-appLauncher.iml
+++ b/jps/plugins/appLauncher/jps-appLauncher.iml
@@ -8,7 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="jps" />
   </component>
 </module>
diff --git a/platform/lang-api/lang-api.iml b/platform/lang-api/lang-api.iml
index d06a652f25b6..b8ffb1cfee1c 100644
--- a/platform/lang-api/lang-api.iml
+++ b/platform/lang-api/lang-api.iml
@@ -13,8 +13,7 @@
     <orderEntry type="library" exported="" name="NanoXML" level="project" />
     <orderEntry type="module" module-name="indexing-api" exported="" />
     <orderEntry type="module" module-name="projectModel-api" exported="" />
-    <orderEntry type="library" name="JUnit4" level="project" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
   </component>
 </module>
diff --git a/plugins/android/jps-plugin/android-jps-plugin.iml b/plugins/android/jps-plugin/android-jps-plugin.iml
index db00e53362c4..a4d0b0482d49 100644
--- a/plugins/android/jps-plugin/android-jps-plugin.iml
+++ b/plugins/android/jps-plugin/android-jps-plugin.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="android-common" />
     <orderEntry type="module" module-name="android-rt" />
     <orderEntry type="module" module-name="jps-builders" />
diff --git a/plugins/devkit/devkit.iml b/plugins/devkit/devkit.iml
index b93f9b89dad8..4e4c26d53abd 100644
--- a/plugins/devkit/devkit.iml
+++ b/plugins/devkit/devkit.iml
@@ -25,7 +25,7 @@
     <orderEntry type="module" module-name="properties" />
     <orderEntry type="module" module-name="idea-ui" scope="TEST" />
     <orderEntry type="module" module-name="xml" />
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
   </component>
 </module>
 
diff --git a/plugins/git4idea/git4idea.iml b/plugins/git4idea/git4idea.iml
index 5101ecce09a8..51990523b93c 100644
--- a/plugins/git4idea/git4idea.iml
+++ b/plugins/git4idea/git4idea.iml
@@ -70,7 +70,7 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
   </component>
 </module>
 
diff --git a/plugins/rearranger/rearranger.iml b/plugins/rearranger/rearranger.iml
index 441eb107d823..bdf57652531f 100644
--- a/plugins/rearranger/rearranger.iml
+++ b/plugins/rearranger/rearranger.iml
@@ -8,7 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="core-api" />
     <orderEntry type="module" module-name="java-psi-api" />
     <orderEntry type="library" name="JUnit4" level="project" />
@@ -17,8 +16,8 @@
     <orderEntry type="module" module-name="java-impl" scope="TEST" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="java-indexing-api" />
+    <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
   </component>
 </module>