diff --git a/.idea/modules.xml b/.idea/modules.xml
index d7c5d4aea264..2c0aba589b39 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -98,6 +98,8 @@
       <module fileurl="file://$PROJECT_DIR$/jps/model-api/jps-model-api.iml" filepath="$PROJECT_DIR$/jps/model-api/jps-model-api.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/jps/model-impl/jps-model-impl.iml" filepath="$PROJECT_DIR$/jps/model-impl/jps-model-impl.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/jps/model-serialization/jps-model-serialization.iml" filepath="$PROJECT_DIR$/jps/model-serialization/jps-model-serialization.iml" group="jps" />
+      <module fileurl="file://$PROJECT_DIR$/jps/model-impl/jps-model-tests.iml" filepath="$PROJECT_DIR$/jps/model-impl/jps-model-tests.iml"/>
+      <module fileurl="file://$PROJECT_DIR$/jps/model-serialization/jps-serialization-tests.iml" filepath="$PROJECT_DIR$/jps/model-serialization/jps-serialization-tests.iml" group="jps"/>
       <module fileurl="file://$PROJECT_DIR$/jps/standalone-builder/jps-standalone-builder.iml" filepath="$PROJECT_DIR$/jps/standalone-builder/jps-standalone-builder.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/java/jsp-base-openapi/jsp-base-openapi.iml" filepath="$PROJECT_DIR$/java/jsp-base-openapi/jsp-base-openapi.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/jsp-openapi/jsp-openapi.iml" filepath="$PROJECT_DIR$/java/jsp-openapi/jsp-openapi.iml" group="java" />
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 8a9c8d069137..ef49e7357182 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -749,8 +749,8 @@ def layoutCommunityJps(String home, String target) {
     dir("test") {
       jar("jps-build-test.jar") {
         moduleTests("jps-builders")
-        moduleTests("jps-model-impl")
-        moduleTests("jps-model-serialization")
+        moduleTests("jps-model-tests")
+        moduleTests("jps-serialization-tests")
       }
     }
     jar("ant-jps-plugin.jar") { module("ant-jps-plugin") }
diff --git a/community-main.iml b/community-main.iml
index 6e14389c34ad..474b93df4d31 100644
--- a/community-main.iml
+++ b/community-main.iml
@@ -93,6 +93,9 @@
     <orderEntry type="module" module-name="manifest" />
     <orderEntry type="module" module-name="xml-tests" scope="TEST" />
     <orderEntry type="module" module-name="devkit-jps-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="jps-model-tests" scope="TEST" />
+    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
+    <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
     <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
     <orderEntry type="module" module-name="java-tests" scope="TEST" />
     <orderEntry type="module" module-name="community-tests" scope="TEST" />
diff --git a/jps/jps-builders/jps-builders.iml b/jps/jps-builders/jps-builders.iml
index fea80a020e80..9dd56d591d6e 100644
--- a/jps/jps-builders/jps-builders.iml
+++ b/jps/jps-builders/jps-builders.iml
@@ -36,6 +36,7 @@
     <orderEntry type="module" module-name="jps-model-serialization" />
     <orderEntry type="module" module-name="jps-model-impl" />
     <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
+    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
   </component>
 </module>
 
diff --git a/jps/model-impl/jps-model-impl.iml b/jps/model-impl/jps-model-impl.iml
index 5e72944c0f30..447c25cc7583 100644
--- a/jps/model-impl/jps-model-impl.iml
+++ b/jps/model-impl/jps-model-impl.iml
@@ -4,13 +4,11 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="jps-model-api" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
   </component>
 </module>
 
diff --git a/jps/model-impl/jps-model-tests.iml b/jps/model-impl/jps-model-tests.iml
new file mode 100644
index 000000000000..f42308922277
--- /dev/null
+++ b/jps/model-impl/jps-model-tests.iml
@@ -0,0 +1,14 @@
+<?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$/testSrc">
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="jps-model-impl" />
+    <orderEntry type="module" module-name="testFramework" exported="" scope="TEST" />
+  </component>
+</module>
+
diff --git a/jps/model-serialization/jps-model-serialization.iml b/jps/model-serialization/jps-model-serialization.iml
index 988e3c506729..6859151b1bd5 100644
--- a/jps/model-serialization/jps-model-serialization.iml
+++ b/jps/model-serialization/jps-model-serialization.iml
@@ -4,15 +4,12 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="jps-model-api" />
     <orderEntry type="library" exported="" name="JDOM" level="project" />
-    <orderEntry type="module" module-name="jps-model-impl" exported="" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework" exported="" scope="TEST" />
   </component>
 </module>
 
diff --git a/jps/model-serialization/jps-serialization-tests.iml b/jps/model-serialization/jps-serialization-tests.iml
new file mode 100644
index 000000000000..953fef28dd82
--- /dev/null
+++ b/jps/model-serialization/jps-serialization-tests.iml
@@ -0,0 +1,14 @@
+<?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$/testSrc">
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="jps-model-serialization" />
+    <orderEntry type="module" module-name="jps-model-tests" exported="" scope="TEST" />
+  </component>
+</module>
+
diff --git a/platform/platform-tests/platform-tests.iml b/platform/platform-tests/platform-tests.iml
index d1018688da69..f6d37e431c5e 100644
--- a/platform/platform-tests/platform-tests.iml
+++ b/platform/platform-tests/platform-tests.iml
@@ -23,6 +23,7 @@
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="library" name="Netty" level="project" />
     <orderEntry type="library" name="http-client" level="project" />
+    <orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/ant/jps-plugin/ant-jps-plugin.iml b/plugins/ant/jps-plugin/ant-jps-plugin.iml
index 976f684d067a..12aeb835539a 100644
--- a/plugins/ant/jps-plugin/ant-jps-plugin.iml
+++ b/plugins/ant/jps-plugin/ant-jps-plugin.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="jps-builders" />
     <orderEntry type="module" module-name="java-runtime" />
+    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/devkit/jps-plugin/devkit-jps-plugin.iml b/plugins/devkit/jps-plugin/devkit-jps-plugin.iml
index f88b075e0722..a80f7f38f339 100644
--- a/plugins/devkit/jps-plugin/devkit-jps-plugin.iml
+++ b/plugins/devkit/jps-plugin/devkit-jps-plugin.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="jps-model-serialization" />
     <orderEntry type="module" module-name="jps-builders" />
     <orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
+    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml b/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml
index e471a6a62370..313b6317ce0a 100644
--- a/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml
+++ b/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="jps-model-serialization" />
     <orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
     <orderEntry type="module" module-name="appEngine-runtime" />
+    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/maven/jps-plugin/maven-jps-plugin.iml b/plugins/maven/jps-plugin/maven-jps-plugin.iml
index 8098c4c4d4ba..f601ed39bca5 100644
--- a/plugins/maven/jps-plugin/maven-jps-plugin.iml
+++ b/plugins/maven/jps-plugin/maven-jps-plugin.iml
@@ -22,6 +22,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml b/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml
index f46639653871..70277d7b2991 100644
--- a/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml
+++ b/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="instrumentation-util" />
     <orderEntry type="module" module-name="forms-compiler" />
     <orderEntry type="module" module-name="forms_rt" />
+    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
   </component>
 </module>