diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
index ec2b64d5e57f..606726979d4b 100644
--- a/compiler/test/dotc/pos-test-pickling.blacklist
+++ b/compiler/test/dotc/pos-test-pickling.blacklist
@@ -27,8 +27,10 @@ t2712-5.scala
 t2726
 t2741
 t284-pos.scala
+t3249
 t3419
 t3452f.scala
+t3486
 t3612.scala
 t3864
 t3999
diff --git a/compiler/test/dotc/run-test-pickling.blacklist b/compiler/test/dotc/run-test-pickling.blacklist
index 91ab8c1a70a8..ba9664cd0a5c 100644
--- a/compiler/test/dotc/run-test-pickling.blacklist
+++ b/compiler/test/dotc/run-test-pickling.blacklist
@@ -4,6 +4,10 @@ i5257.scala
 lazy-implicit-lists.scala
 lazy-implicit-nums.scala
 lazy-traits.scala
+t3452d
+t3452e
+t3452g
+t7374
 t8133
 t8133b
 tuples1.scala
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index bc639e3c9578..5cd5ebfcece8 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -90,10 +90,8 @@ class CompilationTests extends ParallelTesting {
     compileFilesInDir("tests/new", defaultOptions) +
     compileFilesInDir("tests/pos-scala2", scala2Mode) +
     compileFilesInDir("tests/pos", defaultOptions) +
-    compileFilesInDir("tests/pos-separate-compilation", defaultOptions) +
     compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes) +
     compileFilesInDir("tests/pos-kind-polymorphism", defaultOptions and "-Ykind-polymorphism") +
-    compileDir("tests/pos-separate-compilation/i1137-1", defaultOptions) +
     compileFile(
       // succeeds despite -Xfatal-warnings because of -nowarn
       "tests/neg-custom-args/fatal-warnings/xfatalWarnings.scala",
@@ -173,7 +171,6 @@ class CompilationTests extends ParallelTesting {
     implicit val testGroup: TestGroup = TestGroup("runAll")
     compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees") +
     compileFile("tests/run-custom-args/tuple-cons.scala", allowDeepSubtypes) +
-    compileFilesInDir("tests/run-separate-compilation", defaultOptions) +
     compileFile("tests/run-custom-args/i5256.scala", allowDeepSubtypes) +
     compileFilesInDir("tests/run", defaultOptions)
   }.checkRuns()
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index f6490aa7130e..3a2533c06a6f 100644
--- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -1242,9 +1242,15 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
     val (dirs, files) = compilationTargets(sourceDir, fileFilter)
 
+    val isPicklerTest = flags.options.contains("-Ytest-pickler")
+    def ignoreDir(dir: JFile): Boolean = {
+      // Pickler tests stop after pickler not producing class/tasty files. The second part of the compilation
+      // will not be able to compile due to the missing artifacts from the first part.
+      isPicklerTest && dir.listFiles().exists(file => file.getName.endsWith("_2.scala") || file.getName.endsWith("_2.java"))
+    }
     val targets =
       files.map(f => JointCompilationSource(testGroup.name, Array(f), flags, createOutputDirsForFile(f, sourceDir, outDir))) ++
-      dirs.map(dir => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)))
+      dirs.collect { case dir if !ignoreDir(dir) => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)) }
 
     // Create a CompilationTest and let the user decide whether to execute a pos or a neg test
     new CompilationTest(targets)
