diff --git a/testData/inspection/usage1.5/constructor/expected.xml b/java/java-tests/testData/inspection/usage1.5/constructor/expected.xml
similarity index 100%
rename from testData/inspection/usage1.5/constructor/expected.xml
rename to java/java-tests/testData/inspection/usage1.5/constructor/expected.xml
diff --git a/testData/inspection/usage1.5/constructor/src/Test.java b/java/java-tests/testData/inspection/usage1.5/constructor/src/Test.java
similarity index 100%
rename from testData/inspection/usage1.5/constructor/src/Test.java
rename to java/java-tests/testData/inspection/usage1.5/constructor/src/Test.java
diff --git a/testData/inspection/usage1.5/ignored/expected.xml b/java/java-tests/testData/inspection/usage1.5/ignored/expected.xml
similarity index 100%
rename from testData/inspection/usage1.5/ignored/expected.xml
rename to java/java-tests/testData/inspection/usage1.5/ignored/expected.xml
diff --git a/testData/inspection/usage1.5/ignored/src/Test.java b/java/java-tests/testData/inspection/usage1.5/ignored/src/Test.java
similarity index 100%
rename from testData/inspection/usage1.5/ignored/src/Test.java
rename to java/java-tests/testData/inspection/usage1.5/ignored/src/Test.java
diff --git a/inspections/tests/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
similarity index 81%
rename from inspections/tests/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
rename to java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
index d9fd74c1eb26..37d10d463147 100644
--- a/inspections/tests/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
@@ -4,11 +4,16 @@
  */
 package com.intellij.codeInspection;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
 import com.intellij.codeInspection.java15api.Java15APIUsageInspection;
 import com.intellij.testFramework.InspectionTestCase;
 
 public class JavaAPIUsagesInspectionTest extends InspectionTestCase {
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath() + "/inspection";
+  }
 
   private void doTest() throws Exception {
     doTest("usage1.5/" + getTestName(false), new LocalInspectionToolWrapper(new Java15APIUsageInspection()), "java 1.5");