diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
index 2a25cde34c8b..6a5e92a51a37 100644
--- a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
@@ -29,10 +29,6 @@ class BootstrappedOnlyCompilationTests {
     aggregateTests(
       compileFilesInDir("tests/bench", defaultOptions.without("-Yno-deep-subtypes")),
       compileFilesInDir("tests/pos-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFilesInDir("tests/pos-custom-args/semanticdb", defaultOptions.and("-Xsemanticdb")),
-      compileDir("tests/pos-special/i7592", defaultOptions.and("-Yretain-trees")),
-      compileDir("tests/pos-special/i11331.1", defaultOptions),
-      compileDir("tests/pos-custom-args/i13405", defaultOptions.and("-Xfatal-warnings")),
     ).checkCompile()
   }
 
@@ -107,13 +103,8 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def negMacros: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compileNegWithCompiler")
-    aggregateTests(
-      compileFilesInDir("tests/neg-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFilesInDir("tests/neg-inlines-strict", defaultOptions.and("-source", "future")),
-      compileFile("tests/pos-macros/i9570.scala", defaultOptions.and("-Xfatal-warnings")),
-      compileFile("tests/pos-macros/macro-deprecation.scala", defaultOptions.and("-Xfatal-warnings", "-deprecation")),
-      compileFile("tests/pos-macros/macro-experimental.scala", defaultOptions.and("-Yno-experimental")),
-    ).checkExpectedErrors()
+    compileFilesInDir("tests/neg-macros", defaultOptions.and("-Xcheck-macros"))
+      .checkExpectedErrors()
   }
 
   @Test def negWithCompiler: Unit = {
@@ -128,26 +119,20 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def runMacros: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runMacros")
-    aggregateTests(
-      compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees"),
-      compileFilesInDir("tests/run-custom-args/Yread-comments", defaultOptions and "-Yread-docs"),
-      compileFilesInDir("tests/run-custom-args/run-macros-erased", defaultOptions.and("-language:experimental.erasedDefinitions").and("-Xcheck-macros")),
-      compileDir("tests/run-custom-args/Xmacro-settings/simple", defaultOptions.and("-Xmacro-settings:one,two,three")),
-      compileDir("tests/run-custom-args/Xmacro-settings/compileTimeEnv", defaultOptions.and("-Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO")),
-    )
-  }.checkRuns()
+    compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros"))
+      .checkRuns()
+  }
 
   @Test def runWithCompiler: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runWithCompiler")
     val basicTests = List(
       compileFilesInDir("tests/run-with-compiler", withCompilerOptions),
       compileFilesInDir("tests/run-staging", withStagingOptions),
-      compileFilesInDir("tests/run-custom-args/tasty-inspector", withTastyInspectorOptions)
+      compileFilesInDir("tests/run-tasty-inspector", withTastyInspectorOptions)
     )
     val tests =
       if scala.util.Properties.isWin then basicTests
-      else compileDir("tests/run-custom-args/tasty-interpreter", withTastyInspectorOptions) :: basicTests
+      else compileDir("tests/old-tasty-interpreter-prototype", withTastyInspectorOptions) :: basicTests
 
     aggregateTests(tests: _*).checkRuns()
   }
