diff --git a/build.gradle.kts b/build.gradle.kts
index 44166c9c8e6..4bf19e7646b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -820,7 +820,7 @@ tasks {
 
     register("jps-tests") {
         dependsOn("dist")
-        dependsOn(":jps-plugin:test")
+        dependsOn(":jps:jps-plugin:test")
     }
 
     register("frontendApiTests") {
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index d1c96ef3638..07ab2b935b9 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -42,7 +42,7 @@ import org.jetbrains.kotlinx.atomicfu.AbstractAtomicfuJsIrTest
 fun main(args: Array<String>) {
     System.setProperty("java.awt.headless", "true")
     generateTestGroupSuite(args) {
-        testGroup("compiler/incremental-compilation-impl/test", "jps-plugin/testData") {
+        testGroup("compiler/incremental-compilation-impl/test", "jps/jps-plugin/testData") {
             fun incrementalJvmTestData(targetBackend: TargetBackend): TestGroup.TestClass.() -> Unit = {
                 model("incremental/pureKotlin", extension = null, recursive = false, targetBackend = targetBackend)
                 model("incremental/classHierarchyAffected", extension = null, recursive = false, targetBackend = targetBackend)
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
index eea68cef8c6..af2fd43a72c 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
@@ -56,7 +56,7 @@ abstract class AbstractKotlinJpsBuildTestCase : BaseKotlinJpsBuildTestCase() {
     }
 
     companion object {
-        val TEST_DATA_PATH = "jps-plugin/testData/"
+        val TEST_DATA_PATH = "jps/jps-plugin/testData/"
 
         @JvmStatic
         protected fun addKotlinStdlibDependency(modules: Collection<JpsModule>, exported: Boolean = false): JpsLibrary {
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
index fbb7ce3022b..5c313ec42e9 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
@@ -18,26 +18,26 @@ package org.jetbrains.kotlin.jps.build
 
 class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() {
     fun testJavaConstantChangedUsedInKotlin() {
-        doTest("jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/")
+        doTest("jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/")
     }
 
     fun testJavaConstantUnchangedUsedInKotlin() {
-        doTest("jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/")
+        doTest("jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/")
     }
 
     fun testKotlinConstantChangedUsedInJava() {
-        doTest("jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/")
+        doTest("jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/")
     }
 
     fun testKotlinJvmFieldChangedUsedInJava() {
-        doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/")
+        doTest("jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/")
     }
 
     fun testKotlinConstantUnchangedUsedInJava() {
-        doTest("jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/")
+        doTest("jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/")
     }
 
     fun testKotlinJvmFieldUnchangedUsedInJava() {
-        doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/")
+        doTest("jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/")
     }
 }
\ No newline at end of file
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCustomTests.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCustomTests.kt
index 32704821d91..114699d5a2a 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCustomTests.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCustomTests.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.incremental.testingUtils.Modification
 
 class IncrementalRenameModuleTest : AbstractIncrementalJpsTest() {
     fun testRenameModule() {
-        doTest("jps-plugin/testData/incremental/custom/renameModule/")
+        doTest("jps/jps-plugin/testData/incremental/custom/renameModule/")
     }
 
     override fun performAdditionalModifications(modifications: List<Modification>) {
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
index e2b3e54d6b1..75e7494b90f 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
@@ -22,11 +22,11 @@ import org.jetbrains.kotlin.incremental.testingUtils.Modification
 
 class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) {
     fun testProjectPathCaseChanged() {
-        doTest("jps-plugin/testData/incremental/custom/projectPathCaseChanged/")
+        doTest("jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/")
     }
 
     fun testProjectPathCaseChangedMultiFile() {
-        doTest("jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/")
+        doTest("jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/")
     }
 
     override fun doTest(testDataPath: String) {
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
index 0a228404d7b..32c0ed2df7e 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
@@ -28,7 +28,7 @@ import java.util.Arrays;
 import java.util.Collections;
 
 public class KotlinModuleXmlGeneratorTest extends TestCase {
-    private final static String testDataPath = "jps-plugin/testData/modules.xml";
+    private final static String testDataPath = "jps/jps-plugin/testData/modules.xml";
 
     public void testBasic() {
         String actual = new KotlinModuleXmlBuilder().addModule(