diff --git a/testData/refactoring/moveInstanceMethod/IDEADEV11257.java b/java/java-tests/testData/refactoring/moveInstanceMethod/IDEADEV11257.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/IDEADEV11257.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/IDEADEV11257.java
diff --git a/testData/refactoring/moveInstanceMethod/IDEADEV11257.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/IDEADEV11257.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/IDEADEV11257.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/IDEADEV11257.java.after
diff --git a/testData/refactoring/moveInstanceMethod/Interface.java b/java/java-tests/testData/refactoring/moveInstanceMethod/Interface.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Interface.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Interface.java
diff --git a/testData/refactoring/moveInstanceMethod/Interface.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/Interface.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Interface.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Interface.java.after
diff --git a/testData/refactoring/moveInstanceMethod/Javadoc.java b/java/java-tests/testData/refactoring/moveInstanceMethod/Javadoc.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Javadoc.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Javadoc.java
diff --git a/testData/refactoring/moveInstanceMethod/Javadoc.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/Javadoc.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Javadoc.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Javadoc.java.after
diff --git a/testData/refactoring/moveInstanceMethod/NoGenerics.java b/java/java-tests/testData/refactoring/moveInstanceMethod/NoGenerics.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/NoGenerics.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/NoGenerics.java
diff --git a/testData/refactoring/moveInstanceMethod/NoGenerics.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/NoGenerics.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/NoGenerics.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/NoGenerics.java.after
diff --git a/testData/refactoring/moveInstanceMethod/NoThisParam.java b/java/java-tests/testData/refactoring/moveInstanceMethod/NoThisParam.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/NoThisParam.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/NoThisParam.java
diff --git a/testData/refactoring/moveInstanceMethod/NoThisParam.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/NoThisParam.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/NoThisParam.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/NoThisParam.java.after
diff --git a/testData/refactoring/moveInstanceMethod/QualifiedThis.java b/java/java-tests/testData/refactoring/moveInstanceMethod/QualifiedThis.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/QualifiedThis.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/QualifiedThis.java
diff --git a/testData/refactoring/moveInstanceMethod/QualifiedThis.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/QualifiedThis.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/QualifiedThis.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/QualifiedThis.java.after
diff --git a/testData/refactoring/moveInstanceMethod/QualifierToArg1.java b/java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg1.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/QualifierToArg1.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg1.java
diff --git a/testData/refactoring/moveInstanceMethod/QualifierToArg1.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg1.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/QualifierToArg1.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg1.java.after
diff --git a/testData/refactoring/moveInstanceMethod/QualifierToArg2.java b/java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg2.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/QualifierToArg2.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg2.java
diff --git a/testData/refactoring/moveInstanceMethod/QualifierToArg2.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg2.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/QualifierToArg2.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg2.java.after
diff --git a/testData/refactoring/moveInstanceMethod/QualifierToArg3.java b/java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg3.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/QualifierToArg3.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg3.java
diff --git a/testData/refactoring/moveInstanceMethod/QualifierToArg3.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg3.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/QualifierToArg3.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/QualifierToArg3.java.after
diff --git a/testData/refactoring/moveInstanceMethod/Recursive.java b/java/java-tests/testData/refactoring/moveInstanceMethod/Recursive.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Recursive.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Recursive.java
diff --git a/testData/refactoring/moveInstanceMethod/Recursive.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/Recursive.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Recursive.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Recursive.java.after
diff --git a/testData/refactoring/moveInstanceMethod/Recursive1.java b/java/java-tests/testData/refactoring/moveInstanceMethod/Recursive1.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Recursive1.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Recursive1.java
diff --git a/testData/refactoring/moveInstanceMethod/Recursive1.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/Recursive1.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Recursive1.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Recursive1.java.after
diff --git a/testData/refactoring/moveInstanceMethod/Simple.java b/java/java-tests/testData/refactoring/moveInstanceMethod/Simple.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Simple.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Simple.java
diff --git a/testData/refactoring/moveInstanceMethod/Simple.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/Simple.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/Simple.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/Simple.java.after
diff --git a/testData/refactoring/moveInstanceMethod/SimpleWithTargetField.java b/java/java-tests/testData/refactoring/moveInstanceMethod/SimpleWithTargetField.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/SimpleWithTargetField.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/SimpleWithTargetField.java
diff --git a/testData/refactoring/moveInstanceMethod/SimpleWithTargetField.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/SimpleWithTargetField.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/SimpleWithTargetField.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/SimpleWithTargetField.java.after
diff --git a/testData/refactoring/moveInstanceMethod/TwoParams.java b/java/java-tests/testData/refactoring/moveInstanceMethod/TwoParams.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/TwoParams.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/TwoParams.java
diff --git a/testData/refactoring/moveInstanceMethod/TwoParams.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/TwoParams.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/TwoParams.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/TwoParams.java.after
diff --git a/testData/refactoring/moveInstanceMethod/WithInner.java b/java/java-tests/testData/refactoring/moveInstanceMethod/WithInner.java
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/WithInner.java
rename to java/java-tests/testData/refactoring/moveInstanceMethod/WithInner.java
diff --git a/testData/refactoring/moveInstanceMethod/WithInner.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/WithInner.java.after
similarity index 100%
rename from testData/refactoring/moveInstanceMethod/WithInner.java.after
rename to java/java-tests/testData/refactoring/moveInstanceMethod/WithInner.java.after
diff --git a/refactoring/tests/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java
similarity index 94%
rename from refactoring/tests/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java
index 6a41c55affd3..f3e9e15f340d 100644
--- a/refactoring/tests/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java
@@ -7,6 +7,7 @@ import com.intellij.psi.PsiVariable;
 import com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodHandler;
 import com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodProcessor;
 import com.intellij.testFramework.LightCodeInsightTestCase;
+import com.intellij.JavaTestUtil;
 
 /**
  * @author ven
@@ -57,5 +58,9 @@ public class MoveInstanceMethodTest extends LightCodeInsightTestCase {
 
   }
 
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
 
 }