diff --git a/testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml b/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml
similarity index 100%
rename from testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml
rename to java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml
diff --git a/testData/inspection/suspiciousCalls/IgnoreConvertible/src/Test.java b/java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/src/Test.java
similarity index 100%
rename from testData/inspection/suspiciousCalls/IgnoreConvertible/src/Test.java
rename to java/java-tests/testData/inspection/suspiciousCalls/IgnoreConvertible/src/Test.java
diff --git a/testData/inspection/suspiciousCalls/Wildcard/expected.xml b/java/java-tests/testData/inspection/suspiciousCalls/Wildcard/expected.xml
similarity index 100%
rename from testData/inspection/suspiciousCalls/Wildcard/expected.xml
rename to java/java-tests/testData/inspection/suspiciousCalls/Wildcard/expected.xml
diff --git a/testData/inspection/suspiciousCalls/Wildcard/src/Test.java b/java/java-tests/testData/inspection/suspiciousCalls/Wildcard/src/Test.java
similarity index 100%
rename from testData/inspection/suspiciousCalls/Wildcard/src/Test.java
rename to java/java-tests/testData/inspection/suspiciousCalls/Wildcard/src/Test.java
diff --git a/testData/inspection/suspiciousCalls/WildcardCapture/expected.xml b/java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/expected.xml
similarity index 100%
rename from testData/inspection/suspiciousCalls/WildcardCapture/expected.xml
rename to java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/expected.xml
diff --git a/testData/inspection/suspiciousCalls/WildcardCapture/src/Test.java b/java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/src/Test.java
similarity index 100%
rename from testData/inspection/suspiciousCalls/WildcardCapture/src/Test.java
rename to java/java-tests/testData/inspection/suspiciousCalls/WildcardCapture/src/Test.java
diff --git a/inspections/tests/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java
similarity index 76%
rename from inspections/tests/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java
rename to java/java-tests/testSrc/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java
index 3d494ee5f4f7..2d6268dfc699 100644
--- a/inspections/tests/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java
@@ -1,20 +1,18 @@
 package com.intellij.codeInspection;
 
+import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
 import com.intellij.codeInspection.miscGenerics.SuspiciousCollectionsMethodCallsInspection;
-import com.intellij.openapi.roots.LanguageLevelProjectExtension;
-import com.intellij.pom.java.LanguageLevel;
 import com.intellij.testFramework.InspectionTestCase;
 
 public class SuspiciousCollectionMethodCallsTest extends InspectionTestCase {
   private final SuspiciousCollectionsMethodCallsInspection myTool = new SuspiciousCollectionsMethodCallsInspection();
 
-  protected void setUp() throws Exception {
-    super.setUp();
-    LanguageLevelProjectExtension.getInstance(myJavaFacade.getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
+  @Override
+  protected String getTestDataPath() {
+    return JavaTestUtil.getJavaTestDataPath() + "/inspection";
   }
 
-
   private void doTest() throws Exception {
     final LocalInspectionToolWrapper tool = new LocalInspectionToolWrapper(myTool);
     doTest("suspiciousCalls/" + getTestName(false), tool, "java 1.5");