diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index 77ee216e9bdd..72169b16647d 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -15,7 +15,7 @@
     <orderEntry type="library" name="commons-collections" level="project" />
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="lang-impl" exported="" />
+    <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="compiler-openapi" />
     <orderEntry type="module" module-name="jsp-openapi" />
     <orderEntry type="module" module-name="jsp-spi" />
@@ -27,9 +27,6 @@
     <orderEntry type="module" module-name="icons" />
     <orderEntry type="library" name="jcip" level="project" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="library" name="JUnit4" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/openapi/openapi.iml b/java/openapi/openapi.iml
index 51baca32eb85..a85d11a03eaf 100644
--- a/java/openapi/openapi.iml
+++ b/java/openapi/openapi.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" exported="" />
+    <orderEntry type="module" module-name="java-runtime" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="module" module-name="forms_rt" />
@@ -20,9 +21,10 @@
     <orderEntry type="module" module-name="xml-openapi" exported="" />
     <orderEntry type="module" module-name="platform-api" exported="" />
     <orderEntry type="module" module-name="lang-api" exported="" />
-    <orderEntry type="module" module-name="vcs-api" exported="" />
+    <orderEntry type="module" module-name="vcs-api" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="module" module-name="dom-openapi" />
+    <orderEntry type="module" module-name="testFramework" exported="" />
     <orderEntry type="module" module-name="resources-en" exported="" />
   </component>
   <component name="copyright">
diff --git a/java/testFramework/testFramework-java.iml b/java/testFramework/testFramework-java.iml
index 129c4b2f135a..2f47c91bd82a 100644
--- a/java/testFramework/testFramework-java.iml
+++ b/java/testFramework/testFramework-java.iml
@@ -19,7 +19,6 @@
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="execution-impl" exported="" scope="RUNTIME" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="testFramework" exported="" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/platform/platform-api/platform-api.iml b/platform/platform-api/platform-api.iml
index 83a05aab22d6..b6f986353ec8 100644
--- a/platform/platform-api/platform-api.iml
+++ b/platform/platform-api/platform-api.iml
@@ -22,7 +22,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/automaton.jar!/" />
+          <root url="jar://$USER_HOME$/IDEA/community/lib/automaton.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/platform/xdebugger-impl/xdebugger-impl.iml b/platform/xdebugger-impl/xdebugger-impl.iml
index fe6cfde3d218..0dddb25ce6c6 100644
--- a/platform/xdebugger-impl/xdebugger-impl.iml
+++ b/platform/xdebugger-impl/xdebugger-impl.iml
@@ -12,9 +12,6 @@
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="platform-resources" />
-    <orderEntry type="module" module-name="dom-impl" scope="TEST" />
-    <orderEntry type="module" module-name="xml" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/IdeaTestAssistant/IdeaTestAssistant.iml b/plugins/IdeaTestAssistant/IdeaTestAssistant.iml
index 89f6e6488d3b..ef81570a1acd 100644
--- a/plugins/IdeaTestAssistant/IdeaTestAssistant.iml
+++ b/plugins/IdeaTestAssistant/IdeaTestAssistant.iml
@@ -11,9 +11,6 @@
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="idea-tests" scope="TEST" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="testFramework" />
   </component>
 </module>
 
diff --git a/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml b/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml
index 923cb85bf2a6..46a5ffe9a273 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml
+++ b/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="jsp-openapi" />
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="idea-tests" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/maven/maven.iml b/plugins/maven/maven.iml
index 7b7591ea9c8e..9fcf9be4dc66 100644
--- a/plugins/maven/maven.iml
+++ b/plugins/maven/maven.iml
@@ -27,8 +27,10 @@
     <orderEntry type="module" module-name="forms_rt" exported="" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="idea-tests" scope="TEST" />
     <orderEntry type="module" module-name="testFramework-java" exported="" scope="TEST" />
     <orderEntry type="module" module-name="jetgroovy" scope="TEST" />
+    <orderEntry type="module" module-name="FlexSupport" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>