diff --git a/build.gradle.kts b/build.gradle.kts
index 95c9d69a826..2ef25a0bc3b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -602,7 +602,8 @@ tasks {
             ":idea:jvm-debugger:jvm-debugger-core:test",
             ":idea:jvm-debugger:jvm-debugger-evaluation:test",
             ":idea:jvm-debugger:jvm-debugger-sequence:test",
-            ":idea:jvm-debugger:eval4j:test"
+            ":idea:jvm-debugger:eval4j:test",
+            ":idea:scripting-support:test"
         )
     }
 
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index 5bc8c1255e7..06e5fe9b4c5 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     compile(projectTests(":j2k"))
     compile(projectTests(":nj2k"))
     compile(projectTests(":idea:idea-android"))
+    compile(projectTests(":idea:scripting-support"))
     compile(projectTests(":jps-plugin"))
     compile(projectTests(":plugins:jvm-abi-gen"))
     compile(projectTests(":plugins:android-extensions-compiler"))
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 7edbf9697ec..f8596a7daae 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -843,6 +843,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model(
                 "scratch",
@@ -888,14 +898,6 @@ fun main(args: Array<String>) {
         testClass<AbstractScratchLineMarkersTest> {
             model("scratch/lineMarker", testMethod = "doScratchTest", pattern = KT_OR_KTS)
         }
-
-        testClass<AbstractFirMultiModuleResolveTest> {
-            model("fir/multiModule", recursive = false, extension = null)
-        }
-
-        testClass<AbstractFirLazyResolveTest> {
-            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
-        }
     }
 
     testGroup("idea/idea-maven/test", "idea/idea-maven/testData") {
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183
index 1fa949c939a..30639fbbdc8 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183
@@ -831,6 +831,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model("scratch", extension = "kts", testMethod = "doScratchCompilingTest", testClassName = "ScratchCompiling", recursive = false)
             model("scratch", extension = "kts", testMethod = "doScratchReplTest", testClassName = "ScratchRepl", recursive = false)
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34
index c85a6d51493..3b5180b33cf 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34
@@ -819,6 +819,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model("scratch", extension = "kts", testMethod = "doScratchCompilingTest", testClassName = "ScratchCompiling", recursive = false)
             model("scratch", extension = "kts", testMethod = "doScratchReplTest", testClassName = "ScratchRepl", recursive = false)
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35
index c85a6d51493..3b5180b33cf 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35
@@ -819,6 +819,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model("scratch", extension = "kts", testMethod = "doScratchCompilingTest", testClassName = "ScratchCompiling", recursive = false)
             model("scratch", extension = "kts", testMethod = "doScratchReplTest", testClassName = "ScratchRepl", recursive = false)
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36
index c85a6d51493..3b5180b33cf 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36
@@ -819,6 +819,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model("scratch", extension = "kts", testMethod = "doScratchCompilingTest", testClassName = "ScratchCompiling", recursive = false)
             model("scratch", extension = "kts", testMethod = "doScratchReplTest", testClassName = "ScratchRepl", recursive = false)
diff --git a/idea/scripting-support/build.gradle.kts b/idea/scripting-support/build.gradle.kts
new file mode 100644
index 00000000000..776e1045d4b
--- /dev/null
+++ b/idea/scripting-support/build.gradle.kts
@@ -0,0 +1,50 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    testRuntime(intellijDep())
+    testRuntime(intellijRuntimeAnnotations())
+
+    testCompile(project(":compiler:backend"))
+    testCompile(project(":idea:idea-jvm"))
+    testCompile(project(":kotlin-test:kotlin-test-junit"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea"))
+    testCompile(commonDep("junit:junit"))
+
+    testRuntime(project(":allopen-ide-plugin")) { isTransitive = false }
+    testRuntime(project(":kotlin-allopen-compiler-plugin"))
+    testRuntime(project(":noarg-ide-plugin")) { isTransitive = false }
+    testRuntime(project(":kotlin-noarg-compiler-plugin"))
+    testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
+    testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false }
+    testRuntime(project(":kotlin-scripting-compiler"))
+    testRuntime(project(":kotlin-scripting-compiler-impl"))
+    testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
+    testRuntime(project(":kotlinx-serialization-compiler-plugin"))
+    testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false }
+
+    Platform[192].orHigher {
+        testCompileOnly(intellijPluginDep("java"))
+        testRuntime(intellijPluginDep("java"))
+    }
+
+    testRuntime(project(":kotlin-reflect"))
+
+    testCompileOnly(intellijDep())
+}
+
+sourceSets {
+    "main" { none() }
+    "test" { projectDefault() }
+}
+
+projectTest {
+    dependsOn(":dist")
+    workingDir = rootDir
+}
+
+testsJar()
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
similarity index 99%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
index 2a609e7d82f..c449af9ac30 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
+++ b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
@@ -276,7 +276,7 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() {
     }
 
     protected fun testScratchText(): String {
-        return File(testDataPath, "idea/testData/scratch/custom/test_scratch.kts").readText()
+        return File(testDataPath, "idea/scripting-support/testData/scratch/custom/test_scratch.kts").readText()
     }
 
     override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory()
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/CustomScratchRunActionTest.kt b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/CustomScratchRunActionTest.kt
similarity index 100%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/CustomScratchRunActionTest.kt
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/CustomScratchRunActionTest.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTest.kt b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTest.kt
similarity index 100%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTest.kt
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTest.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTestGenerated.java b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTestGenerated.java
similarity index 64%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTestGenerated.java
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTestGenerated.java
index 0460c86cc4f..0dbf06542b9 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTestGenerated.java
+++ b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchLineMarkersTestGenerated.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/scratch/lineMarker")
+@TestMetadata("idea/scripting-support/testData/scratch/lineMarker")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ScratchLineMarkersTestGenerated extends AbstractScratchLineMarkersTest {
@@ -26,71 +26,71 @@ public class ScratchLineMarkersTestGenerated extends AbstractScratchLineMarkersT
     }
 
     public void testAllFilesPresentInLineMarker() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch/lineMarker"), Pattern.compile("^(.+)\\.(kt|kts)$"), TargetBackend.ANY, true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch/lineMarker"), Pattern.compile("^(.+)\\.(kt|kts)$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("binaryExpression.kts")
     public void testBinaryExpression() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/binaryExpression.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/binaryExpression.kts");
     }
 
     @TestMetadata("binaryExpression2.kts")
     public void testBinaryExpression2() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/binaryExpression2.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/binaryExpression2.kts");
     }
 
     @TestMetadata("constantExpression.kts")
     public void testConstantExpression() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/constantExpression.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/constantExpression.kts");
     }
 
     @TestMetadata("for.kts")
     public void testFor() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/for.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/for.kts");
     }
 
     @TestMetadata("function.kts")
     public void testFunction() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/function.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/function.kts");
     }
 
     @TestMetadata("lambda.kts")
     public void testLambda() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/lambda.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/lambda.kts");
     }
 
     @TestMetadata("lambda2.kts")
     public void testLambda2() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/lambda2.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/lambda2.kts");
     }
 
     @TestMetadata("object.kts")
     public void testObject() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/object.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/object.kts");
     }
 
     @TestMetadata("parentesized.kts")
     public void testParentesized() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/parentesized.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/parentesized.kts");
     }
 
     @TestMetadata("qualified.kts")
     public void testQualified() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/qualified.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/qualified.kts");
     }
 
     @TestMetadata("qualifiedMultiLine.kts")
     public void testQualifiedMultiLine() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/qualifiedMultiLine.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/qualifiedMultiLine.kts");
     }
 
     @TestMetadata("referenceExpression.kts")
     public void testReferenceExpression() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/referenceExpression.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/referenceExpression.kts");
     }
 
     @TestMetadata("val.kts")
     public void testVal() throws Exception {
-        runTest("idea/testData/scratch/lineMarker/val.kts");
+        runTest("idea/scripting-support/testData/scratch/lineMarker/val.kts");
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchOptionsTest.kt b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchOptionsTest.kt
similarity index 100%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchOptionsTest.kt
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchOptionsTest.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java
similarity index 65%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java
index 852173852af..920f94d3078 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java
+++ b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest {
-    @TestMetadata("idea/testData/scratch")
+    @TestMetadata("idea/scripting-support/testData/scratch")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ScratchCompiling extends AbstractScratchRunActionTest {
@@ -28,86 +28,86 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInScratchCompiling() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("for.kts")
         public void testFor() throws Exception {
-            runTest("idea/testData/scratch/for.kts");
+            runTest("idea/scripting-support/testData/scratch/for.kts");
         }
 
         @TestMetadata("generics.kts")
         public void testGenerics() throws Exception {
-            runTest("idea/testData/scratch/generics.kts");
+            runTest("idea/scripting-support/testData/scratch/generics.kts");
         }
 
         @TestMetadata("klass.kts")
         public void testKlass() throws Exception {
-            runTest("idea/testData/scratch/klass.kts");
+            runTest("idea/scripting-support/testData/scratch/klass.kts");
         }
 
         @TestMetadata("libraryDepWithKotlinTest.kts")
         public void testLibraryDepWithKotlinTest() throws Exception {
-            runTest("idea/testData/scratch/libraryDepWithKotlinTest.kts");
+            runTest("idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.kts");
         }
 
         @TestMetadata("simple.kts")
         public void testSimple() throws Exception {
-            runTest("idea/testData/scratch/simple.kts");
+            runTest("idea/scripting-support/testData/scratch/simple.kts");
         }
 
         @TestMetadata("simpleFun.kts")
         public void testSimpleFun() throws Exception {
-            runTest("idea/testData/scratch/simpleFun.kts");
+            runTest("idea/scripting-support/testData/scratch/simpleFun.kts");
         }
 
         @TestMetadata("simpleNoRuntime.kts")
         public void testSimpleNoRuntime() throws Exception {
-            runTest("idea/testData/scratch/simpleNoRuntime.kts");
+            runTest("idea/scripting-support/testData/scratch/simpleNoRuntime.kts");
         }
 
         @TestMetadata("spacesAtLineStart.kts")
         public void testSpacesAtLineStart() throws Exception {
-            runTest("idea/testData/scratch/spacesAtLineStart.kts");
+            runTest("idea/scripting-support/testData/scratch/spacesAtLineStart.kts");
         }
 
         @TestMetadata("stdlibFun.kts")
         public void testStdlibFun() throws Exception {
-            runTest("idea/testData/scratch/stdlibFun.kts");
+            runTest("idea/scripting-support/testData/scratch/stdlibFun.kts");
         }
 
         @TestMetadata("unresolved.kts")
         public void testUnresolved() throws Exception {
-            runTest("idea/testData/scratch/unresolved.kts");
+            runTest("idea/scripting-support/testData/scratch/unresolved.kts");
         }
 
         @TestMetadata("unresolvedMultiline.kts")
         public void testUnresolvedMultiline() throws Exception {
-            runTest("idea/testData/scratch/unresolvedMultiline.kts");
+            runTest("idea/scripting-support/testData/scratch/unresolvedMultiline.kts");
         }
 
         @TestMetadata("userOutput.kts")
         public void testUserOutput() throws Exception {
-            runTest("idea/testData/scratch/userOutput.kts");
+            runTest("idea/scripting-support/testData/scratch/userOutput.kts");
         }
 
         @TestMetadata("var.kts")
         public void testVar() throws Exception {
-            runTest("idea/testData/scratch/var.kts");
+            runTest("idea/scripting-support/testData/scratch/var.kts");
         }
 
         @TestMetadata("veryLongOutput.kts")
         public void testVeryLongOutput() throws Exception {
-            runTest("idea/testData/scratch/veryLongOutput.kts");
+            runTest("idea/scripting-support/testData/scratch/veryLongOutput.kts");
         }
 
         @TestMetadata("when.kts")
         public void testWhen() throws Exception {
-            runTest("idea/testData/scratch/when.kts");
+            runTest("idea/scripting-support/testData/scratch/when.kts");
         }
     }
 
-    @TestMetadata("idea/testData/scratch")
+    @TestMetadata("idea/scripting-support/testData/scratch")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ScratchRepl extends AbstractScratchRunActionTest {
@@ -116,86 +116,86 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInScratchRepl() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("for.kts")
         public void testFor() throws Exception {
-            runTest("idea/testData/scratch/for.kts");
+            runTest("idea/scripting-support/testData/scratch/for.kts");
         }
 
         @TestMetadata("generics.kts")
         public void testGenerics() throws Exception {
-            runTest("idea/testData/scratch/generics.kts");
+            runTest("idea/scripting-support/testData/scratch/generics.kts");
         }
 
         @TestMetadata("klass.kts")
         public void testKlass() throws Exception {
-            runTest("idea/testData/scratch/klass.kts");
+            runTest("idea/scripting-support/testData/scratch/klass.kts");
         }
 
         @TestMetadata("libraryDepWithKotlinTest.kts")
         public void testLibraryDepWithKotlinTest() throws Exception {
-            runTest("idea/testData/scratch/libraryDepWithKotlinTest.kts");
+            runTest("idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.kts");
         }
 
         @TestMetadata("simple.kts")
         public void testSimple() throws Exception {
-            runTest("idea/testData/scratch/simple.kts");
+            runTest("idea/scripting-support/testData/scratch/simple.kts");
         }
 
         @TestMetadata("simpleFun.kts")
         public void testSimpleFun() throws Exception {
-            runTest("idea/testData/scratch/simpleFun.kts");
+            runTest("idea/scripting-support/testData/scratch/simpleFun.kts");
         }
 
         @TestMetadata("simpleNoRuntime.kts")
         public void testSimpleNoRuntime() throws Exception {
-            runTest("idea/testData/scratch/simpleNoRuntime.kts");
+            runTest("idea/scripting-support/testData/scratch/simpleNoRuntime.kts");
         }
 
         @TestMetadata("spacesAtLineStart.kts")
         public void testSpacesAtLineStart() throws Exception {
-            runTest("idea/testData/scratch/spacesAtLineStart.kts");
+            runTest("idea/scripting-support/testData/scratch/spacesAtLineStart.kts");
         }
 
         @TestMetadata("stdlibFun.kts")
         public void testStdlibFun() throws Exception {
-            runTest("idea/testData/scratch/stdlibFun.kts");
+            runTest("idea/scripting-support/testData/scratch/stdlibFun.kts");
         }
 
         @TestMetadata("unresolved.kts")
         public void testUnresolved() throws Exception {
-            runTest("idea/testData/scratch/unresolved.kts");
+            runTest("idea/scripting-support/testData/scratch/unresolved.kts");
         }
 
         @TestMetadata("unresolvedMultiline.kts")
         public void testUnresolvedMultiline() throws Exception {
-            runTest("idea/testData/scratch/unresolvedMultiline.kts");
+            runTest("idea/scripting-support/testData/scratch/unresolvedMultiline.kts");
         }
 
         @TestMetadata("userOutput.kts")
         public void testUserOutput() throws Exception {
-            runTest("idea/testData/scratch/userOutput.kts");
+            runTest("idea/scripting-support/testData/scratch/userOutput.kts");
         }
 
         @TestMetadata("var.kts")
         public void testVar() throws Exception {
-            runTest("idea/testData/scratch/var.kts");
+            runTest("idea/scripting-support/testData/scratch/var.kts");
         }
 
         @TestMetadata("veryLongOutput.kts")
         public void testVeryLongOutput() throws Exception {
-            runTest("idea/testData/scratch/veryLongOutput.kts");
+            runTest("idea/scripting-support/testData/scratch/veryLongOutput.kts");
         }
 
         @TestMetadata("when.kts")
         public void testWhen() throws Exception {
-            runTest("idea/testData/scratch/when.kts");
+            runTest("idea/scripting-support/testData/scratch/when.kts");
         }
     }
 
-    @TestMetadata("idea/testData/scratch/multiFile")
+    @TestMetadata("idea/scripting-support/testData/scratch/multiFile")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ScratchMultiFile extends AbstractScratchRunActionTest {
@@ -204,21 +204,21 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInScratchMultiFile() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch/multiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch/multiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("inlineFun")
         public void testInlineFun() throws Exception {
-            runTest("idea/testData/scratch/multiFile/inlineFun/");
+            runTest("idea/scripting-support/testData/scratch/multiFile/inlineFun/");
         }
 
         @TestMetadata("javaDep")
         public void testJavaDep() throws Exception {
-            runTest("idea/testData/scratch/multiFile/javaDep/");
+            runTest("idea/scripting-support/testData/scratch/multiFile/javaDep/");
         }
     }
 
-    @TestMetadata("idea/testData/worksheet")
+    @TestMetadata("idea/scripting-support/testData/worksheet")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WorksheetCompiling extends AbstractScratchRunActionTest {
@@ -227,16 +227,16 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInWorksheetCompiling() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/worksheet"), Pattern.compile("^(.+)\\.ws.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/worksheet"), Pattern.compile("^(.+)\\.ws.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("simpleScriptRuntime.ws.kts")
         public void testSimpleScriptRuntime() throws Exception {
-            runTest("idea/testData/worksheet/simpleScriptRuntime.ws.kts");
+            runTest("idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.kts");
         }
     }
 
-    @TestMetadata("idea/testData/worksheet")
+    @TestMetadata("idea/scripting-support/testData/worksheet")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WorksheetRepl extends AbstractScratchRunActionTest {
@@ -245,16 +245,16 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInWorksheetRepl() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/worksheet"), Pattern.compile("^(.+)\\.ws.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/worksheet"), Pattern.compile("^(.+)\\.ws.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("simpleScriptRuntime.ws.kts")
         public void testSimpleScriptRuntime() throws Exception {
-            runTest("idea/testData/worksheet/simpleScriptRuntime.ws.kts");
+            runTest("idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.kts");
         }
     }
 
-    @TestMetadata("idea/testData/worksheet/multiFile")
+    @TestMetadata("idea/scripting-support/testData/worksheet/multiFile")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WorksheetMultiFile extends AbstractScratchRunActionTest {
@@ -263,21 +263,21 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInWorksheetMultiFile() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/worksheet/multiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/worksheet/multiFile"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("inlineFunScriptRuntime")
         public void testInlineFunScriptRuntime() throws Exception {
-            runTest("idea/testData/worksheet/multiFile/inlineFunScriptRuntime/");
+            runTest("idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/");
         }
 
         @TestMetadata("javaDepScriptRuntime")
         public void testJavaDepScriptRuntime() throws Exception {
-            runTest("idea/testData/worksheet/multiFile/javaDepScriptRuntime/");
+            runTest("idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/");
         }
     }
 
-    @TestMetadata("idea/testData/scratch/rightPanelOutput")
+    @TestMetadata("idea/scripting-support/testData/scratch/rightPanelOutput")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ScratchRightPanelOutput extends AbstractScratchRunActionTest {
@@ -286,22 +286,22 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
         }
 
         public void testAllFilesPresentInScratchRightPanelOutput() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/scratch/rightPanelOutput"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/scripting-support/testData/scratch/rightPanelOutput"), Pattern.compile("^(.+)\\.kts$"), TargetBackend.ANY, false);
         }
 
         @TestMetadata("bigSequentialOutputs.kts")
         public void testBigSequentialOutputs() throws Exception {
-            runTest("idea/testData/scratch/rightPanelOutput/bigSequentialOutputs.kts");
+            runTest("idea/scripting-support/testData/scratch/rightPanelOutput/bigSequentialOutputs.kts");
         }
 
         @TestMetadata("shortExpression.longOutput.singleTop.kts")
         public void testShortExpression_longOutput_singleTop() throws Exception {
-            runTest("idea/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.kts");
+            runTest("idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.kts");
         }
 
         @TestMetadata("shortExpression.shortOutput.singleTop.kts")
         public void testShortExpression_shortOutput_singleTop() throws Exception {
-            runTest("idea/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.kts");
+            runTest("idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.kts");
         }
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/SequentialScratchExecutorTest.kt b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/SequentialScratchExecutorTest.kt
similarity index 100%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/SequentialScratchExecutorTest.kt
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/SequentialScratchExecutorTest.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/foldingTestUtils.kt b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/foldingTestUtils.kt
similarity index 100%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/foldingTestUtils.kt
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/foldingTestUtils.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/foldingTestUtils.kt.as33 b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/foldingTestUtils.kt.as33
similarity index 100%
rename from idea/tests/org/jetbrains/kotlin/idea/scratch/foldingTestUtils.kt.as33
rename to idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/foldingTestUtils.kt.as33
diff --git a/idea/testData/scratch/custom/test_scratch.kts b/idea/scripting-support/testData/scratch/custom/test_scratch.kts
similarity index 100%
rename from idea/testData/scratch/custom/test_scratch.kts
rename to idea/scripting-support/testData/scratch/custom/test_scratch.kts
diff --git a/idea/testData/scratch/for.comp.after b/idea/scripting-support/testData/scratch/for.comp.after
similarity index 100%
rename from idea/testData/scratch/for.comp.after
rename to idea/scripting-support/testData/scratch/for.comp.after
diff --git a/idea/testData/scratch/for.kts b/idea/scripting-support/testData/scratch/for.kts
similarity index 100%
rename from idea/testData/scratch/for.kts
rename to idea/scripting-support/testData/scratch/for.kts
diff --git a/idea/testData/scratch/for.repl.after b/idea/scripting-support/testData/scratch/for.repl.after
similarity index 100%
rename from idea/testData/scratch/for.repl.after
rename to idea/scripting-support/testData/scratch/for.repl.after
diff --git a/idea/testData/scratch/generics.comp.after b/idea/scripting-support/testData/scratch/generics.comp.after
similarity index 100%
rename from idea/testData/scratch/generics.comp.after
rename to idea/scripting-support/testData/scratch/generics.comp.after
diff --git a/idea/testData/scratch/generics.kts b/idea/scripting-support/testData/scratch/generics.kts
similarity index 100%
rename from idea/testData/scratch/generics.kts
rename to idea/scripting-support/testData/scratch/generics.kts
diff --git a/idea/testData/scratch/generics.repl.after b/idea/scripting-support/testData/scratch/generics.repl.after
similarity index 100%
rename from idea/testData/scratch/generics.repl.after
rename to idea/scripting-support/testData/scratch/generics.repl.after
diff --git a/idea/testData/scratch/klass.comp.after b/idea/scripting-support/testData/scratch/klass.comp.after
similarity index 100%
rename from idea/testData/scratch/klass.comp.after
rename to idea/scripting-support/testData/scratch/klass.comp.after
diff --git a/idea/testData/scratch/klass.kts b/idea/scripting-support/testData/scratch/klass.kts
similarity index 100%
rename from idea/testData/scratch/klass.kts
rename to idea/scripting-support/testData/scratch/klass.kts
diff --git a/idea/testData/scratch/klass.repl.after b/idea/scripting-support/testData/scratch/klass.repl.after
similarity index 100%
rename from idea/testData/scratch/klass.repl.after
rename to idea/scripting-support/testData/scratch/klass.repl.after
diff --git a/idea/testData/scratch/libraryDepWithKotlinTest.comp.after b/idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.comp.after
similarity index 100%
rename from idea/testData/scratch/libraryDepWithKotlinTest.comp.after
rename to idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.comp.after
diff --git a/idea/testData/scratch/libraryDepWithKotlinTest.kts b/idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.kts
similarity index 100%
rename from idea/testData/scratch/libraryDepWithKotlinTest.kts
rename to idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.kts
diff --git a/idea/testData/scratch/libraryDepWithKotlinTest.repl.after b/idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.repl.after
similarity index 100%
rename from idea/testData/scratch/libraryDepWithKotlinTest.repl.after
rename to idea/scripting-support/testData/scratch/libraryDepWithKotlinTest.repl.after
diff --git a/idea/testData/scratch/lineMarker/binaryExpression.kts b/idea/scripting-support/testData/scratch/lineMarker/binaryExpression.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/binaryExpression.kts
rename to idea/scripting-support/testData/scratch/lineMarker/binaryExpression.kts
diff --git a/idea/testData/scratch/lineMarker/binaryExpression2.kts b/idea/scripting-support/testData/scratch/lineMarker/binaryExpression2.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/binaryExpression2.kts
rename to idea/scripting-support/testData/scratch/lineMarker/binaryExpression2.kts
diff --git a/idea/testData/scratch/lineMarker/constantExpression.kts b/idea/scripting-support/testData/scratch/lineMarker/constantExpression.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/constantExpression.kts
rename to idea/scripting-support/testData/scratch/lineMarker/constantExpression.kts
diff --git a/idea/testData/scratch/lineMarker/for.kts b/idea/scripting-support/testData/scratch/lineMarker/for.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/for.kts
rename to idea/scripting-support/testData/scratch/lineMarker/for.kts
diff --git a/idea/testData/scratch/lineMarker/function.kts b/idea/scripting-support/testData/scratch/lineMarker/function.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/function.kts
rename to idea/scripting-support/testData/scratch/lineMarker/function.kts
diff --git a/idea/testData/scratch/lineMarker/lambda.kts b/idea/scripting-support/testData/scratch/lineMarker/lambda.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/lambda.kts
rename to idea/scripting-support/testData/scratch/lineMarker/lambda.kts
diff --git a/idea/testData/scratch/lineMarker/lambda2.kts b/idea/scripting-support/testData/scratch/lineMarker/lambda2.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/lambda2.kts
rename to idea/scripting-support/testData/scratch/lineMarker/lambda2.kts
diff --git a/idea/testData/scratch/lineMarker/object.kts b/idea/scripting-support/testData/scratch/lineMarker/object.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/object.kts
rename to idea/scripting-support/testData/scratch/lineMarker/object.kts
diff --git a/idea/testData/scratch/lineMarker/parentesized.kts b/idea/scripting-support/testData/scratch/lineMarker/parentesized.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/parentesized.kts
rename to idea/scripting-support/testData/scratch/lineMarker/parentesized.kts
diff --git a/idea/testData/scratch/lineMarker/qualified.kts b/idea/scripting-support/testData/scratch/lineMarker/qualified.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/qualified.kts
rename to idea/scripting-support/testData/scratch/lineMarker/qualified.kts
diff --git a/idea/testData/scratch/lineMarker/qualifiedMultiLine.kts b/idea/scripting-support/testData/scratch/lineMarker/qualifiedMultiLine.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/qualifiedMultiLine.kts
rename to idea/scripting-support/testData/scratch/lineMarker/qualifiedMultiLine.kts
diff --git a/idea/testData/scratch/lineMarker/referenceExpression.kts b/idea/scripting-support/testData/scratch/lineMarker/referenceExpression.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/referenceExpression.kts
rename to idea/scripting-support/testData/scratch/lineMarker/referenceExpression.kts
diff --git a/idea/testData/scratch/lineMarker/val.kts b/idea/scripting-support/testData/scratch/lineMarker/val.kts
similarity index 100%
rename from idea/testData/scratch/lineMarker/val.kts
rename to idea/scripting-support/testData/scratch/lineMarker/val.kts
diff --git a/idea/testData/scratch/multiFile/inlineFun/inlineFun.comp.after b/idea/scripting-support/testData/scratch/multiFile/inlineFun/inlineFun.comp.after
similarity index 100%
rename from idea/testData/scratch/multiFile/inlineFun/inlineFun.comp.after
rename to idea/scripting-support/testData/scratch/multiFile/inlineFun/inlineFun.comp.after
diff --git a/idea/testData/scratch/multiFile/inlineFun/inlineFun.kts b/idea/scripting-support/testData/scratch/multiFile/inlineFun/inlineFun.kts
similarity index 100%
rename from idea/testData/scratch/multiFile/inlineFun/inlineFun.kts
rename to idea/scripting-support/testData/scratch/multiFile/inlineFun/inlineFun.kts
diff --git a/idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after b/idea/scripting-support/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
similarity index 100%
rename from idea/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
rename to idea/scripting-support/testData/scratch/multiFile/inlineFun/inlineFun.repl.after
diff --git a/idea/testData/scratch/multiFile/inlineFun/myFun.kt b/idea/scripting-support/testData/scratch/multiFile/inlineFun/myFun.kt
similarity index 100%
rename from idea/testData/scratch/multiFile/inlineFun/myFun.kt
rename to idea/scripting-support/testData/scratch/multiFile/inlineFun/myFun.kt
diff --git a/idea/testData/scratch/multiFile/javaDep/javaDep.comp.after b/idea/scripting-support/testData/scratch/multiFile/javaDep/javaDep.comp.after
similarity index 100%
rename from idea/testData/scratch/multiFile/javaDep/javaDep.comp.after
rename to idea/scripting-support/testData/scratch/multiFile/javaDep/javaDep.comp.after
diff --git a/idea/testData/scratch/multiFile/javaDep/javaDep.kts b/idea/scripting-support/testData/scratch/multiFile/javaDep/javaDep.kts
similarity index 100%
rename from idea/testData/scratch/multiFile/javaDep/javaDep.kts
rename to idea/scripting-support/testData/scratch/multiFile/javaDep/javaDep.kts
diff --git a/idea/testData/scratch/multiFile/javaDep/javaDep.repl.after b/idea/scripting-support/testData/scratch/multiFile/javaDep/javaDep.repl.after
similarity index 100%
rename from idea/testData/scratch/multiFile/javaDep/javaDep.repl.after
rename to idea/scripting-support/testData/scratch/multiFile/javaDep/javaDep.repl.after
diff --git a/idea/testData/scratch/multiFile/javaDep/myTest/MyJavaClass.java b/idea/scripting-support/testData/scratch/multiFile/javaDep/myTest/MyJavaClass.java
similarity index 100%
rename from idea/testData/scratch/multiFile/javaDep/myTest/MyJavaClass.java
rename to idea/scripting-support/testData/scratch/multiFile/javaDep/myTest/MyJavaClass.java
diff --git a/idea/testData/scratch/rightPanelOutput/bigSequentialOutputs.comp.preview b/idea/scripting-support/testData/scratch/rightPanelOutput/bigSequentialOutputs.comp.preview
similarity index 100%
rename from idea/testData/scratch/rightPanelOutput/bigSequentialOutputs.comp.preview
rename to idea/scripting-support/testData/scratch/rightPanelOutput/bigSequentialOutputs.comp.preview
diff --git a/idea/testData/scratch/rightPanelOutput/bigSequentialOutputs.kts b/idea/scripting-support/testData/scratch/rightPanelOutput/bigSequentialOutputs.kts
similarity index 100%
rename from idea/testData/scratch/rightPanelOutput/bigSequentialOutputs.kts
rename to idea/scripting-support/testData/scratch/rightPanelOutput/bigSequentialOutputs.kts
diff --git a/idea/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.comp.preview b/idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.comp.preview
similarity index 100%
rename from idea/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.comp.preview
rename to idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.comp.preview
diff --git a/idea/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.kts b/idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.kts
similarity index 100%
rename from idea/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.kts
rename to idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.longOutput.singleTop.kts
diff --git a/idea/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.comp.preview b/idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.comp.preview
similarity index 100%
rename from idea/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.comp.preview
rename to idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.comp.preview
diff --git a/idea/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.kts b/idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.kts
similarity index 100%
rename from idea/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.kts
rename to idea/scripting-support/testData/scratch/rightPanelOutput/shortExpression.shortOutput.singleTop.kts
diff --git a/idea/testData/scratch/simple.comp.after b/idea/scripting-support/testData/scratch/simple.comp.after
similarity index 100%
rename from idea/testData/scratch/simple.comp.after
rename to idea/scripting-support/testData/scratch/simple.comp.after
diff --git a/idea/testData/scratch/simple.kts b/idea/scripting-support/testData/scratch/simple.kts
similarity index 100%
rename from idea/testData/scratch/simple.kts
rename to idea/scripting-support/testData/scratch/simple.kts
diff --git a/idea/testData/scratch/simple.repl.after b/idea/scripting-support/testData/scratch/simple.repl.after
similarity index 100%
rename from idea/testData/scratch/simple.repl.after
rename to idea/scripting-support/testData/scratch/simple.repl.after
diff --git a/idea/testData/scratch/simpleFun.comp.after b/idea/scripting-support/testData/scratch/simpleFun.comp.after
similarity index 100%
rename from idea/testData/scratch/simpleFun.comp.after
rename to idea/scripting-support/testData/scratch/simpleFun.comp.after
diff --git a/idea/testData/scratch/simpleFun.kts b/idea/scripting-support/testData/scratch/simpleFun.kts
similarity index 100%
rename from idea/testData/scratch/simpleFun.kts
rename to idea/scripting-support/testData/scratch/simpleFun.kts
diff --git a/idea/testData/scratch/simpleFun.repl.after b/idea/scripting-support/testData/scratch/simpleFun.repl.after
similarity index 100%
rename from idea/testData/scratch/simpleFun.repl.after
rename to idea/scripting-support/testData/scratch/simpleFun.repl.after
diff --git a/idea/testData/scratch/simpleNoRuntime.comp.after b/idea/scripting-support/testData/scratch/simpleNoRuntime.comp.after
similarity index 100%
rename from idea/testData/scratch/simpleNoRuntime.comp.after
rename to idea/scripting-support/testData/scratch/simpleNoRuntime.comp.after
diff --git a/idea/testData/scratch/simpleNoRuntime.kts b/idea/scripting-support/testData/scratch/simpleNoRuntime.kts
similarity index 100%
rename from idea/testData/scratch/simpleNoRuntime.kts
rename to idea/scripting-support/testData/scratch/simpleNoRuntime.kts
diff --git a/idea/testData/scratch/simpleNoRuntime.repl.after b/idea/scripting-support/testData/scratch/simpleNoRuntime.repl.after
similarity index 100%
rename from idea/testData/scratch/simpleNoRuntime.repl.after
rename to idea/scripting-support/testData/scratch/simpleNoRuntime.repl.after
diff --git a/idea/testData/scratch/spacesAtLineStart.comp.after b/idea/scripting-support/testData/scratch/spacesAtLineStart.comp.after
similarity index 100%
rename from idea/testData/scratch/spacesAtLineStart.comp.after
rename to idea/scripting-support/testData/scratch/spacesAtLineStart.comp.after
diff --git a/idea/testData/scratch/spacesAtLineStart.kts b/idea/scripting-support/testData/scratch/spacesAtLineStart.kts
similarity index 100%
rename from idea/testData/scratch/spacesAtLineStart.kts
rename to idea/scripting-support/testData/scratch/spacesAtLineStart.kts
diff --git a/idea/testData/scratch/spacesAtLineStart.repl.after b/idea/scripting-support/testData/scratch/spacesAtLineStart.repl.after
similarity index 100%
rename from idea/testData/scratch/spacesAtLineStart.repl.after
rename to idea/scripting-support/testData/scratch/spacesAtLineStart.repl.after
diff --git a/idea/testData/scratch/stdlibFun.comp.after b/idea/scripting-support/testData/scratch/stdlibFun.comp.after
similarity index 100%
rename from idea/testData/scratch/stdlibFun.comp.after
rename to idea/scripting-support/testData/scratch/stdlibFun.comp.after
diff --git a/idea/testData/scratch/stdlibFun.kts b/idea/scripting-support/testData/scratch/stdlibFun.kts
similarity index 100%
rename from idea/testData/scratch/stdlibFun.kts
rename to idea/scripting-support/testData/scratch/stdlibFun.kts
diff --git a/idea/testData/scratch/stdlibFun.repl.after b/idea/scripting-support/testData/scratch/stdlibFun.repl.after
similarity index 100%
rename from idea/testData/scratch/stdlibFun.repl.after
rename to idea/scripting-support/testData/scratch/stdlibFun.repl.after
diff --git a/idea/testData/scratch/unresolved.comp.after b/idea/scripting-support/testData/scratch/unresolved.comp.after
similarity index 100%
rename from idea/testData/scratch/unresolved.comp.after
rename to idea/scripting-support/testData/scratch/unresolved.comp.after
diff --git a/idea/testData/scratch/unresolved.kts b/idea/scripting-support/testData/scratch/unresolved.kts
similarity index 100%
rename from idea/testData/scratch/unresolved.kts
rename to idea/scripting-support/testData/scratch/unresolved.kts
diff --git a/idea/testData/scratch/unresolved.repl.after b/idea/scripting-support/testData/scratch/unresolved.repl.after
similarity index 100%
rename from idea/testData/scratch/unresolved.repl.after
rename to idea/scripting-support/testData/scratch/unresolved.repl.after
diff --git a/idea/testData/scratch/unresolvedMultiline.comp.after b/idea/scripting-support/testData/scratch/unresolvedMultiline.comp.after
similarity index 100%
rename from idea/testData/scratch/unresolvedMultiline.comp.after
rename to idea/scripting-support/testData/scratch/unresolvedMultiline.comp.after
diff --git a/idea/testData/scratch/unresolvedMultiline.kts b/idea/scripting-support/testData/scratch/unresolvedMultiline.kts
similarity index 100%
rename from idea/testData/scratch/unresolvedMultiline.kts
rename to idea/scripting-support/testData/scratch/unresolvedMultiline.kts
diff --git a/idea/testData/scratch/unresolvedMultiline.repl.after b/idea/scripting-support/testData/scratch/unresolvedMultiline.repl.after
similarity index 100%
rename from idea/testData/scratch/unresolvedMultiline.repl.after
rename to idea/scripting-support/testData/scratch/unresolvedMultiline.repl.after
diff --git a/idea/testData/scratch/userOutput.comp.after b/idea/scripting-support/testData/scratch/userOutput.comp.after
similarity index 100%
rename from idea/testData/scratch/userOutput.comp.after
rename to idea/scripting-support/testData/scratch/userOutput.comp.after
diff --git a/idea/testData/scratch/userOutput.kts b/idea/scripting-support/testData/scratch/userOutput.kts
similarity index 100%
rename from idea/testData/scratch/userOutput.kts
rename to idea/scripting-support/testData/scratch/userOutput.kts
diff --git a/idea/testData/scratch/userOutput.repl.after b/idea/scripting-support/testData/scratch/userOutput.repl.after
similarity index 100%
rename from idea/testData/scratch/userOutput.repl.after
rename to idea/scripting-support/testData/scratch/userOutput.repl.after
diff --git a/idea/testData/scratch/var.comp.after b/idea/scripting-support/testData/scratch/var.comp.after
similarity index 100%
rename from idea/testData/scratch/var.comp.after
rename to idea/scripting-support/testData/scratch/var.comp.after
diff --git a/idea/testData/scratch/var.kts b/idea/scripting-support/testData/scratch/var.kts
similarity index 100%
rename from idea/testData/scratch/var.kts
rename to idea/scripting-support/testData/scratch/var.kts
diff --git a/idea/testData/scratch/var.repl.after b/idea/scripting-support/testData/scratch/var.repl.after
similarity index 100%
rename from idea/testData/scratch/var.repl.after
rename to idea/scripting-support/testData/scratch/var.repl.after
diff --git a/idea/testData/scratch/veryLongOutput.comp.after b/idea/scripting-support/testData/scratch/veryLongOutput.comp.after
similarity index 100%
rename from idea/testData/scratch/veryLongOutput.comp.after
rename to idea/scripting-support/testData/scratch/veryLongOutput.comp.after
diff --git a/idea/testData/scratch/veryLongOutput.kts b/idea/scripting-support/testData/scratch/veryLongOutput.kts
similarity index 100%
rename from idea/testData/scratch/veryLongOutput.kts
rename to idea/scripting-support/testData/scratch/veryLongOutput.kts
diff --git a/idea/testData/scratch/veryLongOutput.repl.after b/idea/scripting-support/testData/scratch/veryLongOutput.repl.after
similarity index 100%
rename from idea/testData/scratch/veryLongOutput.repl.after
rename to idea/scripting-support/testData/scratch/veryLongOutput.repl.after
diff --git a/idea/testData/scratch/when.comp.after b/idea/scripting-support/testData/scratch/when.comp.after
similarity index 100%
rename from idea/testData/scratch/when.comp.after
rename to idea/scripting-support/testData/scratch/when.comp.after
diff --git a/idea/testData/scratch/when.kts b/idea/scripting-support/testData/scratch/when.kts
similarity index 100%
rename from idea/testData/scratch/when.kts
rename to idea/scripting-support/testData/scratch/when.kts
diff --git a/idea/testData/scratch/when.repl.after b/idea/scripting-support/testData/scratch/when.repl.after
similarity index 100%
rename from idea/testData/scratch/when.repl.after
rename to idea/scripting-support/testData/scratch/when.repl.after
diff --git a/idea/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.comp.after b/idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.comp.after
similarity index 100%
rename from idea/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.comp.after
rename to idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.comp.after
diff --git a/idea/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.kts b/idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.kts
similarity index 100%
rename from idea/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.kts
rename to idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.kts
diff --git a/idea/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.repl.after b/idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.repl.after
similarity index 100%
rename from idea/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.repl.after
rename to idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/inlineFunScriptRuntime.ws.repl.after
diff --git a/idea/testData/worksheet/multiFile/inlineFunScriptRuntime/myFun.kt b/idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/myFun.kt
similarity index 100%
rename from idea/testData/worksheet/multiFile/inlineFunScriptRuntime/myFun.kt
rename to idea/scripting-support/testData/worksheet/multiFile/inlineFunScriptRuntime/myFun.kt
diff --git a/idea/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.comp.after b/idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.comp.after
similarity index 100%
rename from idea/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.comp.after
rename to idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.comp.after
diff --git a/idea/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.kts b/idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.kts
similarity index 100%
rename from idea/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.kts
rename to idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.kts
diff --git a/idea/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.repl.after b/idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.repl.after
similarity index 100%
rename from idea/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.repl.after
rename to idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/javaDepScriptRuntime.ws.repl.after
diff --git a/idea/testData/worksheet/multiFile/javaDepScriptRuntime/myTest/MyJavaClass.java b/idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/myTest/MyJavaClass.java
similarity index 100%
rename from idea/testData/worksheet/multiFile/javaDepScriptRuntime/myTest/MyJavaClass.java
rename to idea/scripting-support/testData/worksheet/multiFile/javaDepScriptRuntime/myTest/MyJavaClass.java
diff --git a/idea/testData/worksheet/simpleScriptRuntime.ws.comp.after b/idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.comp.after
similarity index 100%
rename from idea/testData/worksheet/simpleScriptRuntime.ws.comp.after
rename to idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.comp.after
diff --git a/idea/testData/worksheet/simpleScriptRuntime.ws.kts b/idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.kts
similarity index 100%
rename from idea/testData/worksheet/simpleScriptRuntime.ws.kts
rename to idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.kts
diff --git a/idea/testData/worksheet/simpleScriptRuntime.ws.repl.after b/idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.repl.after
similarity index 100%
rename from idea/testData/worksheet/simpleScriptRuntime.ws.repl.after
rename to idea/scripting-support/testData/worksheet/simpleScriptRuntime.ws.repl.after
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 5ea64c5b001..e9dd4d7df09 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -33,6 +33,7 @@ val projectsToShadow by extra(listOf(
         ":idea:jvm-debugger:jvm-debugger-core",
         ":idea:jvm-debugger:jvm-debugger-evaluation",
         ":idea:jvm-debugger:jvm-debugger-sequence",
+        ":idea:scripting-support",
         ":idea:idea-j2k",
         ":idea:formatter",
         ":compiler:psi",
diff --git a/settings.gradle b/settings.gradle
index f57dbacf26a..64b8c89f202 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -119,6 +119,7 @@ include ":kotlin-build-common",
         ":idea:jvm-debugger:jvm-debugger-evaluation",
         ":idea:jvm-debugger:jvm-debugger-sequence",
         ":idea:jvm-debugger:jvm-debugger-test",
+        ":idea:scripting-support",
         ":j2k",
         ":idea:idea-j2k",
         ":nj2k",