diff --git a/testData/inspection/defUse/ArrayLength/expected.xml b/java/java-tests/testData/inspection/defUse/ArrayLength/expected.xml
similarity index 100%
rename from testData/inspection/defUse/ArrayLength/expected.xml
rename to java/java-tests/testData/inspection/defUse/ArrayLength/expected.xml
diff --git a/testData/inspection/defUse/ArrayLength/src/Foo.java b/java/java-tests/testData/inspection/defUse/ArrayLength/src/Foo.java
similarity index 100%
rename from testData/inspection/defUse/ArrayLength/src/Foo.java
rename to java/java-tests/testData/inspection/defUse/ArrayLength/src/Foo.java
diff --git a/testData/inspection/defUse/SCR28019/expected.xml b/java/java-tests/testData/inspection/defUse/SCR28019/expected.xml
similarity index 100%
rename from testData/inspection/defUse/SCR28019/expected.xml
rename to java/java-tests/testData/inspection/defUse/SCR28019/expected.xml
diff --git a/testData/inspection/defUse/SCR28019/src/AsynchronousImageLoader.java b/java/java-tests/testData/inspection/defUse/SCR28019/src/AsynchronousImageLoader.java
similarity index 100%
rename from testData/inspection/defUse/SCR28019/src/AsynchronousImageLoader.java
rename to java/java-tests/testData/inspection/defUse/SCR28019/src/AsynchronousImageLoader.java
diff --git a/testData/inspection/defUse/SCR40364/expected.xml b/java/java-tests/testData/inspection/defUse/SCR40364/expected.xml
similarity index 100%
rename from testData/inspection/defUse/SCR40364/expected.xml
rename to java/java-tests/testData/inspection/defUse/SCR40364/expected.xml
diff --git a/testData/inspection/defUse/SCR40364/src/Test.java b/java/java-tests/testData/inspection/defUse/SCR40364/src/Test.java
similarity index 100%
rename from testData/inspection/defUse/SCR40364/src/Test.java
rename to java/java-tests/testData/inspection/defUse/SCR40364/src/Test.java
diff --git a/testData/inspection/defUse/SCR5144/expected.xml b/java/java-tests/testData/inspection/defUse/SCR5144/expected.xml
similarity index 100%
rename from testData/inspection/defUse/SCR5144/expected.xml
rename to java/java-tests/testData/inspection/defUse/SCR5144/expected.xml
diff --git a/testData/inspection/defUse/SCR5144/src/AssignTest.java b/java/java-tests/testData/inspection/defUse/SCR5144/src/AssignTest.java
similarity index 100%
rename from testData/inspection/defUse/SCR5144/src/AssignTest.java
rename to java/java-tests/testData/inspection/defUse/SCR5144/src/AssignTest.java
diff --git a/testData/inspection/defUse/SCR6843/expected.xml b/java/java-tests/testData/inspection/defUse/SCR6843/expected.xml
similarity index 100%
rename from testData/inspection/defUse/SCR6843/expected.xml
rename to java/java-tests/testData/inspection/defUse/SCR6843/expected.xml
diff --git a/testData/inspection/defUse/SCR6843/src/NotUsedTest.java b/java/java-tests/testData/inspection/defUse/SCR6843/src/NotUsedTest.java
similarity index 100%
rename from testData/inspection/defUse/SCR6843/src/NotUsedTest.java
rename to java/java-tests/testData/inspection/defUse/SCR6843/src/NotUsedTest.java
diff --git a/testData/inspection/defUse/UsedInArrayInitializer/expected.xml b/java/java-tests/testData/inspection/defUse/UsedInArrayInitializer/expected.xml
similarity index 100%
rename from testData/inspection/defUse/UsedInArrayInitializer/expected.xml
rename to java/java-tests/testData/inspection/defUse/UsedInArrayInitializer/expected.xml
diff --git a/testData/inspection/defUse/UsedInArrayInitializer/src/Foo.java b/java/java-tests/testData/inspection/defUse/UsedInArrayInitializer/src/Foo.java
similarity index 100%
rename from testData/inspection/defUse/UsedInArrayInitializer/src/Foo.java
rename to java/java-tests/testData/inspection/defUse/UsedInArrayInitializer/src/Foo.java
diff --git a/testData/inspection/defUse/arrayIndexUsages/expected.xml b/java/java-tests/testData/inspection/defUse/arrayIndexUsages/expected.xml
similarity index 100%
rename from testData/inspection/defUse/arrayIndexUsages/expected.xml
rename to java/java-tests/testData/inspection/defUse/arrayIndexUsages/expected.xml
diff --git a/testData/inspection/defUse/arrayIndexUsages/src/Foo.java b/java/java-tests/testData/inspection/defUse/arrayIndexUsages/src/Foo.java
similarity index 100%
rename from testData/inspection/defUse/arrayIndexUsages/src/Foo.java
rename to java/java-tests/testData/inspection/defUse/arrayIndexUsages/src/Foo.java
diff --git a/testData/inspection/defUse/unusedVariable/expected.xml b/java/java-tests/testData/inspection/defUse/unusedVariable/expected.xml
similarity index 100%
rename from testData/inspection/defUse/unusedVariable/expected.xml
rename to java/java-tests/testData/inspection/defUse/unusedVariable/expected.xml
diff --git a/testData/inspection/defUse/unusedVariable/src/Foo.java b/java/java-tests/testData/inspection/defUse/unusedVariable/src/Foo.java
similarity index 100%
rename from testData/inspection/defUse/unusedVariable/src/Foo.java
rename to java/java-tests/testData/inspection/defUse/unusedVariable/src/Foo.java
diff --git a/inspections/tests/com/intellij/codeInspection/DefUseTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DefUseTest.java
similarity index 85%
rename from inspections/tests/com/intellij/codeInspection/DefUseTest.java
rename to java/java-tests/testSrc/com/intellij/codeInspection/DefUseTest.java
index 0ba721e829b5..1c7c240ec32b 100644
--- a/inspections/tests/com/intellij/codeInspection/DefUseTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/DefUseTest.java
@@ -1,9 +1,15 @@
 package com.intellij.codeInspection;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.defUse.DefUseInspection;
 import com.intellij.testFramework.InspectionTestCase;
 
 public class DefUseTest extends InspectionTestCase {
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath() + "/inspection";
+  }
+
   private void doTest() throws Exception {
     doTest("defUse/" + getTestName(false), new DefUseInspection());
   }