diff --git a/testData/refactoring/safeDelete/extendsList/after/A.java b/java/java-tests/testData/refactoring/safeDelete/extendsList/after/A.java
similarity index 100%
rename from testData/refactoring/safeDelete/extendsList/after/A.java
rename to java/java-tests/testData/refactoring/safeDelete/extendsList/after/A.java
diff --git a/testData/refactoring/safeDelete/extendsList/after/C.java b/java/java-tests/testData/refactoring/safeDelete/extendsList/after/C.java
similarity index 100%
rename from testData/refactoring/safeDelete/extendsList/after/C.java
rename to java/java-tests/testData/refactoring/safeDelete/extendsList/after/C.java
diff --git a/testData/refactoring/safeDelete/extendsList/before/A.java b/java/java-tests/testData/refactoring/safeDelete/extendsList/before/A.java
similarity index 100%
rename from testData/refactoring/safeDelete/extendsList/before/A.java
rename to java/java-tests/testData/refactoring/safeDelete/extendsList/before/A.java
diff --git a/testData/refactoring/safeDelete/extendsList/before/B.java b/java/java-tests/testData/refactoring/safeDelete/extendsList/before/B.java
similarity index 100%
rename from testData/refactoring/safeDelete/extendsList/before/B.java
rename to java/java-tests/testData/refactoring/safeDelete/extendsList/before/B.java
diff --git a/testData/refactoring/safeDelete/extendsList/before/C.java b/java/java-tests/testData/refactoring/safeDelete/extendsList/before/C.java
similarity index 100%
rename from testData/refactoring/safeDelete/extendsList/before/C.java
rename to java/java-tests/testData/refactoring/safeDelete/extendsList/before/C.java
diff --git a/testData/refactoring/safeDelete/implicitCtrCall/before/Sub.java b/java/java-tests/testData/refactoring/safeDelete/implicitCtrCall/before/Sub.java
similarity index 100%
rename from testData/refactoring/safeDelete/implicitCtrCall/before/Sub.java
rename to java/java-tests/testData/refactoring/safeDelete/implicitCtrCall/before/Sub.java
diff --git a/testData/refactoring/safeDelete/implicitCtrCall/before/Super.java b/java/java-tests/testData/refactoring/safeDelete/implicitCtrCall/before/Super.java
similarity index 100%
rename from testData/refactoring/safeDelete/implicitCtrCall/before/Super.java
rename to java/java-tests/testData/refactoring/safeDelete/implicitCtrCall/before/Super.java
diff --git a/testData/refactoring/safeDelete/implicitCtrCall2/before/Sub.java b/java/java-tests/testData/refactoring/safeDelete/implicitCtrCall2/before/Sub.java
similarity index 100%
rename from testData/refactoring/safeDelete/implicitCtrCall2/before/Sub.java
rename to java/java-tests/testData/refactoring/safeDelete/implicitCtrCall2/before/Sub.java
diff --git a/testData/refactoring/safeDelete/implicitCtrCall2/before/Super.java b/java/java-tests/testData/refactoring/safeDelete/implicitCtrCall2/before/Super.java
similarity index 100%
rename from testData/refactoring/safeDelete/implicitCtrCall2/before/Super.java
rename to java/java-tests/testData/refactoring/safeDelete/implicitCtrCall2/before/Super.java
diff --git a/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/Bar.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/Bar.java
similarity index 100%
rename from testData/refactoring/safeDelete/multipleInterfacesImplementation/after/Bar.java
rename to java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/Bar.java
diff --git a/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/IBar.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/IBar.java
similarity index 100%
rename from testData/refactoring/safeDelete/multipleInterfacesImplementation/after/IBar.java
rename to java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/IBar.java
diff --git a/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/IFoo.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/IFoo.java
similarity index 100%
rename from testData/refactoring/safeDelete/multipleInterfacesImplementation/after/IFoo.java
rename to java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/after/IFoo.java
diff --git a/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/Bar.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/Bar.java
similarity index 100%
rename from testData/refactoring/safeDelete/multipleInterfacesImplementation/before/Bar.java
rename to java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/Bar.java
diff --git a/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/IBar.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/IBar.java
similarity index 100%
rename from testData/refactoring/safeDelete/multipleInterfacesImplementation/before/IBar.java
rename to java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/IBar.java
diff --git a/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/IFoo.java b/java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/IFoo.java
similarity index 100%
rename from testData/refactoring/safeDelete/multipleInterfacesImplementation/before/IFoo.java
rename to java/java-tests/testData/refactoring/safeDelete/multipleInterfacesImplementation/before/IFoo.java
diff --git a/refactoring/tests/com/intellij/refactoring/SafeDeleteTest.java b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java
similarity index 91%
rename from refactoring/tests/com/intellij/refactoring/SafeDeleteTest.java
rename to java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java
index eb9f5752f709..d12c519cbb69 100644
--- a/refactoring/tests/com/intellij/refactoring/SafeDeleteTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java
@@ -8,6 +8,7 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
+import com.intellij.JavaTestUtil;
 import org.jetbrains.annotations.NonNls;
 
 import java.io.File;
@@ -15,6 +16,11 @@ import java.io.File;
 public class SafeDeleteTest extends MultiFileTestCase {
   private VirtualFile myRootBefore;
 
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath();
+  }
+
   protected boolean clearModelBeforeConfiguring() {
     return true;
   }
@@ -64,7 +70,7 @@ public class SafeDeleteTest extends MultiFileTestCase {
     assertNotNull("Class " + qClassName + " not found", aClass);
 
     String root = ProjectRootManager.getInstance(getProject()).getContentRoots()[0].getPath();
-    myRootBefore = configureByFiles(new File(root), new VirtualFile[]{aClass.getContainingFile().getVirtualFile()});
+    myRootBefore = configureByFiles(new File(root), aClass.getContainingFile().getVirtualFile());
     final PsiElement psiElement = TargetElementUtilBase
       .findTargetElement(myEditor, TargetElementUtilBase.ELEMENT_NAME_ACCEPTED | TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED);
 
diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
index 396a352802c0..8f4d0ba7939b 100644
--- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
@@ -181,7 +181,7 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
   }
 
-  protected VirtualFile configureByFiles(final File projectRoot, VirtualFile[] vFiles) throws IOException {
+  protected VirtualFile configureByFiles(final File projectRoot, VirtualFile... vFiles) throws IOException {
     myFile = null;
     myEditor = null;