diff --git a/.idea/modules.xml b/.idea/modules.xml
index 969cd141d4a8..1f789ed48f14 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -29,6 +29,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-runtime/java-runtime.iml" filepath="$PROJECT_DIR$/java/java-runtime/java-runtime.iml" group="java" />
+      <module fileurl="file://$PROJECT_DIR$/java/java-tests/java-tests.iml" filepath="$PROJECT_DIR$/java/java-tests/java-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/compiler/javac2/javac2.iml" filepath="$PROJECT_DIR$/java/compiler/javac2/javac2.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/cvs/javacvs-src/javacvs-src.iml" filepath="$PROJECT_DIR$/plugins/cvs/javacvs-src/javacvs-src.iml" group="plugins/cvs" />
       <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" />
diff --git a/community-main.iml b/community-main.iml
index c68b38302ccf..52a14b717105 100644
--- a/community-main.iml
+++ b/community-main.iml
@@ -53,6 +53,11 @@
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="xml-openapi" />
     <orderEntry type="module" module-name="community-resources" />
+    <orderEntry type="module" module-name="java-tests" />
+    <orderEntry type="module" module-name="copyright" />
+    <orderEntry type="module" module-name="cvs-plugin" />
+    <orderEntry type="module" module-name="java-i18n" />
+    <orderEntry type="module" module-name="ui-designer" />
   </component>
 </module>
 
diff --git a/java/java-tests/java-tests.iml b/java/java-tests/java-tests.iml
new file mode 100644
index 000000000000..080bb501ffce
--- /dev/null
+++ b/java/java-tests/java-tests.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" 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="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="testFramework-java" />
+    <orderEntry type="module" module-name="java-impl" />
+  </component>
+</module>
+
diff --git a/testData/refactoring/anonymousToInner/genericTypeParameters.java b/java/java-tests/testData/refactoring/anonymousToInner/genericTypeParameters.java
similarity index 100%
rename from testData/refactoring/anonymousToInner/genericTypeParameters.java
rename to java/java-tests/testData/refactoring/anonymousToInner/genericTypeParameters.java
diff --git a/testData/refactoring/anonymousToInner/genericTypeParameters_after.java b/java/java-tests/testData/refactoring/anonymousToInner/genericTypeParameters_after.java
similarity index 100%
rename from testData/refactoring/anonymousToInner/genericTypeParameters_after.java
rename to java/java-tests/testData/refactoring/anonymousToInner/genericTypeParameters_after.java
diff --git a/java/java-tests/testSrc/com/intellij/JavaTestUtil.java b/java/java-tests/testSrc/com/intellij/JavaTestUtil.java
new file mode 100644
index 000000000000..c623e42d40f5
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/JavaTestUtil.java
@@ -0,0 +1,22 @@
+package com.intellij;
+
+import com.intellij.openapi.application.PathManager;
+import org.jetbrains.annotations.NonNls;
+
+import java.io.File;
+
+/**
+ * @author yole
+ */
+public class JavaTestUtil {
+  @NonNls private static final String JAVA_TEST_DATA = "java/java-tests/testData";
+
+  public static String getJavaTestDataPath() {
+    final String homePath = PathManager.getHomePath();
+    File dir = new File(homePath, "community/" + JAVA_TEST_DATA);
+    if (dir.exists()) {
+      return dir.getPath();
+    }
+    return new File(homePath, JAVA_TEST_DATA).getPath();
+  }
+}
diff --git a/refactoring/tests/com/intellij/refactoring/AnonymousToInnerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/AnonymousToInnerTest.java
similarity index 89%
rename from refactoring/tests/com/intellij/refactoring/AnonymousToInnerTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/AnonymousToInnerTest.java
index f62afae9e45a..56d224e294ef 100644
--- a/refactoring/tests/com/intellij/refactoring/AnonymousToInnerTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/AnonymousToInnerTest.java
@@ -1,5 +1,6 @@
 package com.intellij.refactoring;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.codeInsight.CodeInsightTestCase;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
@@ -11,6 +12,11 @@ import com.intellij.refactoring.anonymousToInner.AnonymousToInnerHandler;
 public class AnonymousToInnerTest extends CodeInsightTestCase {
   private static final String TEST_ROOT = "/refactoring/anonymousToInner/";
 
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   @Override
   protected Sdk getTestProjectJdk() {
     return JavaSdkImpl.getMockJdk15("java 1.5");