diff --git a/tests/pos-separate-compilation/1567/PosZInt_1.scala b/tests/pos/1567/PosZInt_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/1567/PosZInt_1.scala
rename to tests/pos/1567/PosZInt_1.scala
diff --git a/tests/pos-separate-compilation/1567/Test_2.scala b/tests/pos/1567/Test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/1567/Test_2.scala
rename to tests/pos/1567/Test_2.scala
diff --git a/tests/pos-separate-compilation/cycle/J_1.java b/tests/pos/cycle/J_1.java
similarity index 100%
rename from tests/pos-separate-compilation/cycle/J_1.java
rename to tests/pos/cycle/J_1.java
diff --git a/tests/pos-separate-compilation/cycle/X_2.scala b/tests/pos/cycle/X_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/cycle/X_2.scala
rename to tests/pos/cycle/X_2.scala
diff --git a/tests/pos-separate-compilation/false-companion/00_outerinnerTest_2.scala b/tests/pos/false-companion/00_outerinnerTest_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/false-companion/00_outerinnerTest_2.scala
rename to tests/pos/false-companion/00_outerinnerTest_2.scala
diff --git a/tests/pos-separate-compilation/false-companion/01_outerinnerFoo_2.scala b/tests/pos/false-companion/01_outerinnerFoo_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/false-companion/01_outerinnerFoo_2.scala
rename to tests/pos/false-companion/01_outerinnerFoo_2.scala
diff --git a/tests/pos-separate-compilation/false-companion/outerFoo_1.scala b/tests/pos/false-companion/outerFoo_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/false-companion/outerFoo_1.scala
rename to tests/pos/false-companion/outerFoo_1.scala
diff --git a/tests/pos-separate-compilation/false-companion/outerinnerFoo_1.scala b/tests/pos/false-companion/outerinnerFoo_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/false-companion/outerinnerFoo_1.scala
rename to tests/pos/false-companion/outerinnerFoo_1.scala
diff --git a/tests/pos-separate-compilation/i0881/A_1.scala b/tests/pos/i0881/A_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i0881/A_1.scala
rename to tests/pos/i0881/A_1.scala
diff --git a/tests/pos-separate-compilation/i0881/B_2.scala b/tests/pos/i0881/B_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i0881/B_2.scala
rename to tests/pos/i0881/B_2.scala
diff --git a/tests/pos-separate-compilation/i1137-1/A_1.scala b/tests/pos/i1137-1/A_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i1137-1/A_1.scala
rename to tests/pos/i1137-1/A_1.scala
diff --git a/tests/pos-separate-compilation/i1137-1/B_2.scala b/tests/pos/i1137-1/B_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i1137-1/B_2.scala
rename to tests/pos/i1137-1/B_2.scala
diff --git a/tests/pos-separate-compilation/i1137-2/A_1.scala b/tests/pos/i1137-2/A_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i1137-2/A_1.scala
rename to tests/pos/i1137-2/A_1.scala
diff --git a/tests/pos-separate-compilation/i1137-2/B_2.scala b/tests/pos/i1137-2/B_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i1137-2/B_2.scala
rename to tests/pos/i1137-2/B_2.scala
diff --git a/tests/pos-separate-compilation/i1137-3/A_1.scala b/tests/pos/i1137-3/A_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i1137-3/A_1.scala
rename to tests/pos/i1137-3/A_1.scala
diff --git a/tests/pos-separate-compilation/i1137-3/B_2.scala b/tests/pos/i1137-3/B_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i1137-3/B_2.scala
rename to tests/pos/i1137-3/B_2.scala
diff --git a/tests/pos-separate-compilation/i2551/library_1.scala b/tests/pos/i2551/library_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i2551/library_1.scala
rename to tests/pos/i2551/library_1.scala
diff --git a/tests/pos-separate-compilation/i2551/test_2.scala b/tests/pos/i2551/test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i2551/test_2.scala
rename to tests/pos/i2551/test_2.scala
diff --git a/tests/pos-separate-compilation/i3273/Foo_1.java b/tests/pos/i3273/Foo_1.java
similarity index 100%
rename from tests/pos-separate-compilation/i3273/Foo_1.java
rename to tests/pos/i3273/Foo_1.java
diff --git a/tests/pos-separate-compilation/i3273/Test_2.scala b/tests/pos/i3273/Test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3273/Test_2.scala
rename to tests/pos/i3273/Test_2.scala
diff --git a/tests/pos-separate-compilation/i3422/a_1.scala b/tests/pos/i3422/a_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3422/a_1.scala
rename to tests/pos/i3422/a_1.scala
diff --git a/tests/pos-separate-compilation/i3422/b_2.scala b/tests/pos/i3422/b_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3422/b_2.scala
rename to tests/pos/i3422/b_2.scala
diff --git a/tests/pos-separate-compilation/i3467/Test_2.scala b/tests/pos/i3467/Test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3467/Test_2.scala
rename to tests/pos/i3467/Test_2.scala
diff --git a/tests/pos-separate-compilation/i3467/collection_1.scala b/tests/pos/i3467/collection_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3467/collection_1.scala
rename to tests/pos/i3467/collection_1.scala
diff --git a/tests/pos-separate-compilation/i3898/quoted_1.scala b/tests/pos/i3898/quoted_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3898/quoted_1.scala
rename to tests/pos/i3898/quoted_1.scala
diff --git a/tests/pos-separate-compilation/i3898/quoted_2.scala b/tests/pos/i3898/quoted_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3898/quoted_2.scala
rename to tests/pos/i3898/quoted_2.scala
diff --git a/tests/pos-separate-compilation/i3898b/quoted_1.scala b/tests/pos/i3898b/quoted_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3898b/quoted_1.scala
rename to tests/pos/i3898b/quoted_1.scala
diff --git a/tests/pos-separate-compilation/i3898b/quoted_2.scala b/tests/pos/i3898b/quoted_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3898b/quoted_2.scala
rename to tests/pos/i3898b/quoted_2.scala
diff --git a/tests/pos-separate-compilation/i3898c/quoted_1.scala b/tests/pos/i3898c/quoted_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3898c/quoted_1.scala
rename to tests/pos/i3898c/quoted_1.scala
diff --git a/tests/pos-separate-compilation/i3898c/quoted_2.scala b/tests/pos/i3898c/quoted_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3898c/quoted_2.scala
rename to tests/pos/i3898c/quoted_2.scala
diff --git a/tests/pos-separate-compilation/i3912-1/i3912_1.scala b/tests/pos/i3912-1/i3912_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3912-1/i3912_1.scala
rename to tests/pos/i3912-1/i3912_1.scala
diff --git a/tests/pos-separate-compilation/i3912-1/i3912_2.scala b/tests/pos/i3912-1/i3912_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3912-1/i3912_2.scala
rename to tests/pos/i3912-1/i3912_2.scala
diff --git a/tests/pos-separate-compilation/i3912-2/i3912_1.scala b/tests/pos/i3912-2/i3912_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3912-2/i3912_1.scala
rename to tests/pos/i3912-2/i3912_1.scala
diff --git a/tests/pos-separate-compilation/i3912-2/i3912_2.scala b/tests/pos/i3912-2/i3912_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3912-2/i3912_2.scala
rename to tests/pos/i3912-2/i3912_2.scala
diff --git a/tests/pos-separate-compilation/i3912-3/i3912_1.scala b/tests/pos/i3912-3/i3912_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3912-3/i3912_1.scala
rename to tests/pos/i3912-3/i3912_1.scala
diff --git a/tests/pos-separate-compilation/i3912-3/i3912_2.scala b/tests/pos/i3912-3/i3912_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i3912-3/i3912_2.scala
rename to tests/pos/i3912-3/i3912_2.scala
diff --git a/tests/pos-separate-compilation/i4023/Macro_1.scala b/tests/pos/i4023/Macro_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4023/Macro_1.scala
rename to tests/pos/i4023/Macro_1.scala
diff --git a/tests/pos-separate-compilation/i4023/Test_2.scala b/tests/pos/i4023/Test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4023/Test_2.scala
rename to tests/pos/i4023/Test_2.scala
diff --git a/tests/pos-separate-compilation/i4023b/Macro_1.scala b/tests/pos/i4023b/Macro_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4023b/Macro_1.scala
rename to tests/pos/i4023b/Macro_1.scala
diff --git a/tests/pos-separate-compilation/i4023b/Test_2.scala b/tests/pos/i4023b/Test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4023b/Test_2.scala
rename to tests/pos/i4023b/Test_2.scala
diff --git a/tests/pos-separate-compilation/i4023c/Macro_1.scala b/tests/pos/i4023c/Macro_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4023c/Macro_1.scala
rename to tests/pos/i4023c/Macro_1.scala
diff --git a/tests/pos-separate-compilation/i4023c/Test_2.scala b/tests/pos/i4023c/Test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4023c/Test_2.scala
rename to tests/pos/i4023c/Test_2.scala
diff --git a/tests/pos-separate-compilation/i4167/Test_2.scala b/tests/pos/i4167/Test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4167/Test_2.scala
rename to tests/pos/i4167/Test_2.scala
diff --git a/tests/pos-separate-compilation/i4167/collections_1.scala b/tests/pos/i4167/collections_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4167/collections_1.scala
rename to tests/pos/i4167/collections_1.scala
diff --git a/tests/pos-separate-compilation/i4734/Macro_1.scala b/tests/pos/i4734/Macro_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4734/Macro_1.scala
rename to tests/pos/i4734/Macro_1.scala
diff --git a/tests/pos-separate-compilation/i4734/Test_2.scala b/tests/pos/i4734/Test_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/i4734/Test_2.scala
rename to tests/pos/i4734/Test_2.scala
diff --git a/tests/pos-separate-compilation/parents-cycle/Def_1.scala b/tests/pos/parents-cycle/Def_1.scala
similarity index 100%
rename from tests/pos-separate-compilation/parents-cycle/Def_1.scala
rename to tests/pos/parents-cycle/Def_1.scala
diff --git a/tests/pos-separate-compilation/parents-cycle/Use_2.scala b/tests/pos/parents-cycle/Use_2.scala
similarity index 100%
rename from tests/pos-separate-compilation/parents-cycle/Use_2.scala
rename to tests/pos/parents-cycle/Use_2.scala
diff --git a/tests/pos-separate-compilation/t3249/Test.java b/tests/pos/t3249/Test.java
similarity index 100%
rename from tests/pos-separate-compilation/t3249/Test.java
rename to tests/pos/t3249/Test.java
diff --git a/tests/pos-separate-compilation/t3249/a.scala b/tests/pos/t3249/a.scala
similarity index 100%
rename from tests/pos-separate-compilation/t3249/a.scala
rename to tests/pos/t3249/a.scala
diff --git a/tests/pos-separate-compilation/t3486/JTest.java b/tests/pos/t3486/JTest.java
similarity index 100%
rename from tests/pos-separate-compilation/t3486/JTest.java
rename to tests/pos/t3486/JTest.java
diff --git a/tests/pos-separate-compilation/t3486/test.scala b/tests/pos/t3486/test.scala
similarity index 100%
rename from tests/pos-separate-compilation/t3486/test.scala
rename to tests/pos/t3486/test.scala
diff --git a/tests/run-separate-compilation/colltest4.check b/tests/run/colltest4.check
similarity index 100%
rename from tests/run-separate-compilation/colltest4.check
rename to tests/run/colltest4.check
diff --git a/tests/run-separate-compilation/colltest4/CollectionStrawMan4_1.scala b/tests/run/colltest4/CollectionStrawMan4_1.scala
similarity index 100%
rename from tests/run-separate-compilation/colltest4/CollectionStrawMan4_1.scala
rename to tests/run/colltest4/CollectionStrawMan4_1.scala
diff --git a/tests/run-separate-compilation/colltest4/CollectionTests_2.scala b/tests/run/colltest4/CollectionTests_2.scala
similarity index 100%
rename from tests/run-separate-compilation/colltest4/CollectionTests_2.scala
rename to tests/run/colltest4/CollectionTests_2.scala
diff --git a/tests/run-separate-compilation/colltest5.check b/tests/run/colltest5.check
similarity index 100%
rename from tests/run-separate-compilation/colltest5.check
rename to tests/run/colltest5.check
diff --git a/tests/run-separate-compilation/colltest5/CollectionStrawMan5_1.scala b/tests/run/colltest5/CollectionStrawMan5_1.scala
similarity index 100%
rename from tests/run-separate-compilation/colltest5/CollectionStrawMan5_1.scala
rename to tests/run/colltest5/CollectionStrawMan5_1.scala
diff --git a/tests/run-separate-compilation/colltest5/CollectionTests_2.scala b/tests/run/colltest5/CollectionTests_2.scala
similarity index 100%
rename from tests/run-separate-compilation/colltest5/CollectionTests_2.scala
rename to tests/run/colltest5/CollectionTests_2.scala
diff --git a/tests/run-separate-compilation/colltest6.check b/tests/run/colltest6.check
similarity index 100%
rename from tests/run-separate-compilation/colltest6.check
rename to tests/run/colltest6.check
diff --git a/tests/run-separate-compilation/colltest6/CollectionStrawMan6_1.scala b/tests/run/colltest6/CollectionStrawMan6_1.scala
similarity index 100%
rename from tests/run-separate-compilation/colltest6/CollectionStrawMan6_1.scala
rename to tests/run/colltest6/CollectionStrawMan6_1.scala
diff --git a/tests/run-separate-compilation/colltest6/CollectionTests_2.scala b/tests/run/colltest6/CollectionTests_2.scala
similarity index 100%
rename from tests/run-separate-compilation/colltest6/CollectionTests_2.scala
rename to tests/run/colltest6/CollectionTests_2.scala
diff --git a/tests/run-separate-compilation/f-interpolation-1/FQuote_1.scala b/tests/run/f-interpolation-1/FQuote_1.scala
similarity index 100%
rename from tests/run-separate-compilation/f-interpolation-1/FQuote_1.scala
rename to tests/run/f-interpolation-1/FQuote_1.scala
diff --git a/tests/run-separate-compilation/f-interpolation-1/Test_2.scala b/tests/run/f-interpolation-1/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/f-interpolation-1/Test_2.scala
rename to tests/run/f-interpolation-1/Test_2.scala
diff --git a/tests/run-separate-compilation/gestalt-optional-inline/Macro_1.scala b/tests/run/gestalt-optional-inline/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/gestalt-optional-inline/Macro_1.scala
rename to tests/run/gestalt-optional-inline/Macro_1.scala
diff --git a/tests/run-separate-compilation/gestalt-optional-inline/Test_2.scala b/tests/run/gestalt-optional-inline/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/gestalt-optional-inline/Test_2.scala
rename to tests/run/gestalt-optional-inline/Test_2.scala
diff --git a/tests/run-separate-compilation/gestalt-optional-staging/Macro_1.scala b/tests/run/gestalt-optional-staging/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/gestalt-optional-staging/Macro_1.scala
rename to tests/run/gestalt-optional-staging/Macro_1.scala
diff --git a/tests/run-separate-compilation/gestalt-optional-staging/Test_2.scala b/tests/run/gestalt-optional-staging/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/gestalt-optional-staging/Test_2.scala
rename to tests/run/gestalt-optional-staging/Test_2.scala
diff --git a/tests/run-separate-compilation/gestalt-type-toolbox-reflect/Macro_1.scala b/tests/run/gestalt-type-toolbox-reflect/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/gestalt-type-toolbox-reflect/Macro_1.scala
rename to tests/run/gestalt-type-toolbox-reflect/Macro_1.scala
diff --git a/tests/run-separate-compilation/gestalt-type-toolbox-reflect/Test_2.scala b/tests/run/gestalt-type-toolbox-reflect/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/gestalt-type-toolbox-reflect/Test_2.scala
rename to tests/run/gestalt-type-toolbox-reflect/Test_2.scala
diff --git a/tests/run-separate-compilation/i1140/A_1.scala b/tests/run/i1140/A_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i1140/A_1.scala
rename to tests/run/i1140/A_1.scala
diff --git a/tests/run-separate-compilation/i1140/B_2.scala b/tests/run/i1140/B_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i1140/B_2.scala
rename to tests/run/i1140/B_2.scala
diff --git a/tests/run-separate-compilation/i1144/AB_1.scala b/tests/run/i1144/AB_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i1144/AB_1.scala
rename to tests/run/i1144/AB_1.scala
diff --git a/tests/run-separate-compilation/i1144/C_2.scala b/tests/run/i1144/C_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i1144/C_2.scala
rename to tests/run/i1144/C_2.scala
diff --git a/tests/run-separate-compilation/i4431.check b/tests/run/i4431.check
similarity index 100%
rename from tests/run-separate-compilation/i4431.check
rename to tests/run/i4431.check
diff --git a/tests/run-separate-compilation/i4431/quoted_1.scala b/tests/run/i4431/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4431/quoted_1.scala
rename to tests/run/i4431/quoted_1.scala
diff --git a/tests/run-separate-compilation/i4431/quoted_2.scala b/tests/run/i4431/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4431/quoted_2.scala
rename to tests/run/i4431/quoted_2.scala
diff --git a/tests/run-separate-compilation/i4455.check b/tests/run/i4455.check
similarity index 100%
rename from tests/run-separate-compilation/i4455.check
rename to tests/run/i4455.check
diff --git a/tests/run-separate-compilation/i4455/Macro_1.scala b/tests/run/i4455/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4455/Macro_1.scala
rename to tests/run/i4455/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4455/Test_2.scala b/tests/run/i4455/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4455/Test_2.scala
rename to tests/run/i4455/Test_2.scala
diff --git a/tests/run-separate-compilation/i4492.check b/tests/run/i4492.check
similarity index 100%
rename from tests/run-separate-compilation/i4492.check
rename to tests/run/i4492.check
diff --git a/tests/run-separate-compilation/i4492/quoted_1.scala b/tests/run/i4492/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4492/quoted_1.scala
rename to tests/run/i4492/quoted_1.scala
diff --git a/tests/run-separate-compilation/i4492/quoted_2.scala b/tests/run/i4492/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4492/quoted_2.scala
rename to tests/run/i4492/quoted_2.scala
diff --git a/tests/run-separate-compilation/i4515/Macro_1.scala b/tests/run/i4515/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4515/Macro_1.scala
rename to tests/run/i4515/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4515/Test_2.scala b/tests/run/i4515/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4515/Test_2.scala
rename to tests/run/i4515/Test_2.scala
diff --git a/tests/run-separate-compilation/i4515b/Macro_1.scala b/tests/run/i4515b/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4515b/Macro_1.scala
rename to tests/run/i4515b/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4515b/Test_2.scala b/tests/run/i4515b/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4515b/Test_2.scala
rename to tests/run/i4515b/Test_2.scala
diff --git a/tests/run-separate-compilation/i4734.check b/tests/run/i4734.check
similarity index 100%
rename from tests/run-separate-compilation/i4734.check
rename to tests/run/i4734.check
diff --git a/tests/run-separate-compilation/i4734/Macro_1.scala b/tests/run/i4734/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4734/Macro_1.scala
rename to tests/run/i4734/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4734/Test_2.scala b/tests/run/i4734/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4734/Test_2.scala
rename to tests/run/i4734/Test_2.scala
diff --git a/tests/run-separate-compilation/i4735.check b/tests/run/i4735.check
similarity index 100%
rename from tests/run-separate-compilation/i4735.check
rename to tests/run/i4735.check
diff --git a/tests/run-separate-compilation/i4735/App_2.scala b/tests/run/i4735/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4735/App_2.scala
rename to tests/run/i4735/App_2.scala
diff --git a/tests/run-separate-compilation/i4735/Macro_1.scala b/tests/run/i4735/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4735/Macro_1.scala
rename to tests/run/i4735/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4803.check b/tests/run/i4803.check
similarity index 100%
rename from tests/run-separate-compilation/i4803.check
rename to tests/run/i4803.check
diff --git a/tests/run-separate-compilation/i4803/App_2.scala b/tests/run/i4803/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803/App_2.scala
rename to tests/run/i4803/App_2.scala
diff --git a/tests/run-separate-compilation/i4803/Macro_1.scala b/tests/run/i4803/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803/Macro_1.scala
rename to tests/run/i4803/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4803b.check b/tests/run/i4803b.check
similarity index 100%
rename from tests/run-separate-compilation/i4803b.check
rename to tests/run/i4803b.check
diff --git a/tests/run-separate-compilation/i4803b/App_2.scala b/tests/run/i4803b/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803b/App_2.scala
rename to tests/run/i4803b/App_2.scala
diff --git a/tests/run-separate-compilation/i4803b/Macro_1.scala b/tests/run/i4803b/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803b/Macro_1.scala
rename to tests/run/i4803b/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4803c.check b/tests/run/i4803c.check
similarity index 100%
rename from tests/run-separate-compilation/i4803c.check
rename to tests/run/i4803c.check
diff --git a/tests/run-separate-compilation/i4803c/App_2.scala b/tests/run/i4803c/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803c/App_2.scala
rename to tests/run/i4803c/App_2.scala
diff --git a/tests/run-separate-compilation/i4803c/Macro_1.scala b/tests/run/i4803c/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803c/Macro_1.scala
rename to tests/run/i4803c/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4803e/App_2.scala b/tests/run/i4803e/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803e/App_2.scala
rename to tests/run/i4803e/App_2.scala
diff --git a/tests/run-separate-compilation/i4803e/Macro_1.scala b/tests/run/i4803e/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803e/Macro_1.scala
rename to tests/run/i4803e/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4803f/App_2.scala b/tests/run/i4803f/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803f/App_2.scala
rename to tests/run/i4803f/App_2.scala
diff --git a/tests/run-separate-compilation/i4803f/Macro_1.scala b/tests/run/i4803f/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4803f/Macro_1.scala
rename to tests/run/i4803f/Macro_1.scala
diff --git a/tests/run-separate-compilation/i4947b.check b/tests/run/i4947b.check
similarity index 100%
rename from tests/run-separate-compilation/i4947b.check
rename to tests/run/i4947b.check
diff --git a/tests/run-separate-compilation/i4947b/Lib_1.scala b/tests/run/i4947b/Lib_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i4947b/Lib_1.scala
rename to tests/run/i4947b/Lib_1.scala
diff --git a/tests/run-separate-compilation/i4947b/Test_2.scala b/tests/run/i4947b/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i4947b/Test_2.scala
rename to tests/run/i4947b/Test_2.scala
diff --git a/tests/run-separate-compilation/i5119.check b/tests/run/i5119.check
similarity index 100%
rename from tests/run-separate-compilation/i5119.check
rename to tests/run/i5119.check
diff --git a/tests/run-separate-compilation/i5119/Macro_1.scala b/tests/run/i5119/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i5119/Macro_1.scala
rename to tests/run/i5119/Macro_1.scala
diff --git a/tests/run-separate-compilation/i5119/Main_2.scala b/tests/run/i5119/Main_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i5119/Main_2.scala
rename to tests/run/i5119/Main_2.scala
diff --git a/tests/run-separate-compilation/i5119b.check b/tests/run/i5119b.check
similarity index 100%
rename from tests/run-separate-compilation/i5119b.check
rename to tests/run/i5119b.check
diff --git a/tests/run-separate-compilation/i5119b/Macro_1.scala b/tests/run/i5119b/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i5119b/Macro_1.scala
rename to tests/run/i5119b/Macro_1.scala
diff --git a/tests/run-separate-compilation/i5119b/Main_2.scala b/tests/run/i5119b/Main_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i5119b/Main_2.scala
rename to tests/run/i5119b/Main_2.scala
diff --git a/tests/run-separate-compilation/i5188a.check b/tests/run/i5188a.check
similarity index 100%
rename from tests/run-separate-compilation/i5188a.check
rename to tests/run/i5188a.check
diff --git a/tests/run-separate-compilation/i5188a/Macro_1.scala b/tests/run/i5188a/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i5188a/Macro_1.scala
rename to tests/run/i5188a/Macro_1.scala
diff --git a/tests/run-separate-compilation/i5188a/Test_2.scala b/tests/run/i5188a/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i5188a/Test_2.scala
rename to tests/run/i5188a/Test_2.scala
diff --git a/tests/run-separate-compilation/i5533.check b/tests/run/i5533.check
similarity index 100%
rename from tests/run-separate-compilation/i5533.check
rename to tests/run/i5533.check
diff --git a/tests/run-separate-compilation/i5533/Macro_1.scala b/tests/run/i5533/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i5533/Macro_1.scala
rename to tests/run/i5533/Macro_1.scala
diff --git a/tests/run-separate-compilation/i5533/Test_2.scala b/tests/run/i5533/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i5533/Test_2.scala
rename to tests/run/i5533/Test_2.scala
diff --git a/tests/run-separate-compilation/i5533b.check b/tests/run/i5533b.check
similarity index 100%
rename from tests/run-separate-compilation/i5533b.check
rename to tests/run/i5533b.check
diff --git a/tests/run-separate-compilation/i5533b/Macro_1.scala b/tests/run/i5533b/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i5533b/Macro_1.scala
rename to tests/run/i5533b/Macro_1.scala
diff --git a/tests/run-separate-compilation/i5533b/Test_2.scala b/tests/run/i5533b/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i5533b/Test_2.scala
rename to tests/run/i5533b/Test_2.scala
diff --git a/tests/run-separate-compilation/i5536/Macro_1.scala b/tests/run/i5536/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/i5536/Macro_1.scala
rename to tests/run/i5536/Macro_1.scala
diff --git a/tests/run-separate-compilation/i5536/Test_2.scala b/tests/run/i5536/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/i5536/Test_2.scala
rename to tests/run/i5536/Test_2.scala
diff --git a/tests/run-separate-compilation/implicitShortcut/Base_1.scala b/tests/run/implicitShortcut/Base_1.scala
similarity index 100%
rename from tests/run-separate-compilation/implicitShortcut/Base_1.scala
rename to tests/run/implicitShortcut/Base_1.scala
diff --git a/tests/run-separate-compilation/implicitShortcut/Derived_2.scala b/tests/run/implicitShortcut/Derived_2.scala
similarity index 100%
rename from tests/run-separate-compilation/implicitShortcut/Derived_2.scala
rename to tests/run/implicitShortcut/Derived_2.scala
diff --git a/tests/run-separate-compilation/implicitShortcut/Test_3.scala b/tests/run/implicitShortcut/Test_3.scala
similarity index 100%
rename from tests/run-separate-compilation/implicitShortcut/Test_3.scala
rename to tests/run/implicitShortcut/Test_3.scala
diff --git a/tests/run-separate-compilation/inline-case-objects.check b/tests/run/inline-case-objects.check
similarity index 100%
rename from tests/run-separate-compilation/inline-case-objects.check
rename to tests/run/inline-case-objects.check
diff --git a/tests/run-separate-compilation/inline-case-objects/Macro_1.scala b/tests/run/inline-case-objects/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-case-objects/Macro_1.scala
rename to tests/run/inline-case-objects/Macro_1.scala
diff --git a/tests/run-separate-compilation/inline-case-objects/Main_2.scala b/tests/run/inline-case-objects/Main_2.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-case-objects/Main_2.scala
rename to tests/run/inline-case-objects/Main_2.scala
diff --git a/tests/run-separate-compilation/inline-macro-staged-interpreter.check b/tests/run/inline-macro-staged-interpreter.check
similarity index 100%
rename from tests/run-separate-compilation/inline-macro-staged-interpreter.check
rename to tests/run/inline-macro-staged-interpreter.check
diff --git a/tests/run-separate-compilation/inline-macro-staged-interpreter/Macro_1.scala b/tests/run/inline-macro-staged-interpreter/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-macro-staged-interpreter/Macro_1.scala
rename to tests/run/inline-macro-staged-interpreter/Macro_1.scala
diff --git a/tests/run-separate-compilation/inline-macro-staged-interpreter/Main_2.scala b/tests/run/inline-macro-staged-interpreter/Main_2.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-macro-staged-interpreter/Main_2.scala
rename to tests/run/inline-macro-staged-interpreter/Main_2.scala
diff --git a/tests/run-separate-compilation/inline-option.check b/tests/run/inline-option.check
similarity index 100%
rename from tests/run-separate-compilation/inline-option.check
rename to tests/run/inline-option.check
diff --git a/tests/run-separate-compilation/inline-option/Macro_1.scala b/tests/run/inline-option/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-option/Macro_1.scala
rename to tests/run/inline-option/Macro_1.scala
diff --git a/tests/run-separate-compilation/inline-option/Main_2.scala b/tests/run/inline-option/Main_2.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-option/Main_2.scala
rename to tests/run/inline-option/Main_2.scala
diff --git a/tests/run-separate-compilation/inline-tuples-1.check b/tests/run/inline-tuples-1.check
similarity index 100%
rename from tests/run-separate-compilation/inline-tuples-1.check
rename to tests/run/inline-tuples-1.check
diff --git a/tests/run-separate-compilation/inline-tuples-1/Macro_1.scala b/tests/run/inline-tuples-1/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-tuples-1/Macro_1.scala
rename to tests/run/inline-tuples-1/Macro_1.scala
diff --git a/tests/run-separate-compilation/inline-tuples-1/Main_2.scala b/tests/run/inline-tuples-1/Main_2.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-tuples-1/Main_2.scala
rename to tests/run/inline-tuples-1/Main_2.scala
diff --git a/tests/run-separate-compilation/inline-tuples-2.check b/tests/run/inline-tuples-2.check
similarity index 100%
rename from tests/run-separate-compilation/inline-tuples-2.check
rename to tests/run/inline-tuples-2.check
diff --git a/tests/run-separate-compilation/inline-tuples-2/Macro_1.scala b/tests/run/inline-tuples-2/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-tuples-2/Macro_1.scala
rename to tests/run/inline-tuples-2/Macro_1.scala
diff --git a/tests/run-separate-compilation/inline-tuples-2/Main_2.scala b/tests/run/inline-tuples-2/Main_2.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-tuples-2/Main_2.scala
rename to tests/run/inline-tuples-2/Main_2.scala
diff --git a/tests/run-separate-compilation/inline-varargs-1.check b/tests/run/inline-varargs-1.check
similarity index 100%
rename from tests/run-separate-compilation/inline-varargs-1.check
rename to tests/run/inline-varargs-1.check
diff --git a/tests/run-separate-compilation/inline-varargs-1/Macro_1.scala b/tests/run/inline-varargs-1/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-varargs-1/Macro_1.scala
rename to tests/run/inline-varargs-1/Macro_1.scala
diff --git a/tests/run-separate-compilation/inline-varargs-1/Main_2.scala b/tests/run/inline-varargs-1/Main_2.scala
similarity index 100%
rename from tests/run-separate-compilation/inline-varargs-1/Main_2.scala
rename to tests/run/inline-varargs-1/Main_2.scala
diff --git a/tests/run-separate-compilation/mixins1/A_1.scala b/tests/run/mixins1/A_1.scala
similarity index 100%
rename from tests/run-separate-compilation/mixins1/A_1.scala
rename to tests/run/mixins1/A_1.scala
diff --git a/tests/run-separate-compilation/mixins1/C_2.scala b/tests/run/mixins1/C_2.scala
similarity index 100%
rename from tests/run-separate-compilation/mixins1/C_2.scala
rename to tests/run/mixins1/C_2.scala
diff --git a/tests/run-separate-compilation/outerPatternMatch/Outer_1.scala b/tests/run/outerPatternMatch/Outer_1.scala
similarity index 100%
rename from tests/run-separate-compilation/outerPatternMatch/Outer_1.scala
rename to tests/run/outerPatternMatch/Outer_1.scala
diff --git a/tests/run-separate-compilation/outerPatternMatch/Test_2.scala b/tests/run/outerPatternMatch/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/outerPatternMatch/Test_2.scala
rename to tests/run/outerPatternMatch/Test_2.scala
diff --git a/tests/run-separate-compilation/paramForwarding_separate.check b/tests/run/paramForwarding_separate.check
similarity index 100%
rename from tests/run-separate-compilation/paramForwarding_separate.check
rename to tests/run/paramForwarding_separate.check
diff --git a/tests/run-separate-compilation/paramForwarding_separate/A_1.scala b/tests/run/paramForwarding_separate/A_1.scala
similarity index 100%
rename from tests/run-separate-compilation/paramForwarding_separate/A_1.scala
rename to tests/run/paramForwarding_separate/A_1.scala
diff --git a/tests/run-separate-compilation/paramForwarding_separate/B_2.scala b/tests/run/paramForwarding_separate/B_2.scala
similarity index 100%
rename from tests/run-separate-compilation/paramForwarding_separate/B_2.scala
rename to tests/run/paramForwarding_separate/B_2.scala
diff --git a/tests/run-separate-compilation/quote-and-splice.check b/tests/run/quote-and-splice.check
similarity index 100%
rename from tests/run-separate-compilation/quote-and-splice.check
rename to tests/run/quote-and-splice.check
diff --git a/tests/run-separate-compilation/quote-and-splice/Macros_1.scala b/tests/run/quote-and-splice/Macros_1.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-and-splice/Macros_1.scala
rename to tests/run/quote-and-splice/Macros_1.scala
diff --git a/tests/run-separate-compilation/quote-and-splice/Test_2.scala b/tests/run/quote-and-splice/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-and-splice/Test_2.scala
rename to tests/run/quote-and-splice/Test_2.scala
diff --git a/tests/run-separate-compilation/quote-change-owner.check b/tests/run/quote-change-owner.check
similarity index 100%
rename from tests/run-separate-compilation/quote-change-owner.check
rename to tests/run/quote-change-owner.check
diff --git a/tests/run-separate-compilation/quote-change-owner/Macro_1.scala b/tests/run/quote-change-owner/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-change-owner/Macro_1.scala
rename to tests/run/quote-change-owner/Macro_1.scala
diff --git a/tests/run-separate-compilation/quote-change-owner/Test_2.scala b/tests/run/quote-change-owner/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-change-owner/Test_2.scala
rename to tests/run/quote-change-owner/Test_2.scala
diff --git a/tests/run-separate-compilation/quote-force.check b/tests/run/quote-force.check
similarity index 100%
rename from tests/run-separate-compilation/quote-force.check
rename to tests/run/quote-force.check
diff --git a/tests/run-separate-compilation/quote-force/quoted_1.scala b/tests/run/quote-force/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-force/quoted_1.scala
rename to tests/run/quote-force/quoted_1.scala
diff --git a/tests/run-separate-compilation/quote-force/quoted_2.scala b/tests/run/quote-force/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-force/quoted_2.scala
rename to tests/run/quote-force/quoted_2.scala
diff --git a/tests/run-separate-compilation/quote-indexed-map-by-name/quoted_1.scala b/tests/run/quote-indexed-map-by-name/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-indexed-map-by-name/quoted_1.scala
rename to tests/run/quote-indexed-map-by-name/quoted_1.scala
diff --git a/tests/run-separate-compilation/quote-indexed-map-by-name/quoted_2.scala b/tests/run/quote-indexed-map-by-name/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-indexed-map-by-name/quoted_2.scala
rename to tests/run/quote-indexed-map-by-name/quoted_2.scala
diff --git a/tests/run-separate-compilation/quote-sep-comp-2/Macro_1.scala b/tests/run/quote-sep-comp-2/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-sep-comp-2/Macro_1.scala
rename to tests/run/quote-sep-comp-2/Macro_1.scala
diff --git a/tests/run-separate-compilation/quote-sep-comp-2/Test_2.scala b/tests/run/quote-sep-comp-2/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-sep-comp-2/Test_2.scala
rename to tests/run/quote-sep-comp-2/Test_2.scala
diff --git a/tests/run-separate-compilation/quote-sep-comp.check b/tests/run/quote-sep-comp.check
similarity index 100%
rename from tests/run-separate-compilation/quote-sep-comp.check
rename to tests/run/quote-sep-comp.check
diff --git a/tests/run-separate-compilation/quote-sep-comp/Macro_1.scala b/tests/run/quote-sep-comp/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-sep-comp/Macro_1.scala
rename to tests/run/quote-sep-comp/Macro_1.scala
diff --git a/tests/run-separate-compilation/quote-sep-comp/Test_2.scala b/tests/run/quote-sep-comp/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-sep-comp/Test_2.scala
rename to tests/run/quote-sep-comp/Test_2.scala
diff --git a/tests/run-separate-compilation/quote-simple-macro.check b/tests/run/quote-simple-macro.check
similarity index 100%
rename from tests/run-separate-compilation/quote-simple-macro.check
rename to tests/run/quote-simple-macro.check
diff --git a/tests/run-separate-compilation/quote-simple-macro/quoted_1.scala b/tests/run/quote-simple-macro/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-simple-macro/quoted_1.scala
rename to tests/run/quote-simple-macro/quoted_1.scala
diff --git a/tests/run-separate-compilation/quote-simple-macro/quoted_2.scala b/tests/run/quote-simple-macro/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-simple-macro/quoted_2.scala
rename to tests/run/quote-simple-macro/quoted_2.scala
diff --git a/tests/run-separate-compilation/quote-unrolled-foreach.check b/tests/run/quote-unrolled-foreach.check
similarity index 100%
rename from tests/run-separate-compilation/quote-unrolled-foreach.check
rename to tests/run/quote-unrolled-foreach.check
diff --git a/tests/run-separate-compilation/quote-unrolled-foreach/quoted_1.scala b/tests/run/quote-unrolled-foreach/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-unrolled-foreach/quoted_1.scala
rename to tests/run/quote-unrolled-foreach/quoted_1.scala
diff --git a/tests/run-separate-compilation/quote-unrolled-foreach/quoted_2.scala b/tests/run/quote-unrolled-foreach/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/quote-unrolled-foreach/quoted_2.scala
rename to tests/run/quote-unrolled-foreach/quoted_2.scala
diff --git a/tests/run-separate-compilation/t3038c.check b/tests/run/t3038c.check
similarity index 100%
rename from tests/run-separate-compilation/t3038c.check
rename to tests/run/t3038c.check
diff --git a/tests/run-separate-compilation/t3038c/A_1.scala b/tests/run/t3038c/A_1.scala
similarity index 100%
rename from tests/run-separate-compilation/t3038c/A_1.scala
rename to tests/run/t3038c/A_1.scala
diff --git a/tests/run-separate-compilation/t3038c/B_2.scala b/tests/run/t3038c/B_2.scala
similarity index 100%
rename from tests/run-separate-compilation/t3038c/B_2.scala
rename to tests/run/t3038c/B_2.scala
diff --git a/tests/run-separate-compilation/t3452a.check b/tests/run/t3452a.check
similarity index 100%
rename from tests/run-separate-compilation/t3452a.check
rename to tests/run/t3452a.check
diff --git a/tests/run-separate-compilation/t3452a/J_2.java b/tests/run/t3452a/J_2.java
similarity index 100%
rename from tests/run-separate-compilation/t3452a/J_2.java
rename to tests/run/t3452a/J_2.java
diff --git a/tests/run-separate-compilation/t3452a/S_1.scala b/tests/run/t3452a/S_1.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452a/S_1.scala
rename to tests/run/t3452a/S_1.scala
diff --git a/tests/run-separate-compilation/t3452a/S_3.scala b/tests/run/t3452a/S_3.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452a/S_3.scala
rename to tests/run/t3452a/S_3.scala
diff --git a/tests/run-separate-compilation/t3452b-bcode.check b/tests/run/t3452b-bcode.check
similarity index 100%
rename from tests/run-separate-compilation/t3452b-bcode.check
rename to tests/run/t3452b-bcode.check
diff --git a/tests/run-separate-compilation/t3452b-bcode/J_2.java b/tests/run/t3452b-bcode/J_2.java
similarity index 100%
rename from tests/run-separate-compilation/t3452b-bcode/J_2.java
rename to tests/run/t3452b-bcode/J_2.java
diff --git a/tests/run-separate-compilation/t3452b-bcode/S_1.scala b/tests/run/t3452b-bcode/S_1.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452b-bcode/S_1.scala
rename to tests/run/t3452b-bcode/S_1.scala
diff --git a/tests/run-separate-compilation/t3452b-bcode/S_3.scala b/tests/run/t3452b-bcode/S_3.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452b-bcode/S_3.scala
rename to tests/run/t3452b-bcode/S_3.scala
diff --git a/tests/run-separate-compilation/t3452b.check b/tests/run/t3452b.check
similarity index 100%
rename from tests/run-separate-compilation/t3452b.check
rename to tests/run/t3452b.check
diff --git a/tests/run-separate-compilation/t3452b/J_2.java b/tests/run/t3452b/J_2.java
similarity index 100%
rename from tests/run-separate-compilation/t3452b/J_2.java
rename to tests/run/t3452b/J_2.java
diff --git a/tests/run-separate-compilation/t3452b/S_1.scala b/tests/run/t3452b/S_1.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452b/S_1.scala
rename to tests/run/t3452b/S_1.scala
diff --git a/tests/run-separate-compilation/t3452b/S_3.scala b/tests/run/t3452b/S_3.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452b/S_3.scala
rename to tests/run/t3452b/S_3.scala
diff --git a/tests/run-separate-compilation/t3452d/A.scala b/tests/run/t3452d/A.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452d/A.scala
rename to tests/run/t3452d/A.scala
diff --git a/tests/run-separate-compilation/t3452d/Test.java b/tests/run/t3452d/Test.java
similarity index 100%
rename from tests/run-separate-compilation/t3452d/Test.java
rename to tests/run/t3452d/Test.java
diff --git a/tests/run-separate-compilation/t3452e/A.scala b/tests/run/t3452e/A.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452e/A.scala
rename to tests/run/t3452e/A.scala
diff --git a/tests/run-separate-compilation/t3452e/B.java b/tests/run/t3452e/B.java
similarity index 100%
rename from tests/run-separate-compilation/t3452e/B.java
rename to tests/run/t3452e/B.java
diff --git a/tests/run-separate-compilation/t3452e/Test.scala b/tests/run/t3452e/Test.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452e/Test.scala
rename to tests/run/t3452e/Test.scala
diff --git a/tests/run-separate-compilation/t3452g/A.scala b/tests/run/t3452g/A.scala
similarity index 100%
rename from tests/run-separate-compilation/t3452g/A.scala
rename to tests/run/t3452g/A.scala
diff --git a/tests/run-separate-compilation/t3452g/Test.java b/tests/run/t3452g/Test.java
similarity index 100%
rename from tests/run-separate-compilation/t3452g/Test.java
rename to tests/run/t3452g/Test.java
diff --git a/tests/run-separate-compilation/t4238/J_1.java b/tests/run/t4238/J_1.java
similarity index 100%
rename from tests/run-separate-compilation/t4238/J_1.java
rename to tests/run/t4238/J_1.java
diff --git a/tests/run-separate-compilation/t4238/s_2.scala b/tests/run/t4238/s_2.scala
similarity index 100%
rename from tests/run-separate-compilation/t4238/s_2.scala
rename to tests/run/t4238/s_2.scala
diff --git a/tests/run-separate-compilation/t4317.check b/tests/run/t4317.check
similarity index 100%
rename from tests/run-separate-compilation/t4317.check
rename to tests/run/t4317.check
diff --git a/tests/run-separate-compilation/t4317/J_2.java b/tests/run/t4317/J_2.java
similarity index 100%
rename from tests/run-separate-compilation/t4317/J_2.java
rename to tests/run/t4317/J_2.java
diff --git a/tests/run-separate-compilation/t4317/S_1.scala b/tests/run/t4317/S_1.scala
similarity index 100%
rename from tests/run-separate-compilation/t4317/S_1.scala
rename to tests/run/t4317/S_1.scala
diff --git a/tests/run-separate-compilation/t4317/S_3.scala b/tests/run/t4317/S_3.scala
similarity index 100%
rename from tests/run-separate-compilation/t4317/S_3.scala
rename to tests/run/t4317/S_3.scala
diff --git a/tests/run-separate-compilation/t7120.check b/tests/run/t7120.check
similarity index 100%
rename from tests/run-separate-compilation/t7120.check
rename to tests/run/t7120.check
diff --git a/tests/run-separate-compilation/t7120/Base_1.scala b/tests/run/t7120/Base_1.scala
similarity index 100%
rename from tests/run-separate-compilation/t7120/Base_1.scala
rename to tests/run/t7120/Base_1.scala
diff --git a/tests/run-separate-compilation/t7120/Derived_2.scala b/tests/run/t7120/Derived_2.scala
similarity index 100%
rename from tests/run-separate-compilation/t7120/Derived_2.scala
rename to tests/run/t7120/Derived_2.scala
diff --git a/tests/run-separate-compilation/t7120/Run_3.scala b/tests/run/t7120/Run_3.scala
similarity index 100%
rename from tests/run-separate-compilation/t7120/Run_3.scala
rename to tests/run/t7120/Run_3.scala
diff --git a/tests/run-separate-compilation/t7374.check b/tests/run/t7374.check
similarity index 100%
rename from tests/run-separate-compilation/t7374.check
rename to tests/run/t7374.check
diff --git a/tests/run-separate-compilation/t7374/Some.scala b/tests/run/t7374/Some.scala
similarity index 100%
rename from tests/run-separate-compilation/t7374/Some.scala
rename to tests/run/t7374/Some.scala
diff --git a/tests/run-separate-compilation/t7374/Test.java b/tests/run/t7374/Test.java
similarity index 100%
rename from tests/run-separate-compilation/t7374/Test.java
rename to tests/run/t7374/Test.java
diff --git a/tests/run-separate-compilation/t7859/A_1.scala b/tests/run/t7859/A_1.scala
similarity index 100%
rename from tests/run-separate-compilation/t7859/A_1.scala
rename to tests/run/t7859/A_1.scala
diff --git a/tests/run-separate-compilation/t7859/B_2.scala b/tests/run/t7859/B_2.scala
similarity index 100%
rename from tests/run-separate-compilation/t7859/B_2.scala
rename to tests/run/t7859/B_2.scala
diff --git a/tests/run-separate-compilation/t9915/C_1.java b/tests/run/t9915/C_1.java
similarity index 100%
rename from tests/run-separate-compilation/t9915/C_1.java
rename to tests/run/t9915/C_1.java
diff --git a/tests/run-separate-compilation/t9915/Test_2.scala b/tests/run/t9915/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/t9915/Test_2.scala
rename to tests/run/t9915/Test_2.scala
diff --git a/tests/run-separate-compilation/tasty-argument-tree-1.check b/tests/run/tasty-argument-tree-1.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-argument-tree-1.check
rename to tests/run/tasty-argument-tree-1.check
diff --git a/tests/run-separate-compilation/tasty-argument-tree-1/quoted_1.scala b/tests/run/tasty-argument-tree-1/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-argument-tree-1/quoted_1.scala
rename to tests/run/tasty-argument-tree-1/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-argument-tree-1/quoted_2.scala b/tests/run/tasty-argument-tree-1/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-argument-tree-1/quoted_2.scala
rename to tests/run/tasty-argument-tree-1/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-custom-show.check b/tests/run/tasty-custom-show.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-custom-show.check
rename to tests/run/tasty-custom-show.check
diff --git a/tests/run-separate-compilation/tasty-custom-show/quoted_1.scala b/tests/run/tasty-custom-show/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-custom-show/quoted_1.scala
rename to tests/run/tasty-custom-show/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-custom-show/quoted_2.scala b/tests/run/tasty-custom-show/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-custom-show/quoted_2.scala
rename to tests/run/tasty-custom-show/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-definitions-1.check b/tests/run/tasty-definitions-1.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-definitions-1.check
rename to tests/run/tasty-definitions-1.check
diff --git a/tests/run-separate-compilation/tasty-definitions-1/quoted_1.scala b/tests/run/tasty-definitions-1/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-definitions-1/quoted_1.scala
rename to tests/run/tasty-definitions-1/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-definitions-1/quoted_2.scala b/tests/run/tasty-definitions-1/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-definitions-1/quoted_2.scala
rename to tests/run/tasty-definitions-1/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-eval.check b/tests/run/tasty-eval.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-eval.check
rename to tests/run/tasty-eval.check
diff --git a/tests/run-separate-compilation/tasty-eval/quoted_1.scala b/tests/run/tasty-eval/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-eval/quoted_1.scala
rename to tests/run/tasty-eval/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-eval/quoted_2.scala b/tests/run/tasty-eval/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-eval/quoted_2.scala
rename to tests/run/tasty-eval/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-1.check b/tests/run/tasty-extractors-1.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-1.check
rename to tests/run/tasty-extractors-1.check
diff --git a/tests/run-separate-compilation/tasty-extractors-1/quoted_1.scala b/tests/run/tasty-extractors-1/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-1/quoted_1.scala
rename to tests/run/tasty-extractors-1/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-1/quoted_2.scala b/tests/run/tasty-extractors-1/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-1/quoted_2.scala
rename to tests/run/tasty-extractors-1/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-2.check b/tests/run/tasty-extractors-2.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-2.check
rename to tests/run/tasty-extractors-2.check
diff --git a/tests/run-separate-compilation/tasty-extractors-2/quoted_1.scala b/tests/run/tasty-extractors-2/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-2/quoted_1.scala
rename to tests/run/tasty-extractors-2/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-2/quoted_2.scala b/tests/run/tasty-extractors-2/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-2/quoted_2.scala
rename to tests/run/tasty-extractors-2/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-3.check b/tests/run/tasty-extractors-3.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-3.check
rename to tests/run/tasty-extractors-3.check
diff --git a/tests/run-separate-compilation/tasty-extractors-3/quoted_1.scala b/tests/run/tasty-extractors-3/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-3/quoted_1.scala
rename to tests/run/tasty-extractors-3/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-3/quoted_2.scala b/tests/run/tasty-extractors-3/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-3/quoted_2.scala
rename to tests/run/tasty-extractors-3/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-constants-1.check b/tests/run/tasty-extractors-constants-1.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-constants-1.check
rename to tests/run/tasty-extractors-constants-1.check
diff --git a/tests/run-separate-compilation/tasty-extractors-constants-1/quoted_1.scala b/tests/run/tasty-extractors-constants-1/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-constants-1/quoted_1.scala
rename to tests/run/tasty-extractors-constants-1/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-constants-1/quoted_2.scala b/tests/run/tasty-extractors-constants-1/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-constants-1/quoted_2.scala
rename to tests/run/tasty-extractors-constants-1/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-types.check b/tests/run/tasty-extractors-types.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-types.check
rename to tests/run/tasty-extractors-types.check
diff --git a/tests/run-separate-compilation/tasty-extractors-types/quoted_1.scala b/tests/run/tasty-extractors-types/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-types/quoted_1.scala
rename to tests/run/tasty-extractors-types/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-extractors-types/quoted_2.scala b/tests/run/tasty-extractors-types/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-extractors-types/quoted_2.scala
rename to tests/run/tasty-extractors-types/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-getfile-implicit-fun-context.check b/tests/run/tasty-getfile-implicit-fun-context.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-getfile-implicit-fun-context.check
rename to tests/run/tasty-getfile-implicit-fun-context.check
diff --git a/tests/run-separate-compilation/tasty-getfile-implicit-fun-context/App_2.scala b/tests/run/tasty-getfile-implicit-fun-context/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-getfile-implicit-fun-context/App_2.scala
rename to tests/run/tasty-getfile-implicit-fun-context/App_2.scala
diff --git a/tests/run-separate-compilation/tasty-getfile-implicit-fun-context/Macro_1.scala b/tests/run/tasty-getfile-implicit-fun-context/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-getfile-implicit-fun-context/Macro_1.scala
rename to tests/run/tasty-getfile-implicit-fun-context/Macro_1.scala
diff --git a/tests/run-separate-compilation/tasty-getfile.check b/tests/run/tasty-getfile.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-getfile.check
rename to tests/run/tasty-getfile.check
diff --git a/tests/run-separate-compilation/tasty-getfile/App_2.scala b/tests/run/tasty-getfile/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-getfile/App_2.scala
rename to tests/run/tasty-getfile/App_2.scala
diff --git a/tests/run-separate-compilation/tasty-getfile/Macro_1.scala b/tests/run/tasty-getfile/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-getfile/Macro_1.scala
rename to tests/run/tasty-getfile/Macro_1.scala
diff --git a/tests/run-separate-compilation/tasty-implicit-fun-context-2.check b/tests/run/tasty-implicit-fun-context-2.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-implicit-fun-context-2.check
rename to tests/run/tasty-implicit-fun-context-2.check
diff --git a/tests/run-separate-compilation/tasty-implicit-fun-context-2/App_2.scala b/tests/run/tasty-implicit-fun-context-2/App_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-implicit-fun-context-2/App_2.scala
rename to tests/run/tasty-implicit-fun-context-2/App_2.scala
diff --git a/tests/run-separate-compilation/tasty-implicit-fun-context-2/Macro_1.scala b/tests/run/tasty-implicit-fun-context-2/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-implicit-fun-context-2/Macro_1.scala
rename to tests/run/tasty-implicit-fun-context-2/Macro_1.scala
diff --git a/tests/run-separate-compilation/tasty-indexed-map/quoted_1.scala b/tests/run/tasty-indexed-map/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-indexed-map/quoted_1.scala
rename to tests/run/tasty-indexed-map/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-indexed-map/quoted_2.scala b/tests/run/tasty-indexed-map/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-indexed-map/quoted_2.scala
rename to tests/run/tasty-indexed-map/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-linenumber-2.check b/tests/run/tasty-linenumber-2.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-linenumber-2.check
rename to tests/run/tasty-linenumber-2.check
diff --git a/tests/run-separate-compilation/tasty-linenumber-2/quoted_1.scala b/tests/run/tasty-linenumber-2/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-linenumber-2/quoted_1.scala
rename to tests/run/tasty-linenumber-2/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-linenumber-2/quoted_2.scala b/tests/run/tasty-linenumber-2/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-linenumber-2/quoted_2.scala
rename to tests/run/tasty-linenumber-2/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-linenumber.check b/tests/run/tasty-linenumber.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-linenumber.check
rename to tests/run/tasty-linenumber.check
diff --git a/tests/run-separate-compilation/tasty-linenumber/quoted_1.scala b/tests/run/tasty-linenumber/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-linenumber/quoted_1.scala
rename to tests/run/tasty-linenumber/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-linenumber/quoted_2.scala b/tests/run/tasty-linenumber/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-linenumber/quoted_2.scala
rename to tests/run/tasty-linenumber/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-location.check b/tests/run/tasty-location.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-location.check
rename to tests/run/tasty-location.check
diff --git a/tests/run-separate-compilation/tasty-location/quoted_1.scala b/tests/run/tasty-location/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-location/quoted_1.scala
rename to tests/run/tasty-location/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-location/quoted_2.scala b/tests/run/tasty-location/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-location/quoted_2.scala
rename to tests/run/tasty-location/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-macro-assert.check b/tests/run/tasty-macro-assert.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-macro-assert.check
rename to tests/run/tasty-macro-assert.check
diff --git a/tests/run-separate-compilation/tasty-macro-assert/quoted_1.scala b/tests/run/tasty-macro-assert/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-macro-assert/quoted_1.scala
rename to tests/run/tasty-macro-assert/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-macro-assert/quoted_2.scala b/tests/run/tasty-macro-assert/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-macro-assert/quoted_2.scala
rename to tests/run/tasty-macro-assert/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-macro-const/quoted_1.scala b/tests/run/tasty-macro-const/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-macro-const/quoted_1.scala
rename to tests/run/tasty-macro-const/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-macro-const/quoted_2.scala b/tests/run/tasty-macro-const/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-macro-const/quoted_2.scala
rename to tests/run/tasty-macro-const/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-positioned.check b/tests/run/tasty-positioned.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-positioned.check
rename to tests/run/tasty-positioned.check
diff --git a/tests/run-separate-compilation/tasty-positioned/quoted_1.scala b/tests/run/tasty-positioned/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-positioned/quoted_1.scala
rename to tests/run/tasty-positioned/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-positioned/quoted_2.scala b/tests/run/tasty-positioned/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-positioned/quoted_2.scala
rename to tests/run/tasty-positioned/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-subtyping.check b/tests/run/tasty-subtyping.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-subtyping.check
rename to tests/run/tasty-subtyping.check
diff --git a/tests/run-separate-compilation/tasty-subtyping/quoted_1.scala b/tests/run/tasty-subtyping/quoted_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-subtyping/quoted_1.scala
rename to tests/run/tasty-subtyping/quoted_1.scala
diff --git a/tests/run-separate-compilation/tasty-subtyping/quoted_2.scala b/tests/run/tasty-subtyping/quoted_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-subtyping/quoted_2.scala
rename to tests/run/tasty-subtyping/quoted_2.scala
diff --git a/tests/run-separate-compilation/tasty-typeof.check b/tests/run/tasty-typeof.check
similarity index 100%
rename from tests/run-separate-compilation/tasty-typeof.check
rename to tests/run/tasty-typeof.check
diff --git a/tests/run-separate-compilation/tasty-typeof/Macro_1.scala b/tests/run/tasty-typeof/Macro_1.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-typeof/Macro_1.scala
rename to tests/run/tasty-typeof/Macro_1.scala
diff --git a/tests/run-separate-compilation/tasty-typeof/Test_2.scala b/tests/run/tasty-typeof/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/tasty-typeof/Test_2.scala
rename to tests/run/tasty-typeof/Test_2.scala
diff --git a/tests/run-separate-compilation/transparent.check b/tests/run/transparent.check
similarity index 100%
rename from tests/run-separate-compilation/transparent.check
rename to tests/run/transparent.check
diff --git a/tests/run-separate-compilation/transparent/Test_2.scala b/tests/run/transparent/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/transparent/Test_2.scala
rename to tests/run/transparent/Test_2.scala
diff --git a/tests/run-separate-compilation/transparent/inlines_1.scala b/tests/run/transparent/inlines_1.scala
similarity index 100%
rename from tests/run-separate-compilation/transparent/inlines_1.scala
rename to tests/run/transparent/inlines_1.scala
diff --git a/tests/run-separate-compilation/transparentAccess/C_1.scala b/tests/run/transparentAccess/C_1.scala
similarity index 100%
rename from tests/run-separate-compilation/transparentAccess/C_1.scala
rename to tests/run/transparentAccess/C_1.scala
diff --git a/tests/run-separate-compilation/transparentAccess/Test_2.scala b/tests/run/transparentAccess/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/transparentAccess/Test_2.scala
rename to tests/run/transparentAccess/Test_2.scala
diff --git a/tests/run-separate-compilation/transparentPower.check b/tests/run/transparentPower.check
similarity index 100%
rename from tests/run-separate-compilation/transparentPower.check
rename to tests/run/transparentPower.check
diff --git a/tests/run-separate-compilation/transparentPower/Test_2.scala b/tests/run/transparentPower/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/transparentPower/Test_2.scala
rename to tests/run/transparentPower/Test_2.scala
diff --git a/tests/run-separate-compilation/transparentPower/power_1.scala b/tests/run/transparentPower/power_1.scala
similarity index 100%
rename from tests/run-separate-compilation/transparentPower/power_1.scala
rename to tests/run/transparentPower/power_1.scala
diff --git a/tests/run-separate-compilation/xml-interpolation-1/Test_2.scala b/tests/run/xml-interpolation-1/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/xml-interpolation-1/Test_2.scala
rename to tests/run/xml-interpolation-1/Test_2.scala
diff --git a/tests/run-separate-compilation/xml-interpolation-1/XmlQuote_1.scala b/tests/run/xml-interpolation-1/XmlQuote_1.scala
similarity index 100%
rename from tests/run-separate-compilation/xml-interpolation-1/XmlQuote_1.scala
rename to tests/run/xml-interpolation-1/XmlQuote_1.scala
diff --git a/tests/run-separate-compilation/xml-interpolation-2/Test_2.scala b/tests/run/xml-interpolation-2/Test_2.scala
similarity index 100%
rename from tests/run-separate-compilation/xml-interpolation-2/Test_2.scala
rename to tests/run/xml-interpolation-2/Test_2.scala
diff --git a/tests/run-separate-compilation/xml-interpolation-2/XmlQuote_1.scala b/tests/run/xml-interpolation-2/XmlQuote_1.scala
similarity index 100%
rename from tests/run-separate-compilation/xml-interpolation-2/XmlQuote_1.scala
rename to tests/run/xml-interpolation-2/XmlQuote_1.scala