diff --git a/.idea/modules.xml b/.idea/modules.xml
index 64ffdfd4d231..e764423d92c9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -757,6 +757,7 @@
       <module fileurl="file://$PROJECT_DIR$/jps/model-impl/intellij.platform.jps.model.impl.iml" filepath="$PROJECT_DIR$/jps/model-impl/intellij.platform.jps.model.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/jps/model-serialization/intellij.platform.jps.model.serialization.iml" filepath="$PROJECT_DIR$/jps/model-serialization/intellij.platform.jps.model.serialization.iml" />
       <module fileurl="file://$PROJECT_DIR$/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml" filepath="$PROJECT_DIR$/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jps/model-test-framework/intellij.platform.jps.model.testFramework.iml" filepath="$PROJECT_DIR$/jps/model-test-framework/intellij.platform.jps.model.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/jps/model-impl/intellij.platform.jps.model.tests.iml" filepath="$PROJECT_DIR$/jps/model-impl/intellij.platform.jps.model.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/kernel/shared/intellij.platform.kernel.iml" filepath="$PROJECT_DIR$/platform/kernel/shared/intellij.platform.kernel.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/kernel/backend/intellij.platform.kernel.backend.iml" filepath="$PROJECT_DIR$/platform/kernel/backend/intellij.platform.kernel.backend.iml" />
diff --git a/jps/jps-builders/intellij.platform.jps.build.tests.iml b/jps/jps-builders/intellij.platform.jps.build.tests.iml
index e567f12392de..88d8aa273cb2 100644
--- a/jps/jps-builders/intellij.platform.jps.build.tests.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.tests.iml
@@ -73,5 +73,6 @@
     </orderEntry>
     <orderEntry type="library" scope="TEST" name="mvstore" level="project" />
     <orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps/model-impl/intellij.platform.jps.model.tests.iml b/jps/model-impl/intellij.platform.jps.model.tests.iml
index 7fac74a7b4f2..8b98c71326a5 100644
--- a/jps/model-impl/intellij.platform.jps.model.tests.iml
+++ b/jps/model-impl/intellij.platform.jps.model.tests.iml
@@ -16,5 +16,6 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
index 217a812b9562..1b6153cbd77a 100644
--- a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
+++ b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
@@ -16,5 +16,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps/model-test-framework/intellij.platform.jps.model.testFramework.iml b/jps/model-test-framework/intellij.platform.jps.model.testFramework.iml
new file mode 100644
index 000000000000..239a803605e7
--- /dev/null
+++ b/jps/model-test-framework/intellij.platform.jps.model.testFramework.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$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="org.jetbrains.jps.model" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsJavaModelTestCase.java b/jps/model-test-framework/src/JpsJavaModelTestCase.java
similarity index 100%
rename from jps/model-impl/testSrc/org/jetbrains/jps/model/JpsJavaModelTestCase.java
rename to jps/model-test-framework/src/JpsJavaModelTestCase.java
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModelTestCase.java b/jps/model-test-framework/src/JpsModelTestCase.java
similarity index 100%
rename from jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModelTestCase.java
rename to jps/model-test-framework/src/JpsModelTestCase.java
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModuleRootModificationUtil.java b/jps/model-test-framework/src/JpsModuleRootModificationUtil.java
similarity index 100%
rename from jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModuleRootModificationUtil.java
rename to jps/model-test-framework/src/JpsModuleRootModificationUtil.java