diff --git a/java/java-tests/testData/inspection/emptyMethod/SCR8321/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/SCR8321/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/SCR8321/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/SCR8321/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/SCR8321/src/MyAdapter.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/SCR8321/src/MyAdapter.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/SCR8321/src/MyAdapter.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/SCR8321/src/MyAdapter.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/SCR8321/src/MyAdapterUsage.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/SCR8321/src/MyAdapterUsage.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/SCR8321/src/MyAdapterUsage.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/SCR8321/src/MyAdapterUsage.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/SCR8321/src/MyListener.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/SCR8321/src/MyListener.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/SCR8321/src/MyListener.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/SCR8321/src/MyListener.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/emptyInLambda/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/emptyInLambda/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/emptyInLambda/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/emptyInLambda/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/emptyInLambda/src/Test.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/emptyInLambda/src/Test.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/emptyInLambda/src/Test.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/emptyInLambda/src/Test.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/emptyMethodsHierarchy/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/emptyMethodsHierarchy/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/emptyMethodsHierarchy/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/emptyMethodsHierarchy/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/emptyMethodsHierarchy/src/p2/Derived.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/emptyMethodsHierarchy/src/p2/Derived.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/emptyMethodsHierarchy/src/p2/Derived.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/emptyMethodsHierarchy/src/p2/Derived.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/externalOverride/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/externalOverride/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/externalOverride/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/externalOverride/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/externalOverride/ext_src/Derived.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/externalOverride/ext_src/Derived.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/externalOverride/ext_src/Derived.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/externalOverride/ext_src/Derived.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/externalOverride/src/Base.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/externalOverride/src/Base.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/externalOverride/src/Base.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/externalOverride/src/Base.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/inAnonymous/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/inAnonymous/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/inAnonymous/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/inAnonymous/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/inAnonymous/src/Test.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/inAnonymous/src/Test.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/inAnonymous/src/Test.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/inAnonymous/src/Test.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/nonEmptyInLambda/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/nonEmptyInLambda/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/nonEmptyInLambda/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/nonEmptyInLambda/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/nonEmptyInLambda/src/Test.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/nonEmptyInLambda/src/Test.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/nonEmptyInLambda/src/Test.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/nonEmptyInLambda/src/Test.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superCall/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superCall/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/superCall/src/Base.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/src/Base.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superCall/src/Base.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/src/Base.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superCall/src/Defaults.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/src/Defaults.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superCall/src/Defaults.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/src/Defaults.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superCall/src/Derived.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/src/Derived.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superCall/src/Derived.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/src/Derived.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superCall/src/ManySuperCalls.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/src/ManySuperCalls.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superCall/src/ManySuperCalls.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCall/src/ManySuperCalls.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superCallByRange/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCallByRange/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superCallByRange/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCallByRange/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/superCallByRange/src/Base.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCallByRange/src/Base.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superCallByRange/src/Base.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCallByRange/src/Base.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superCallByRange/src/Derived.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCallByRange/src/Derived.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superCallByRange/src/Derived.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superCallByRange/src/Derived.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superFromAnotherPackageCall/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superFromAnotherPackageCall/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superFromAnotherPackageCall/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superFromAnotherPackageCall/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/superFromAnotherPackageCall/src/p1/Base.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superFromAnotherPackageCall/src/p1/Base.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superFromAnotherPackageCall/src/p1/Base.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superFromAnotherPackageCall/src/p1/Base.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superFromAnotherPackageCall/src/p2/Derived.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superFromAnotherPackageCall/src/p2/Derived.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superFromAnotherPackageCall/src/p2/Derived.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superFromAnotherPackageCall/src/p2/Derived.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superWithoutSync/expected.xml b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superWithoutSync/expected.xml
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superWithoutSync/expected.xml
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superWithoutSync/expected.xml
diff --git a/java/java-tests/testData/inspection/emptyMethod/superWithoutSync/src/p1/Base.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superWithoutSync/src/p1/Base.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superWithoutSync/src/p1/Base.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superWithoutSync/src/p1/Base.java
diff --git a/java/java-tests/testData/inspection/emptyMethod/superWithoutSync/src/p2/Derived.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superWithoutSync/src/p2/Derived.java
similarity index 100%
rename from java/java-tests/testData/inspection/emptyMethod/superWithoutSync/src/p2/Derived.java
rename to jvm/jvm-analysis-java-tests/testData/codeInspection/emptyMethod/superWithoutSync/src/p2/Derived.java
diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/EmptyMethodInspectionTest.java b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/JavaEmptyMethodInspectionTest.java
similarity index 68%
rename from jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/EmptyMethodInspectionTest.java
rename to jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/JavaEmptyMethodInspectionTest.java
index 3d145c460d4c..8a8732b82196 100644
--- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/EmptyMethodInspectionTest.java
+++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/JavaEmptyMethodInspectionTest.java
@@ -1,14 +1,23 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.codeInspection.tests.java;
 
-import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.emptyMethod.EmptyMethodInspection;
+import com.intellij.jvm.analysis.JavaJvmAnalysisTestUtil;
+import com.intellij.openapi.application.PathManager;
 import com.intellij.testFramework.JavaInspectionTestCase;
 
-public class EmptyMethodInspectionTest extends JavaInspectionTestCase {
+import java.io.File;
+
+public class JavaEmptyMethodInspectionTest extends JavaInspectionTestCase {
+
+  @Override
+  protected String getBasePath() {
+    return JavaJvmAnalysisTestUtil.TEST_DATA_PROJECT_RELATIVE_BASE_PATH + "/codeInspection/emptyMethod/";
+  }
+
   @Override
   protected String getTestDataPath() {
-    return JavaTestUtil.getJavaTestDataPath() + "/inspection";
+    return PathManager.getCommunityHomePath().replace(File.separatorChar, '/') + getBasePath();
   }
 
   private void doTest() {
@@ -17,7 +26,7 @@ public class EmptyMethodInspectionTest extends JavaInspectionTestCase {
 
   private void doTest(final boolean checkRange) {
     final EmptyMethodInspection tool = new EmptyMethodInspection();
-    doTest("emptyMethod/" + getTestName(true), tool, checkRange);
+    doTest(getTestName(true), tool, checkRange);
   }
 
   public void testSuperCall() {
diff --git a/jvm/jvm-analysis-kotlin-tests/testData/codeInspection/emptyMethod/basic/src/TestSuppressFile.kt b/jvm/jvm-analysis-kotlin-tests/testData/codeInspection/emptyMethod/basic/src/TestSuppressFile.kt
index 5dfe90427545..c7408a7f26f2 100644
--- a/jvm/jvm-analysis-kotlin-tests/testData/codeInspection/emptyMethod/basic/src/TestSuppressFile.kt
+++ b/jvm/jvm-analysis-kotlin-tests/testData/codeInspection/emptyMethod/basic/src/TestSuppressFile.kt
@@ -4,4 +4,8 @@ class TestSuppressFile {
   fun empty() {
     
   }
+}
+
+fun topLevel() {
+  
 }
\ No newline at end of file