diff --git a/.idea/modules.xml b/.idea/modules.xml
index fd2fef81da73..d0079e072722 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -438,6 +438,7 @@
       <module fileurl="file://$PROJECT_DIR$/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml" filepath="$PROJECT_DIR$/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/intellij.java.guiForms.designer.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/intellij.java.guiForms.designer.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/forms_rt/intellij.java.guiForms.rt.iml" filepath="$PROJECT_DIR$/platform/forms_rt/intellij.java.guiForms.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/intellij.java.i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/intellij.java.i18n.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/ide-customization/intellij.java.ide.customization.iml" filepath="$PROJECT_DIR$/java/ide-customization/intellij.java.ide.customization.iml" />
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 9323cb36f26a..3d4cd152952f 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -210,6 +210,7 @@
     <orderEntry type="module" module-name="intellij.lombok" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.xmlbeans" scope="TEST" />
     <orderEntry type="module" module-name="intellij.jsonpath" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.jps.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.newUiOnboarding" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.ide.newUsersOnboarding" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.kotlin.onboarding-promoter" scope="RUNTIME" />
diff --git a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml
index 859e9880cbd7..900a694c5bb5 100644
--- a/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml
+++ b/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml
@@ -20,23 +20,18 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />
     <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
     <orderEntry type="module" module-name="intellij.java.guiForms.compiler" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Java Compatibility" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="module" module-name="intellij.platform.jps.build.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml b/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml
new file mode 100644
index 000000000000..cdb8c3b5f132
--- /dev/null
+++ b/plugins/ui-designer/jps-plugin/tests/intellij.java.guiForms.jps.tests.iml
@@ -0,0 +1,18 @@
+<?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$/testSrc" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.jps" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="ASM" level="project" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.rt" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/ui-designer/jps-plugin/testData/build/alienFormFile/aa/NewJPanel.form b/plugins/ui-designer/jps-plugin/tests/testData/build/alienFormFile/aa/NewJPanel.form
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/build/alienFormFile/aa/NewJPanel.form
rename to plugins/ui-designer/jps-plugin/tests/testData/build/alienFormFile/aa/NewJPanel.form
diff --git a/plugins/ui-designer/jps-plugin/testData/build/alienFormFile/aa/NewJPanel.java b/plugins/ui-designer/jps-plugin/tests/testData/build/alienFormFile/aa/NewJPanel.java
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/build/alienFormFile/aa/NewJPanel.java
rename to plugins/ui-designer/jps-plugin/tests/testData/build/alienFormFile/aa/NewJPanel.java
diff --git a/plugins/ui-designer/jps-plugin/testData/build/simple/xxx/Constants.java b/plugins/ui-designer/jps-plugin/tests/testData/build/simple/xxx/Constants.java
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/build/simple/xxx/Constants.java
rename to plugins/ui-designer/jps-plugin/tests/testData/build/simple/xxx/Constants.java
diff --git a/plugins/ui-designer/jps-plugin/testData/build/simple/xxx/MyClass.java b/plugins/ui-designer/jps-plugin/tests/testData/build/simple/xxx/MyClass.java
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/build/simple/xxx/MyClass.java
rename to plugins/ui-designer/jps-plugin/tests/testData/build/simple/xxx/MyClass.java
diff --git a/plugins/ui-designer/jps-plugin/testData/build/simple/xxx/MyForm.form b/plugins/ui-designer/jps-plugin/tests/testData/build/simple/xxx/MyForm.form
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/build/simple/xxx/MyForm.form
rename to plugins/ui-designer/jps-plugin/tests/testData/build/simple/xxx/MyForm.form
diff --git a/plugins/ui-designer/jps-plugin/testData/build/simple/xxx/MyForm.java b/plugins/ui-designer/jps-plugin/tests/testData/build/simple/xxx/MyForm.java
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/build/simple/xxx/MyForm.java
rename to plugins/ui-designer/jps-plugin/tests/testData/build/simple/xxx/MyForm.java
diff --git a/plugins/ui-designer/jps-plugin/testData/uiDesigner/.idea/misc.xml b/plugins/ui-designer/jps-plugin/tests/testData/uiDesigner/.idea/misc.xml
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/uiDesigner/.idea/misc.xml
rename to plugins/ui-designer/jps-plugin/tests/testData/uiDesigner/.idea/misc.xml
diff --git a/plugins/ui-designer/jps-plugin/testData/uiDesigner/.idea/modules.xml b/plugins/ui-designer/jps-plugin/tests/testData/uiDesigner/.idea/modules.xml
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/uiDesigner/.idea/modules.xml
rename to plugins/ui-designer/jps-plugin/tests/testData/uiDesigner/.idea/modules.xml
diff --git a/plugins/ui-designer/jps-plugin/testData/uiDesigner/.idea/uiDesigner.xml b/plugins/ui-designer/jps-plugin/tests/testData/uiDesigner/.idea/uiDesigner.xml
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testData/uiDesigner/.idea/uiDesigner.xml
rename to plugins/ui-designer/jps-plugin/tests/testData/uiDesigner/.idea/uiDesigner.xml
diff --git a/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsBuilderTest.java b/plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/build/FormsBuilderTest.java
similarity index 98%
rename from plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsBuilderTest.java
rename to plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/build/FormsBuilderTest.java
index c8fa02083c04..1726ccd38374 100644
--- a/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsBuilderTest.java
+++ b/plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/build/FormsBuilderTest.java
@@ -34,7 +34,7 @@ import java.io.File;
 import java.io.IOException;
 
 public class FormsBuilderTest extends JpsBuildTestCase {
-  private static final String SIMPLE_FORM_PATH = "plugins/ui-designer/jps-plugin/testData/build/simple";
+  private static final String SIMPLE_FORM_PATH = "plugins/ui-designer/jps-plugin/tests/testData/build/simple";
 
   public void testSimple() {
     JpsModule m = addModule("m", copyToProject(SIMPLE_FORM_PATH, "src"));
@@ -98,7 +98,7 @@ public class FormsBuilderTest extends JpsBuildTestCase {
   }
 
   public void testDoNotCopyRuntimeClassesIfOnlyAlienFormFilesExist() {
-    JpsModule module = addModule("m", copyToProject("plugins/ui-designer/jps-plugin/testData/build/alienFormFile", "src"));
+    JpsModule module = addModule("m", copyToProject("plugins/ui-designer/jps-plugin/tests/testData/build/alienFormFile", "src"));
     buildAllModules().assertSuccessful();
     assertFalse(isRuntimeClassesCopied(module));
   }
diff --git a/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsIncrementalBuildingTest.java b/plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/build/FormsIncrementalBuildingTest.java
similarity index 100%
rename from plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsIncrementalBuildingTest.java
rename to plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/build/FormsIncrementalBuildingTest.java
diff --git a/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/model/JpsUiDesignerConfigurationSerializationTest.java b/plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/model/JpsUiDesignerConfigurationSerializationTest.java
similarity index 94%
rename from plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/model/JpsUiDesignerConfigurationSerializationTest.java
rename to plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/model/JpsUiDesignerConfigurationSerializationTest.java
index d016e6588ae0..d55b88589b0f 100644
--- a/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/model/JpsUiDesignerConfigurationSerializationTest.java
+++ b/plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/model/JpsUiDesignerConfigurationSerializationTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.*;
 public class JpsUiDesignerConfigurationSerializationTest {
   @Test
   public void testLoad() {
-    JpsProjectData projectData = JpsProjectData.loadFromTestData("plugins/ui-designer/jps-plugin/testData/uiDesigner", getClass());
+    JpsProjectData projectData = JpsProjectData.loadFromTestData("plugins/ui-designer/jps-plugin/tests/testData/uiDesigner", getClass());
     JpsProject project = projectData.getProject();
     JpsUiDesignerConfiguration configuration = JpsUiDesignerExtensionService.getInstance().getUiDesignerConfiguration(project);
     assertNotNull(configuration);