diff --git a/idea-tests/src/com/intellij/projectView/BaseProjectViewTestCase.java b/java/testFramework/src/com/intellij/projectView/BaseProjectViewTestCase.java
similarity index 100%
rename from idea-tests/src/com/intellij/projectView/BaseProjectViewTestCase.java
rename to java/testFramework/src/com/intellij/projectView/BaseProjectViewTestCase.java
diff --git a/idea-tests/src/com/intellij/projectView/TestProjectTreeStructure.java b/java/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java
similarity index 100%
rename from idea-tests/src/com/intellij/projectView/TestProjectTreeStructure.java
rename to java/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/GridChangeUtilTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/GridChangeUtilTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/GridChangeUtilTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/GridChangeUtilTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/TextDifferTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/TextDifferTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/TextDifferTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/TextDifferTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/binding/FormEnumUsageTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/binding/FormEnumUsageTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProviderTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/radComponents/GridInsertLocationTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/radComponents/GridInsertLocationTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/radComponents/GridInsertLocationTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/radComponents/GridInsertLocationTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/radComponents/RadFormLayoutManagerTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/radComponents/RadFormLayoutManagerTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/radComponents/RadFormLayoutManagerTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/radComponents/RadFormLayoutManagerTest.java
diff --git a/ui-designer/tests/com/intellij/uiDesigner/radComponents/RadGridBagLayoutManagerTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/radComponents/RadGridBagLayoutManagerTest.java
similarity index 100%
rename from ui-designer/tests/com/intellij/uiDesigner/radComponents/RadGridBagLayoutManagerTest.java
rename to plugins/ui-designer/testSrc/com/intellij/uiDesigner/radComponents/RadGridBagLayoutManagerTest.java
diff --git a/plugins/ui-designer/ui-designer.iml b/plugins/ui-designer/ui-designer.iml
index b3f63e2c89ec..3b447671e111 100644
--- a/plugins/ui-designer/ui-designer.iml
+++ b/plugins/ui-designer/ui-designer.iml
@@ -4,10 +4,10 @@
     <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="idea" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="forms-compiler" />
@@ -17,13 +17,14 @@
     <orderEntry type="module" module-name="execution-impl" />
     <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="refactoring-impl" />
     <orderEntry type="module" module-name="icons" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="java-i18n" exported="" />
     <orderEntry type="module" module-name="idea-ui" />
+    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="java-impl" />
   </component>
   <component name="copyright">
     <Base>