diff --git a/testData/refactoring/introduceField/after1.java b/java/java-tests/testData/refactoring/introduceField/after1.java
similarity index 100%
rename from testData/refactoring/introduceField/after1.java
rename to java/java-tests/testData/refactoring/introduceField/after1.java
diff --git a/testData/refactoring/introduceField/afterBeforeExist.java b/java/java-tests/testData/refactoring/introduceField/afterBeforeExist.java
similarity index 100%
rename from testData/refactoring/introduceField/afterBeforeExist.java
rename to java/java-tests/testData/refactoring/introduceField/afterBeforeExist.java
diff --git a/testData/refactoring/introduceField/afterBeforeNotExist.java b/java/java-tests/testData/refactoring/introduceField/afterBeforeNotExist.java
similarity index 100%
rename from testData/refactoring/introduceField/afterBeforeNotExist.java
rename to java/java-tests/testData/refactoring/introduceField/afterBeforeNotExist.java
diff --git a/testData/refactoring/introduceField/afterBeforeNotExist1.java b/java/java-tests/testData/refactoring/introduceField/afterBeforeNotExist1.java
similarity index 100%
rename from testData/refactoring/introduceField/afterBeforeNotExist1.java
rename to java/java-tests/testData/refactoring/introduceField/afterBeforeNotExist1.java
diff --git a/testData/refactoring/introduceField/afterElseClause.java b/java/java-tests/testData/refactoring/introduceField/afterElseClause.java
similarity index 100%
rename from testData/refactoring/introduceField/afterElseClause.java
rename to java/java-tests/testData/refactoring/introduceField/afterElseClause.java
diff --git a/testData/refactoring/introduceField/afterInSetUp.java b/java/java-tests/testData/refactoring/introduceField/afterInSetUp.java
similarity index 100%
rename from testData/refactoring/introduceField/afterInSetUp.java
rename to java/java-tests/testData/refactoring/introduceField/afterInSetUp.java
diff --git a/testData/refactoring/introduceField/afterInitiallyInSetUp.java b/java/java-tests/testData/refactoring/introduceField/afterInitiallyInSetUp.java
similarity index 100%
rename from testData/refactoring/introduceField/afterInitiallyInSetUp.java
rename to java/java-tests/testData/refactoring/introduceField/afterInitiallyInSetUp.java
diff --git a/testData/refactoring/introduceField/afterOuterClass.java b/java/java-tests/testData/refactoring/introduceField/afterOuterClass.java
similarity index 100%
rename from testData/refactoring/introduceField/afterOuterClass.java
rename to java/java-tests/testData/refactoring/introduceField/afterOuterClass.java
diff --git a/testData/refactoring/introduceField/afterPublicBaseClassSetUp.java b/java/java-tests/testData/refactoring/introduceField/afterPublicBaseClassSetUp.java
similarity index 100%
rename from testData/refactoring/introduceField/afterPublicBaseClassSetUp.java
rename to java/java-tests/testData/refactoring/introduceField/afterPublicBaseClassSetUp.java
diff --git a/testData/refactoring/introduceField/before1.java b/java/java-tests/testData/refactoring/introduceField/before1.java
similarity index 100%
rename from testData/refactoring/introduceField/before1.java
rename to java/java-tests/testData/refactoring/introduceField/before1.java
diff --git a/testData/refactoring/introduceField/beforeBeforeExist.java b/java/java-tests/testData/refactoring/introduceField/beforeBeforeExist.java
similarity index 100%
rename from testData/refactoring/introduceField/beforeBeforeExist.java
rename to java/java-tests/testData/refactoring/introduceField/beforeBeforeExist.java
diff --git a/testData/refactoring/introduceField/beforeBeforeNotExist.java b/java/java-tests/testData/refactoring/introduceField/beforeBeforeNotExist.java
similarity index 100%
rename from testData/refactoring/introduceField/beforeBeforeNotExist.java
rename to java/java-tests/testData/refactoring/introduceField/beforeBeforeNotExist.java
diff --git a/testData/refactoring/introduceField/beforeBeforeNotExist1.java b/java/java-tests/testData/refactoring/introduceField/beforeBeforeNotExist1.java
similarity index 100%
rename from testData/refactoring/introduceField/beforeBeforeNotExist1.java
rename to java/java-tests/testData/refactoring/introduceField/beforeBeforeNotExist1.java
diff --git a/testData/refactoring/introduceField/beforeElseClause.java b/java/java-tests/testData/refactoring/introduceField/beforeElseClause.java
similarity index 100%
rename from testData/refactoring/introduceField/beforeElseClause.java
rename to java/java-tests/testData/refactoring/introduceField/beforeElseClause.java
diff --git a/testData/refactoring/introduceField/beforeInSetUp.java b/java/java-tests/testData/refactoring/introduceField/beforeInSetUp.java
similarity index 100%
rename from testData/refactoring/introduceField/beforeInSetUp.java
rename to java/java-tests/testData/refactoring/introduceField/beforeInSetUp.java
diff --git a/testData/refactoring/introduceField/beforeInitiallyInSetUp.java b/java/java-tests/testData/refactoring/introduceField/beforeInitiallyInSetUp.java
similarity index 100%
rename from testData/refactoring/introduceField/beforeInitiallyInSetUp.java
rename to java/java-tests/testData/refactoring/introduceField/beforeInitiallyInSetUp.java
diff --git a/testData/refactoring/introduceField/beforeOuterClass.java b/java/java-tests/testData/refactoring/introduceField/beforeOuterClass.java
similarity index 100%
rename from testData/refactoring/introduceField/beforeOuterClass.java
rename to java/java-tests/testData/refactoring/introduceField/beforeOuterClass.java
diff --git a/testData/refactoring/introduceField/beforePublicBaseClassSetUp.java b/java/java-tests/testData/refactoring/introduceField/beforePublicBaseClassSetUp.java
similarity index 100%
rename from testData/refactoring/introduceField/beforePublicBaseClassSetUp.java
rename to java/java-tests/testData/refactoring/introduceField/beforePublicBaseClassSetUp.java
diff --git a/refactoring/tests/com/intellij/refactoring/IntroduceFieldInSameClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
similarity index 69%
rename from refactoring/tests/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
index 623d9e12d582..f3e64aa6667a 100644
--- a/refactoring/tests/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
@@ -1,12 +1,18 @@
 package com.intellij.refactoring;
 