diff --git a/tests/pos-macros/i9570.scala b/tests/neg-macros/i9570.scala
similarity index 95%
rename from tests/pos-macros/i9570.scala
rename to tests/neg-macros/i9570.scala
index 295969813df6..977cea3bf147 100644
--- a/tests/pos-macros/i9570.scala
+++ b/tests/neg-macros/i9570.scala
@@ -1,3 +1,5 @@
+// scalac: -Xfatal-warnings
+
 import scala.quoted.*
 
 object Macros {
diff --git a/tests/pos-macros/macro-deprecation.scala b/tests/neg-macros/macro-deprecation.scala
similarity index 70%
rename from tests/pos-macros/macro-deprecation.scala
rename to tests/neg-macros/macro-deprecation.scala
index ff14f96ac7fa..ab27f935649a 100644
--- a/tests/pos-macros/macro-deprecation.scala
+++ b/tests/neg-macros/macro-deprecation.scala
@@ -1,3 +1,5 @@
+// scalac: -Xfatal-warnings -deprecation
+
 import scala.quoted.*
 
 inline def f = ${ impl } // error
diff --git a/tests/pos-macros/macro-experimental.scala b/tests/neg-macros/macro-experimental.scala
similarity index 82%
rename from tests/pos-macros/macro-experimental.scala
rename to tests/neg-macros/macro-experimental.scala
index dc011f4e45b9..ce1f768c8629 100644
--- a/tests/pos-macros/macro-experimental.scala
+++ b/tests/neg-macros/macro-experimental.scala
@@ -1,3 +1,5 @@
+// scalac: -Yno-experimental
+
 import scala.quoted.*
 import scala.annotation.experimental
 
diff --git a/tests/neg-inlines-strict/i9685bis.check b/tests/neg/i9685bis.check
similarity index 61%
rename from tests/neg-inlines-strict/i9685bis.check
rename to tests/neg/i9685bis.check
index a0cc8d3225c1..1cc81df9987c 100644
--- a/tests/neg-inlines-strict/i9685bis.check
+++ b/tests/neg/i9685bis.check
@@ -1,5 +1,5 @@
--- [E008] Not Found Error: tests/neg-inlines-strict/i9685bis.scala:23:4 ------------------------------------------------
-23 |  1.asdf // error
+-- [E008] Not Found Error: tests/neg/i9685bis.scala:25:4 ---------------------------------------------------------------
+25 |  1.asdf // error
    |  ^^^^^^
    |  value asdf is not a member of Int, but could be made available as an extension method.
    |
diff --git a/tests/neg-inlines-strict/i9685bis.scala b/tests/neg/i9685bis.scala
similarity index 92%
rename from tests/neg-inlines-strict/i9685bis.scala
rename to tests/neg/i9685bis.scala
index 0023d4d719b4..7f95e4fe3ff7 100644
--- a/tests/neg-inlines-strict/i9685bis.scala
+++ b/tests/neg/i9685bis.scala
@@ -1,3 +1,5 @@
+// scalac: -source future
+
 package foo
 
 import scala.language.implicitConversions
diff --git a/tests/run-custom-args/tasty-interpreter/InterpretedMain.scala b/tests/old-tasty-interpreter-prototype/InterpretedMain.scala
similarity index 100%
rename from tests/run-custom-args/tasty-interpreter/InterpretedMain.scala
rename to tests/old-tasty-interpreter-prototype/InterpretedMain.scala
diff --git a/tests/run-custom-args/tasty-interpreter/Precompiled.scala b/tests/old-tasty-interpreter-prototype/Precompiled.scala
similarity index 100%
rename from tests/run-custom-args/tasty-interpreter/Precompiled.scala
rename to tests/old-tasty-interpreter-prototype/Precompiled.scala
diff --git a/tests/run-custom-args/tasty-interpreter/Test.scala b/tests/old-tasty-interpreter-prototype/Test.scala
similarity index 100%
rename from tests/run-custom-args/tasty-interpreter/Test.scala
rename to tests/old-tasty-interpreter-prototype/Test.scala
diff --git a/tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala b/tests/old-tasty-interpreter-prototype/interpreter/TastyInterpreter.scala
similarity index 100%
rename from tests/run-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala
rename to tests/old-tasty-interpreter-prototype/interpreter/TastyInterpreter.scala
diff --git a/tests/run-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala b/tests/old-tasty-interpreter-prototype/interpreter/TreeInterpreter.scala
similarity index 100%
rename from tests/run-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala
rename to tests/old-tasty-interpreter-prototype/interpreter/TreeInterpreter.scala
diff --git a/tests/run-custom-args/tasty-interpreter/interpreter/jvm/Interpreter.scala b/tests/old-tasty-interpreter-prototype/interpreter/jvm/Interpreter.scala
similarity index 100%
rename from tests/run-custom-args/tasty-interpreter/interpreter/jvm/Interpreter.scala
rename to tests/old-tasty-interpreter-prototype/interpreter/jvm/Interpreter.scala
diff --git a/tests/run-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala b/tests/old-tasty-interpreter-prototype/interpreter/jvm/JVMReflection.scala
similarity index 100%
rename from tests/run-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala
rename to tests/old-tasty-interpreter-prototype/interpreter/jvm/JVMReflection.scala
diff --git a/tests/run-custom-args/tasty-interpreter/notes.md b/tests/old-tasty-interpreter-prototype/notes.md
similarity index 100%
rename from tests/run-custom-args/tasty-interpreter/notes.md
rename to tests/old-tasty-interpreter-prototype/notes.md
diff --git a/tests/pos-custom-args/i13405/Test.scala b/tests/pos-custom-args/i13405/Test.scala
deleted file mode 100644
index 385f4453adeb..000000000000
--- a/tests/pos-custom-args/i13405/Test.scala
+++ /dev/null
@@ -1 +0,0 @@
-@main def main: Unit = hh()
diff --git a/tests/pos-special/i11331.1/Macro_1.scala b/tests/pos-macros/i11331a/Macro_1.scala
similarity index 100%
rename from tests/pos-special/i11331.1/Macro_1.scala
rename to tests/pos-macros/i11331a/Macro_1.scala
diff --git a/tests/pos-special/i11331.1/Test_2.scala b/tests/pos-macros/i11331a/Test_2.scala
similarity index 100%
rename from tests/pos-special/i11331.1/Test_2.scala
rename to tests/pos-macros/i11331a/Test_2.scala
diff --git a/tests/pos-custom-args/i13405/Macro.scala b/tests/pos-macros/i13405/Macro.scala
similarity index 100%
rename from tests/pos-custom-args/i13405/Macro.scala
rename to tests/pos-macros/i13405/Macro.scala
diff --git a/tests/pos-macros/i13405/Test.scala b/tests/pos-macros/i13405/Test.scala
new file mode 100644
index 000000000000..d8e048ac1331
--- /dev/null
+++ b/tests/pos-macros/i13405/Test.scala
@@ -0,0 +1,3 @@
+// scalac: -Xfatal-warnings
+
+@main def main: Unit = hh()
diff --git a/tests/pos-special/i7592/Macros_1.scala b/tests/pos-macros/i7592/Macros_1.scala
similarity index 100%
rename from tests/pos-special/i7592/Macros_1.scala
rename to tests/pos-macros/i7592/Macros_1.scala
diff --git a/tests/pos-special/i7592/Test_2.scala b/tests/pos-macros/i7592/Test_2.scala
similarity index 72%
rename from tests/pos-special/i7592/Test_2.scala
rename to tests/pos-macros/i7592/Test_2.scala
index 37ee3a1de243..c7c4c09b2180 100644
--- a/tests/pos-special/i7592/Test_2.scala
+++ b/tests/pos-macros/i7592/Test_2.scala
@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 def return1 = 1
 
 def testReturn1 = {
diff --git a/tests/pos-custom-args/semanticdb/inline-unapply/App_2.scala b/tests/pos-macros/semanticdb-inline-unapply/App_2.scala
similarity index 87%
rename from tests/pos-custom-args/semanticdb/inline-unapply/App_2.scala
rename to tests/pos-macros/semanticdb-inline-unapply/App_2.scala
index 3d0d6b665128..114cfd2240b5 100644
--- a/tests/pos-custom-args/semanticdb/inline-unapply/App_2.scala
+++ b/tests/pos-macros/semanticdb-inline-unapply/App_2.scala
@@ -1,3 +1,4 @@
+// scalac: -Xsemanticdb
 
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/pos-custom-args/semanticdb/inline-unapply/Macro_1.scala b/tests/pos-macros/semanticdb-inline-unapply/Macro_1.scala
similarity index 89%
rename from tests/pos-custom-args/semanticdb/inline-unapply/Macro_1.scala
rename to tests/pos-macros/semanticdb-inline-unapply/Macro_1.scala
index 0c15284141cb..14d176430d69 100644
--- a/tests/pos-custom-args/semanticdb/inline-unapply/Macro_1.scala
+++ b/tests/pos-macros/semanticdb-inline-unapply/Macro_1.scala
@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import scala.quoted.*
 
 object Succ:
diff --git a/tests/pos-custom-args/semanticdb/macro-pos/example_1.scala b/tests/pos-macros/semanticdb-macro-pos/example_1.scala
similarity index 77%
rename from tests/pos-custom-args/semanticdb/macro-pos/example_1.scala
rename to tests/pos-macros/semanticdb-macro-pos/example_1.scala
index 08e57680c74d..421553b134fe 100644
--- a/tests/pos-custom-args/semanticdb/macro-pos/example_1.scala
+++ b/tests/pos-macros/semanticdb-macro-pos/example_1.scala
@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import quoted.*
 
 object CodeImpl {
diff --git a/tests/pos-custom-args/semanticdb/macro-pos/example_2.scala b/tests/pos-macros/semanticdb-macro-pos/example_2.scala
similarity index 95%
rename from tests/pos-custom-args/semanticdb/macro-pos/example_2.scala
rename to tests/pos-macros/semanticdb-macro-pos/example_2.scala
index 0e11dae6718d..a652346c5e14 100644
--- a/tests/pos-custom-args/semanticdb/macro-pos/example_2.scala
+++ b/tests/pos-macros/semanticdb-macro-pos/example_2.scala
@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import quoted.*
 
 object TestImpl {
diff --git a/tests/pos-custom-args/semanticdb/macro-pos/example_3.scala b/tests/pos-macros/semanticdb-macro-pos/example_3.scala
similarity index 65%
rename from tests/pos-custom-args/semanticdb/macro-pos/example_3.scala
rename to tests/pos-macros/semanticdb-macro-pos/example_3.scala
index 2c2223b59860..bd4dbdee3621 100644
--- a/tests/pos-custom-args/semanticdb/macro-pos/example_3.scala
+++ b/tests/pos-macros/semanticdb-macro-pos/example_3.scala
@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 object Test {
 
   def test = TestImpl.fun("")
diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv.check b/tests/run-macros/Xmacro-settings-compileTimeEnv.check
similarity index 100%
rename from tests/run-custom-args/Xmacro-settings/compileTimeEnv.check
rename to tests/run-macros/Xmacro-settings-compileTimeEnv.check
diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala b/tests/run-macros/Xmacro-settings-compileTimeEnv/Logging.scala
similarity index 100%
rename from tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala
rename to tests/run-macros/Xmacro-settings-compileTimeEnv/Logging.scala
diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala b/tests/run-macros/Xmacro-settings-compileTimeEnv/MacroEnv.scala
similarity index 100%
rename from tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala
rename to tests/run-macros/Xmacro-settings-compileTimeEnv/MacroEnv.scala
diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala b/tests/run-macros/Xmacro-settings-compileTimeEnv/Test.scala
similarity index 77%
rename from tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala
rename to tests/run-macros/Xmacro-settings-compileTimeEnv/Test.scala
index 7cd9b03b7bb6..fb417e8dcb9e 100644
--- a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala
+++ b/tests/run-macros/Xmacro-settings-compileTimeEnv/Test.scala
@@ -1,3 +1,5 @@
+// scalac: -Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO
+
 import scala.compiletime.*
 
 object Test {
@@ -16,10 +18,10 @@ object Test {
   }
 
   def runBasic(): Unit = {
-    printEnv("a")    
-    printEnv("b")    
-    printEnv("c.b.a")    
-    printEnv("wat")    
+    printEnv("a")
+    printEnv("b")
+    printEnv("c.b.a")
+    printEnv("wat")
   }
 
   inline def printEnv(inline k: String): Unit =
diff --git a/tests/run-custom-args/Xmacro-settings/simple/M1.scala b/tests/run-macros/Xmacro-settings-simple/M1.scala
similarity index 100%
rename from tests/run-custom-args/Xmacro-settings/simple/M1.scala
rename to tests/run-macros/Xmacro-settings-simple/M1.scala
diff --git a/tests/run-custom-args/Xmacro-settings/simple/Test.scala b/tests/run-macros/Xmacro-settings-simple/Test.scala
similarity index 81%
rename from tests/run-custom-args/Xmacro-settings/simple/Test.scala
rename to tests/run-macros/Xmacro-settings-simple/Test.scala
index 97587362c835..7ebb5bca1429 100644
--- a/tests/run-custom-args/Xmacro-settings/simple/Test.scala
+++ b/tests/run-macros/Xmacro-settings-simple/Test.scala
@@ -1,3 +1,5 @@
+// scalac: -Xmacro-settings:one,two,three
+
 import x.*
 
 object Test {
diff --git a/tests/run-custom-args/Yread-comments/i12351/GetDocString_1.scala b/tests/run-macros/i12351/GetDocString_1.scala
similarity index 100%
rename from tests/run-custom-args/Yread-comments/i12351/GetDocString_1.scala
rename to tests/run-macros/i12351/GetDocString_1.scala
diff --git a/tests/run-custom-args/Yread-comments/i12351/Test_2.scala b/tests/run-macros/i12351/Test_2.scala
similarity index 80%
rename from tests/run-custom-args/Yread-comments/i12351/Test_2.scala
rename to tests/run-macros/i12351/Test_2.scala
index 5afd97061411..3007a5d652e0 100644
--- a/tests/run-custom-args/Yread-comments/i12351/Test_2.scala
+++ b/tests/run-macros/i12351/Test_2.scala
@@ -1,3 +1,5 @@
+// scalac: -Yread-docs
+
 @main def Test(): Unit = {
     println(getDocString[Data])
     assert(getDocString[Data].nonEmpty)
diff --git a/tests/run-custom-args/Yread-comments/i12352/Macro.scala b/tests/run-macros/i12352/Macro.scala
similarity index 100%
rename from tests/run-custom-args/Yread-comments/i12352/Macro.scala
rename to tests/run-macros/i12352/Macro.scala
diff --git a/tests/run-custom-args/Yread-comments/i12352/Main.scala b/tests/run-macros/i12352/Main.scala
similarity index 83%
rename from tests/run-custom-args/Yread-comments/i12352/Main.scala
rename to tests/run-macros/i12352/Main.scala
index 78d0906652b2..94d5453d0b57 100644
--- a/tests/run-custom-args/Yread-comments/i12352/Main.scala
+++ b/tests/run-macros/i12352/Main.scala
@@ -1,3 +1,5 @@
+// scalac: -Yread-docs
+
 @main def Test(): Unit = {
     val res = getDocString[scala.quoted.Quotes]
     println(res)
diff --git a/tests/run-custom-args/run-macros-erased/i17105.check b/tests/run-macros/i17105b.check
similarity index 100%
rename from tests/run-custom-args/run-macros-erased/i17105.check
rename to tests/run-macros/i17105b.check
diff --git a/tests/run-custom-args/run-macros-erased/i17105/Macro_1.scala b/tests/run-macros/i17105b/Macro_1.scala
similarity index 95%
rename from tests/run-custom-args/run-macros-erased/i17105/Macro_1.scala
rename to tests/run-macros/i17105b/Macro_1.scala
index 37a48a0ececd..5456470cc3d8 100644
--- a/tests/run-custom-args/run-macros-erased/i17105/Macro_1.scala
+++ b/tests/run-macros/i17105b/Macro_1.scala
@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 import scala.quoted.*
 
 inline def testExpr(inline body: Any) = ${ testExprImpl('body) }
diff --git a/tests/run-custom-args/run-macros-erased/i17105/Test_2.scala b/tests/run-macros/i17105b/Test_2.scala
similarity index 89%
rename from tests/run-custom-args/run-macros-erased/i17105/Test_2.scala
rename to tests/run-macros/i17105b/Test_2.scala
index bfb6967e1e00..46781b558dd4 100644
--- a/tests/run-custom-args/run-macros-erased/i17105/Test_2.scala
+++ b/tests/run-macros/i17105b/Test_2.scala
@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 @main def Test: Unit =
   println("case erased: " + testExpr { def erasedfn1(erased x: String) = "placeholder"; erasedfn1("arg1")})
   println("case erased nested: " + testExpr {
diff --git a/tests/run-custom-args/run-macros-erased/macro-erased/1.scala b/tests/run-macros/macro-erased/Macro_1.scala
similarity index 95%
rename from tests/run-custom-args/run-macros-erased/macro-erased/1.scala
rename to tests/run-macros/macro-erased/Macro_1.scala
index 36f583a7dc91..2e863f24650b 100644
--- a/tests/run-custom-args/run-macros-erased/macro-erased/1.scala
+++ b/tests/run-macros/macro-erased/Macro_1.scala
@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 import scala.quoted.*
 
 object Macro {
diff --git a/tests/run-custom-args/run-macros-erased/macro-erased/2.scala b/tests/run-macros/macro-erased/Test_2.scala
similarity index 100%
rename from tests/run-custom-args/run-macros-erased/macro-erased/2.scala
rename to tests/run-macros/macro-erased/Test_2.scala
diff --git a/tests/run-custom-args/run-macros-erased/reflect-isFunctionType/macro_1.scala b/tests/run-macros/reflect-isFunctionType/macro_1.scala
similarity index 100%
rename from tests/run-custom-args/run-macros-erased/reflect-isFunctionType/macro_1.scala
rename to tests/run-macros/reflect-isFunctionType/macro_1.scala
diff --git a/tests/run-custom-args/run-macros-erased/reflect-isFunctionType/test_2.scala b/tests/run-macros/reflect-isFunctionType/test_2.scala
similarity index 98%
rename from tests/run-custom-args/run-macros-erased/reflect-isFunctionType/test_2.scala
rename to tests/run-macros/reflect-isFunctionType/test_2.scala
index 647711ba7ed9..c5cc5fa23ff1 100644
--- a/tests/run-custom-args/run-macros-erased/reflect-isFunctionType/test_2.scala
+++ b/tests/run-macros/reflect-isFunctionType/test_2.scala
@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 trait Box {
   type T
 }
diff --git a/tests/run-macros/tasty-definitions-1/quoted_2.scala b/tests/run-macros/tasty-definitions-1/quoted_2.scala
index c3824598782c..43a2ecb14ee3 100644
--- a/tests/run-macros/tasty-definitions-1/quoted_2.scala
+++ b/tests/run-macros/tasty-definitions-1/quoted_2.scala
@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2.check b/tests/run-macros/tasty-definitions-2.check
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-definitions-2.check
rename to tests/run-macros/tasty-definitions-2.check
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala b/tests/run-macros/tasty-definitions-2/Macro_1.scala
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala
rename to tests/run-macros/tasty-definitions-2/Macro_1.scala
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Test_2.scala b/tests/run-macros/tasty-definitions-2/Test_2.scala
similarity index 88%
rename from tests/run-custom-args/Yretain-trees/tasty-definitions-2/Test_2.scala
rename to tests/run-macros/tasty-definitions-2/Test_2.scala
index 6bb234543066..a7146b0cc6ca 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Test_2.scala
+++ b/tests/run-macros/tasty-definitions-2/Test_2.scala
@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 object Test {
   def main(args: Array[String]): Unit = {
     println(Foo.inspectBody(Foo.foo))
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3.check b/tests/run-macros/tasty-definitions-3.check
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-definitions-3.check
rename to tests/run-macros/tasty-definitions-3.check
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala b/tests/run-macros/tasty-definitions-3/Macro_1.scala
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala
rename to tests/run-macros/tasty-definitions-3/Macro_1.scala
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Test_2.scala b/tests/run-macros/tasty-definitions-3/Test_2.scala
similarity index 90%
rename from tests/run-custom-args/Yretain-trees/tasty-definitions-3/Test_2.scala
rename to tests/run-macros/tasty-definitions-3/Test_2.scala
index 3663f00a8198..ec01ccb622a1 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Test_2.scala
+++ b/tests/run-macros/tasty-definitions-3/Test_2.scala
@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 object Test {
 
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners.check b/tests/run-macros/tasty-extractors-owners.check
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-extractors-owners.check
rename to tests/run-macros/tasty-extractors-owners.check
diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala b/tests/run-macros/tasty-extractors-owners/quoted_1.scala
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala
rename to tests/run-macros/tasty-extractors-owners/quoted_1.scala
diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_2.scala b/tests/run-macros/tasty-extractors-owners/quoted_2.scala
similarity index 92%
rename from tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_2.scala
rename to tests/run-macros/tasty-extractors-owners/quoted_2.scala
index 5b793c829269..15eac0a8a2c5 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_2.scala
+++ b/tests/run-macros/tasty-extractors-owners/quoted_2.scala
@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 import Macros.*
 
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1.check b/tests/run-macros/tasty-load-tree-1.check
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-load-tree-1.check
rename to tests/run-macros/tasty-load-tree-1.check
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala b/tests/run-macros/tasty-load-tree-1/quoted_1.scala
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala
rename to tests/run-macros/tasty-load-tree-1/quoted_1.scala
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_2.scala b/tests/run-macros/tasty-load-tree-1/quoted_2.scala
similarity index 84%
rename from tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_2.scala
rename to tests/run-macros/tasty-load-tree-1/quoted_2.scala
index 2aa76a7f2822..d30fc7c83531 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_2.scala
+++ b/tests/run-macros/tasty-load-tree-1/quoted_2.scala
@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2.check b/tests/run-macros/tasty-load-tree-2.check
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-load-tree-2.check
rename to tests/run-macros/tasty-load-tree-2.check
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala b/tests/run-macros/tasty-load-tree-2/quoted_1.scala
similarity index 100%
rename from tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala
rename to tests/run-macros/tasty-load-tree-2/quoted_1.scala
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_2.scala b/tests/run-macros/tasty-load-tree-2/quoted_2.scala
similarity index 87%
rename from tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_2.scala
rename to tests/run-macros/tasty-load-tree-2/quoted_2.scala
index 2cffe72c5a74..1a5a1674fc13 100644
--- a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_2.scala
+++ b/tests/run-macros/tasty-load-tree-2/quoted_2.scala
@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-custom-args/tasty-inspector/i10359.scala b/tests/run-tasty-inspector/i10359.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i10359.scala
rename to tests/run-tasty-inspector/i10359.scala
diff --git a/tests/run-custom-args/tasty-inspector/i13352.scala b/tests/run-tasty-inspector/i13352.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i13352.scala
rename to tests/run-tasty-inspector/i13352.scala
diff --git a/tests/run-custom-args/tasty-inspector/i14027.scala b/tests/run-tasty-inspector/i14027.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i14027.scala
rename to tests/run-tasty-inspector/i14027.scala
diff --git a/tests/run-custom-args/tasty-inspector/i14785.scala b/tests/run-tasty-inspector/i14785.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i14785.scala
rename to tests/run-tasty-inspector/i14785.scala
diff --git a/tests/run-custom-args/tasty-inspector/i14788.scala b/tests/run-tasty-inspector/i14788.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i14788.scala
rename to tests/run-tasty-inspector/i14788.scala
diff --git a/tests/run-custom-args/tasty-inspector/i14789.scala b/tests/run-tasty-inspector/i14789.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i14789.scala
rename to tests/run-tasty-inspector/i14789.scala
diff --git a/tests/run-custom-args/tasty-inspector/i8163.scala b/tests/run-tasty-inspector/i8163.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i8163.scala
rename to tests/run-tasty-inspector/i8163.scala
diff --git a/tests/run-custom-args/tasty-inspector/i8364.scala b/tests/run-tasty-inspector/i8364.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i8364.scala
rename to tests/run-tasty-inspector/i8364.scala
diff --git a/tests/run-custom-args/tasty-inspector/i8389.scala b/tests/run-tasty-inspector/i8389.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i8389.scala
rename to tests/run-tasty-inspector/i8389.scala
diff --git a/tests/run-custom-args/tasty-inspector/i8460.scala b/tests/run-tasty-inspector/i8460.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i8460.scala
rename to tests/run-tasty-inspector/i8460.scala
diff --git a/tests/run-custom-args/tasty-inspector/i9970.scala b/tests/run-tasty-inspector/i9970.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/i9970.scala
rename to tests/run-tasty-inspector/i9970.scala
diff --git a/tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala b/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
similarity index 94%
rename from tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala
rename to tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
index 5b16f09069a3..e63393d49e67 100644
--- a/tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala
+++ b/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
@@ -126,9 +126,9 @@ val experimentalDefinitionInLibrary = Set(
          |Found @experimental definition in library not listed:
          |${missingFromList.toSeq.sorted.mkString("\n")}
          |
-         |If added new experimental definitions to the library, add them to the list in tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala
+         |If added new experimental definitions to the library, add them to the list in tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
          |
-         |Test only: sbt "scala3-bootstrapped/testCompilation tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala"
+         |Test only: sbt "scala3-bootstrapped/testCompilation tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala"
          |""".stripMargin
       )
       assert(missingInLibrary.isEmpty,
@@ -137,9 +137,9 @@ val experimentalDefinitionInLibrary = Set(
           |Listed @experimental definition was not found in the library
           |${missingInLibrary.toSeq.sorted.mkString("\n")}
           |
-          |If experimental definition was removed or stabilized, remove from the list in tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala
+          |If experimental definition was removed or stabilized, remove from the list in tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
           |
-          |Test only: sbt "scala3-bootstrapped/testCompilation tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala"
+          |Test only: sbt "scala3-bootstrapped/testCompilation tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala"
           |""".stripMargin
         )
     }
diff --git a/tests/run-custom-args/tasty-inspector/tasty-documentation-inspector/Foo.scala b/tests/run-tasty-inspector/tasty-documentation-inspector/Foo.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/tasty-documentation-inspector/Foo.scala
rename to tests/run-tasty-inspector/tasty-documentation-inspector/Foo.scala
diff --git a/tests/run-custom-args/tasty-inspector/tasty-documentation-inspector/Test.scala b/tests/run-tasty-inspector/tasty-documentation-inspector/Test.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/tasty-documentation-inspector/Test.scala
rename to tests/run-tasty-inspector/tasty-documentation-inspector/Test.scala
diff --git a/tests/run-custom-args/tasty-inspector/tasty-inspector/Foo.scala b/tests/run-tasty-inspector/tasty-inspector/Foo.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/tasty-inspector/Foo.scala
rename to tests/run-tasty-inspector/tasty-inspector/Foo.scala
diff --git a/tests/run-custom-args/tasty-inspector/tasty-inspector/Test.scala b/tests/run-tasty-inspector/tasty-inspector/Test.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/tasty-inspector/Test.scala
rename to tests/run-tasty-inspector/tasty-inspector/Test.scala
diff --git a/tests/run-custom-args/tasty-inspector/tastyPaths.check b/tests/run-tasty-inspector/tastyPaths.check
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/tastyPaths.check
rename to tests/run-tasty-inspector/tastyPaths.check
diff --git a/tests/run-custom-args/tasty-inspector/tastyPaths.scala b/tests/run-tasty-inspector/tastyPaths.scala
similarity index 100%
rename from tests/run-custom-args/tasty-inspector/tastyPaths.scala
rename to tests/run-tasty-inspector/tastyPaths.scala