-import com.intellij.codeInsight.CodeInsightTestCase;
 import com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler;
+import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.JavaTestUtil;
 
 /**
  * @author ven
  */
-public class IntroduceFieldInSameClassTest extends CodeInsightTestCase {
+public class IntroduceFieldInSameClassTest extends LightCodeInsightTestCase {
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   public void testInClassInitializer () throws Exception {
     configureByFile("/refactoring/introduceField/before1.java");
     performRefactoring(BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION, true);
@@ -25,7 +31,7 @@ public class IntroduceFieldInSameClassTest extends CodeInsightTestCase {
     checkResultByFile("/refactoring/introduceField/afterOuterClass.java");
   }
 
-  private void performRefactoring(final BaseExpressionToFieldHandler.InitializationPlace initializationPlace, final boolean declareStatic) {
-    new MockIntroduceFieldHandler(initializationPlace, declareStatic).invoke(myProject, myEditor, myFile, null);
+  private static void performRefactoring(final BaseExpressionToFieldHandler.InitializationPlace initializationPlace, final boolean declareStatic) {
+    new MockIntroduceFieldHandler(initializationPlace, declareStatic).invoke(getProject(), myEditor, myFile, null);
   }
 }
\ No newline at end of file
diff --git a/refactoring/tests/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java
similarity index 96%
rename from refactoring/tests/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java
index c16b7168198f..11272fad6118 100644
--- a/refactoring/tests/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java
@@ -24,11 +24,17 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler;
 import com.intellij.refactoring.introduceField.LocalToFieldHandler;
 import com.intellij.util.PathUtil;
+import com.intellij.JavaTestUtil;
 import org.junit.Before;
 
 import java.io.File;
 
 public class IntroduceFieldWitSetUpInitializationTest extends CodeInsightTestCase {
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   protected Module createModule(final String name) {
     final Module module = super.createModule(name);
     final ModifiableRootModel model = ModuleRootManager.getInstance(module).getModifiableModel();
diff --git a/refactoring/tests/com/intellij/refactoring/MockIntroduceFieldHandler.java b/java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceFieldHandler.java
similarity index 100%
rename from refactoring/tests/com/intellij/refactoring/MockIntroduceFieldHandler.java
rename to java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceFieldHandler.java