diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
index 5fa56395bdcc..e3adbb68472c 100644
--- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
+++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
@@ -237,8 +237,6 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
     api.ClassLikeDef.of(name, acc, modifiers, anns, tparams, defType)
   }
 
-  private[this] val LegacyAppClass = ctx.requiredClass("dotty.runtime.LegacyApp")
-
   def apiClassStructure(csym: ClassSymbol): api.Structure = {
     val cinfo = csym.classInfo
 
@@ -274,9 +272,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
     // TODO: We shouldn't have to compute inherited members. Instead, `Structure`
     // should have a lazy `parentStructures` field.
     val inherited = cinfo.baseClasses
-      // We cannot filter out `LegacyApp` because it contains the main method,
-      // see the comment about main class discovery in `computeType`.
-      .filter(bc => !bc.is(Scala2x) || bc.eq(LegacyAppClass))
+      .filter(bc => !bc.is(Scala2x))
       .flatMap(_.classInfo.decls.filter(s => !(s.is(Private) || declSet.contains(s))))
     // Inherited members need to be computed lazily because a class might contain
     // itself as an inherited member, like in `class A { class B extends A }`,
diff --git a/library/src/dotty/runtime/LegacyApp.scala b/library/src/dotty/runtime/LegacyApp.scala
deleted file mode 100644
index 1eae4c2be0c2..000000000000
--- a/library/src/dotty/runtime/LegacyApp.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package dotty.runtime
-
-/** Replaces the `scala.App` class which relies on `DelayedInit` functionality,
-  * not supported by Dotty.
-  */
-class LegacyApp {
-  def main(args: Array[String]): Unit = ()
-}
diff --git a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala
index 03d8769fda9c..7cbd62e1d74b 100644
--- a/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala
+++ b/sbt-dotty/sbt-test/source-dependencies/backtick-quoted-names/B.scala
@@ -1,3 +1,3 @@
-object B extends dotty.runtime.LegacyApp {
+object B extends App {
    println(A.`=`)
 }
diff --git a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala
index 23e0805a047b..f393ca20d2d8 100644
--- a/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala
+++ b/sbt-dotty/sbt-test/source-dependencies/less-inter-inv/E.scala
@@ -1,3 +1,3 @@
-object E extends dotty.runtime.LegacyApp {
+object E extends App {
 	assert(D.x == "3")
 }
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala
index 1fed7a1208ce..c656b25a4164 100644
--- a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala
+++ b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C0.scala
@@ -1,3 +1,3 @@
-object C extends dotty.runtime.LegacyApp {
+object C extends App {
   println(new B().foo(null))
 }
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala
index f10fe2d160c2..ad8384312746 100644
--- a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala
+++ b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C1.scala
@@ -1,3 +1,3 @@
-object C extends dotty.runtime.LegacyApp {
+object C extends App {
   println(new B().bar.x)
 }
diff --git a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala
index a0c5c6972820..17b70f957bd1 100644
--- a/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala
+++ b/sbt-dotty/sbt-test/source-dependencies/value-class/changes/C2.scala
@@ -1,3 +1,3 @@
-object C extends dotty.runtime.LegacyApp {
+object C extends App {
   println(new B().bar("")("").x)
 }
diff --git a/tests/disabled/existential/run/names-defaults.scala b/tests/disabled/existential/run/names-defaults.scala
index 629c3acfa8f0..1a525f923c0a 100644
--- a/tests/disabled/existential/run/names-defaults.scala
+++ b/tests/disabled/existential/run/names-defaults.scala
@@ -1,7 +1,7 @@
 
 import scala.language.{ higherKinds, existentials }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def get[T](x: T) = { println("get: "+ x); x }
 
   // TESTS
diff --git a/tests/disabled/existential/run/t0412.scala b/tests/disabled/existential/run/t0412.scala
index ffd4f56bf9b9..873fbb1eb481 100644
--- a/tests/disabled/existential/run/t0412.scala
+++ b/tests/disabled/existential/run/t0412.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classOf[java.util.ArrayList[_]])
   println(classOf[java.util.ArrayList[T] forSome { type T }])
 }
diff --git a/tests/disabled/existential/run/t0528.scala b/tests/disabled/existential/run/t0528.scala
index ab0eea55d3ec..53136178a62b 100644
--- a/tests/disabled/existential/run/t0528.scala
+++ b/tests/disabled/existential/run/t0528.scala
@@ -9,7 +9,7 @@ class RichStr extends Sequ[Char] {
   def toArray: Array[Char] = Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9')
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x: RichStr = new RichStr
 
   println((x: Sequ[Char]).toArray.deep) // calling through the bridge misses unboxing
diff --git a/tests/disabled/existential/run/t6443.scala b/tests/disabled/existential/run/t6443.scala
index 9cc8c29ff4df..d3eb9bb0d88f 100644
--- a/tests/disabled/existential/run/t6443.scala
+++ b/tests/disabled/existential/run/t6443.scala
@@ -12,6 +12,6 @@ object B extends A {
   def foo(d: String)(d2: d.type): D forSome { type D <: Derived; type S <: Derived } = {d2.isEmpty; null} // Bridge method required here!
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   B.bar
 }
diff --git a/tests/disabled/long-running/t6253a.scala b/tests/disabled/long-running/t6253a.scala
index c2db1f5afed6..f3573347c17b 100644
--- a/tests/disabled/long-running/t6253a.scala
+++ b/tests/disabled/long-running/t6253a.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.HashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   var hashCount = 0
 
diff --git a/tests/disabled/long-running/t6253b.scala b/tests/disabled/long-running/t6253b.scala
index c049aea7f6a2..b0ce8a7362f0 100644
--- a/tests/disabled/long-running/t6253b.scala
+++ b/tests/disabled/long-running/t6253b.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.HashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   var hashCount = 0
 
diff --git a/tests/disabled/long-running/t6253c.scala b/tests/disabled/long-running/t6253c.scala
index 39c3a5b17f0a..dcaa8ae3ed62 100644
--- a/tests/disabled/long-running/t6253c.scala
+++ b/tests/disabled/long-running/t6253c.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.HashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   var hashCount = 0
 
diff --git a/tests/disabled/macro/run/exprs_serialize.scala b/tests/disabled/macro/run/exprs_serialize.scala
index 85cf55e1cb16..91027803b464 100644
--- a/tests/disabled/macro/run/exprs_serialize.scala
+++ b/tests/disabled/macro/run/exprs_serialize.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(expr: Expr[_]) =
     try {
       val fout = new ByteArrayOutputStream()
diff --git a/tests/disabled/macro/run/freetypes_false_alarm1.scala b/tests/disabled/macro/run/freetypes_false_alarm1.scala
index b06e10efe6af..e9396f3f0d7b 100644
--- a/tests/disabled/macro/run/freetypes_false_alarm1.scala
+++ b/tests/disabled/macro/run/freetypes_false_alarm1.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val ru = scala.reflect.runtime.universe
     val tpe: ru.Type = ru.typeOf[List[Int]]
diff --git a/tests/disabled/macro/run/idempotency-case-classes.scala b/tests/disabled/macro/run/idempotency-case-classes.scala
index 8c2aa70dc845..b4938c489570 100644
--- a/tests/disabled/macro/run/idempotency-case-classes.scala
+++ b/tests/disabled/macro/run/idempotency-case-classes.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val casee = reify {
     case class C(x: Int, y: Int)
     println(C(2, 3))
diff --git a/tests/disabled/macro/run/idempotency-extractors.scala b/tests/disabled/macro/run/idempotency-extractors.scala
index f5d6cd193fdd..3e5782c8aad5 100644
--- a/tests/disabled/macro/run/idempotency-extractors.scala
+++ b/tests/disabled/macro/run/idempotency-extractors.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object Extractor { def unapply(x: Int): Option[Int] = Some(x) }
   val extractor = reify {
     2 match { case Extractor(x) => x }
diff --git a/tests/disabled/macro/run/idempotency-labels.scala b/tests/disabled/macro/run/idempotency-labels.scala
index 1260633845a1..85c5b61110fe 100644
--- a/tests/disabled/macro/run/idempotency-labels.scala
+++ b/tests/disabled/macro/run/idempotency-labels.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val label = reify {
     var x = 0
     while (x < 2) { x += 1 }
diff --git a/tests/disabled/macro/run/idempotency-lazy-vals.scala b/tests/disabled/macro/run/idempotency-lazy-vals.scala
index cb757f1ab31e..c440c2189eff 100644
--- a/tests/disabled/macro/run/idempotency-lazy-vals.scala
+++ b/tests/disabled/macro/run/idempotency-lazy-vals.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val lazee = reify {
     class C {
       lazy val x = 2
diff --git a/tests/disabled/macro/run/idempotency-this.scala b/tests/disabled/macro/run/idempotency-this.scala
index 2e2f7cf668f9..1bd71d847d3c 100644
--- a/tests/disabled/macro/run/idempotency-this.scala
+++ b/tests/disabled/macro/run/idempotency-this.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val thiss = reify {
     List[String]("")
   }
diff --git a/tests/disabled/macro/run/macro-abort-fresh/Test_2.scala b/tests/disabled/macro/run/macro-abort-fresh/Test_2.scala
index dea6e6d62268..61f0bdfadcd3 100644
--- a/tests/disabled/macro/run/macro-abort-fresh/Test_2.scala
+++ b/tests/disabled/macro/run/macro-abort-fresh/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-auto-duplicate/Test_2.scala b/tests/disabled/macro/run/macro-auto-duplicate/Test_2.scala
index eed62a0fe2ad..f697da60200f 100644
--- a/tests/disabled/macro/run/macro-auto-duplicate/Test_2.scala
+++ b/tests/disabled/macro/run/macro-auto-duplicate/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-basic-ma-md-mi/Test_3.scala b/tests/disabled/macro/run/macro-basic-ma-md-mi/Test_3.scala
index 9c45f59d7840..e9a10e20c99b 100644
--- a/tests/disabled/macro/run/macro-basic-ma-md-mi/Test_3.scala
+++ b/tests/disabled/macro/run/macro-basic-ma-md-mi/Test_3.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros.Shmacros._
   println(foo(2) + Macros.bar(2) * new Macros().quux(4))
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-basic-ma-mdmi/Test_2.scala b/tests/disabled/macro/run/macro-basic-ma-mdmi/Test_2.scala
index 9c45f59d7840..e9a10e20c99b 100644
--- a/tests/disabled/macro/run/macro-basic-ma-mdmi/Test_2.scala
+++ b/tests/disabled/macro/run/macro-basic-ma-mdmi/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros.Shmacros._
   println(foo(2) + Macros.bar(2) * new Macros().quux(4))
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-basic-mamd-mi/Macros_Test_2.scala b/tests/disabled/macro/run/macro-basic-mamd-mi/Macros_Test_2.scala
index 9bfcbc4a79ca..d3746894f0b7 100644
--- a/tests/disabled/macro/run/macro-basic-mamd-mi/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-basic-mamd-mi/Macros_Test_2.scala
@@ -9,7 +9,7 @@ class Macros {
   def quux(x: Int): Int = macro Impls.quux
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros.Shmacros._
   println(foo(2) + Macros.bar(2) * new Macros().quux(4))
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-blackbox-materialization/Test_2.scala b/tests/disabled/macro/run/macro-blackbox-materialization/Test_2.scala
index 1f0413bdfab7..001ff9aea8f4 100644
--- a/tests/disabled/macro/run/macro-blackbox-materialization/Test_2.scala
+++ b/tests/disabled/macro/run/macro-blackbox-materialization/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[C[Int]])
   println(implicitly[C[String]])
   println(implicitly[C[Nothing]])
diff --git a/tests/disabled/macro/run/macro-bodyexpandstoimpl/Macros_Test_2.scala b/tests/disabled/macro/run/macro-bodyexpandstoimpl/Macros_Test_2.scala
index f0fe4a8e3277..486e1de090db 100644
--- a/tests/disabled/macro/run/macro-bodyexpandstoimpl/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-bodyexpandstoimpl/Macros_Test_2.scala
@@ -4,7 +4,7 @@ object Macros {
   def foo(x: Int): Int = macro Impls.refToFoo(42)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   println(foo(42))
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-bundle-context-alias/Test_2.scala b/tests/disabled/macro/run/macro-bundle-context-alias/Test_2.scala
index 6c70277ded0b..de499cc11170 100644
--- a/tests/disabled/macro/run/macro-bundle-context-alias/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-context-alias/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(new C().blackbox)
   println(new C().refinedBlackbox)
   println(new C().whitebox)
diff --git a/tests/disabled/macro/run/macro-bundle-context-refinement/Test_2.scala b/tests/disabled/macro/run/macro-bundle-context-refinement/Test_2.scala
index d631b8f7ec23..43d641adeb56 100644
--- a/tests/disabled/macro/run/macro-bundle-context-refinement/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-context-refinement/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(new C().blackbox)
   println(new C().whitebox)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-bundle-static/Test_2.scala b/tests/disabled/macro/run/macro-bundle-static/Test_2.scala
index cfc1e15631cd..e35260cdce69 100644
--- a/tests/disabled/macro/run/macro-bundle-static/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-static/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.mono)
   println(Macros.poly[Int])
   println(new Enclosing.Impl(???).weird)
diff --git a/tests/disabled/macro/run/macro-bundle-toplevel/Test_2.scala b/tests/disabled/macro/run/macro-bundle-toplevel/Test_2.scala
index 013baa34872f..195fb4926212 100644
--- a/tests/disabled/macro/run/macro-bundle-toplevel/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-toplevel/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.mono)
   println(Macros.poly[Int])
   println(new Impl(???).weird)
diff --git a/tests/disabled/macro/run/macro-bundle-whitebox-decl/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-decl/Test_2.scala
index 013baa34872f..195fb4926212 100644
--- a/tests/disabled/macro/run/macro-bundle-whitebox-decl/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-decl/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.mono)
   println(Macros.poly[Int])
   println(new Impl(???).weird)
diff --git a/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Test_2.scala
index b28ebfd710c0..3a8170025184 100644
--- a/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-use-raw/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(ReturnTypeRefinement.foo.x)
 
   case class Foo(i: Int, s: String, b: Boolean)
diff --git a/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Test_2.scala b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Test_2.scala
index b28ebfd710c0..3a8170025184 100644
--- a/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Test_2.scala
+++ b/tests/disabled/macro/run/macro-bundle-whitebox-use-refined/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(ReturnTypeRefinement.foo.x)
 
   case class Foo(i: Int, s: String, b: Boolean)
diff --git a/tests/disabled/macro/run/macro-def-path-dependent/Dummy.scala b/tests/disabled/macro/run/macro-def-path-dependent/Dummy.scala
index 2ccaa3940fd4..7dffc5107d93 100644
--- a/tests/disabled/macro/run/macro-def-path-dependent/Dummy.scala
+++ b/tests/disabled/macro/run/macro-def-path-dependent/Dummy.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println("it works")
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-default-params/Test_2.scala b/tests/disabled/macro/run/macro-default-params/Test_2.scala
index d75fbd0db39e..5d19639cddff 100644
--- a/tests/disabled/macro/run/macro-default-params/Test_2.scala
+++ b/tests/disabled/macro/run/macro-default-params/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
diff --git a/tests/disabled/macro/run/macro-divergence-spurious/Test_2.scala b/tests/disabled/macro/run/macro-divergence-spurious/Test_2.scala
index 0a98207016cc..dcc4593335cb 100644
--- a/tests/disabled/macro/run/macro-divergence-spurious/Test_2.scala
+++ b/tests/disabled/macro/run/macro-divergence-spurious/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[Complex[Foo]])
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-duplicate/Test_2.scala b/tests/disabled/macro/run/macro-duplicate/Test_2.scala
index 8706883b45dd..6dbd4382d362 100644
--- a/tests/disabled/macro/run/macro-duplicate/Test_2.scala
+++ b/tests/disabled/macro/run/macro-duplicate/Test_2.scala
@@ -1,6 +1,6 @@
 import scala.concurrent._
 import ExecutionContext.Implicits.global
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-enclosingowner-detectvar/Test_2.scala b/tests/disabled/macro/run/macro-enclosingowner-detectvar/Test_2.scala
index edc0eb6544d0..58521d94291d 100644
--- a/tests/disabled/macro/run/macro-enclosingowner-detectvar/Test_2.scala
+++ b/tests/disabled/macro/run/macro-enclosingowner-detectvar/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a1 = Macros.foo
   val a2 = Predef.identity(Predef.identity(Macros.foo))
   val a3: Int = Macros.foo
diff --git a/tests/disabled/macro/run/macro-enclosingowner-sbt/Test_2.scala b/tests/disabled/macro/run/macro-enclosingowner-sbt/Test_2.scala
index edc0eb6544d0..58521d94291d 100644
--- a/tests/disabled/macro/run/macro-enclosingowner-sbt/Test_2.scala
+++ b/tests/disabled/macro/run/macro-enclosingowner-sbt/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a1 = Macros.foo
   val a2 = Predef.identity(Predef.identity(Macros.foo))
   val a3: Int = Macros.foo
diff --git a/tests/disabled/macro/run/macro-enclosures/Test_2.scala b/tests/disabled/macro/run/macro-enclosures/Test_2.scala
index 8b8dc10cd2de..779fe5211ea3 100644
--- a/tests/disabled/macro/run/macro-enclosures/Test_2.scala
+++ b/tests/disabled/macro/run/macro-enclosures/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   test.Test.test
 }
 
diff --git a/tests/disabled/macro/run/macro-expand-implicit-argument/Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-argument/Test_2.scala
index edb1de4135af..ce8a068fb4b8 100644
--- a/tests/disabled/macro/run/macro-expand-implicit-argument/Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-argument/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   println(array(1, 2, 3).toList)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala
index 2f5648758e33..fec914632fe8 100644
--- a/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-has-implicit/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit val x = 42
   def foo(implicit x: Int): Unit = macro Impls.foo
   foo
diff --git a/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala
index 8f0fbe60e04c..22047eeb3670 100644
--- a/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-implicit/Macros_Test_2.scala
@@ -3,7 +3,7 @@ object Macros {
   implicit def foo(x: String): Option[Int] = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   println("2": Option[Int])
   val s: Int = "2" getOrElse 0
diff --git a/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala
index 3b851de05e60..2f21785bae59 100644
--- a/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-val/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit def foo: Int = macro Impls.foo
   def bar(implicit x: Int) = println(x)
   bar
diff --git a/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala
index c7b09435a2fe..0d99f32d7ed1 100644
--- a/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-implicit-macro-is-view/Macros_Test_2.scala
@@ -5,7 +5,7 @@ object Macros {
   implicit def foo(x: String): Option[Int] = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   def bar[T <% Option[Int]](x: T) = println(x)
   println("2")
diff --git a/tests/disabled/macro/run/macro-expand-multiple-arglists/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-multiple-arglists/Macros_Test_2.scala
index 09de5e02f9f9..54b959983bf3 100644
--- a/tests/disabled/macro/run/macro-expand-multiple-arglists/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-multiple-arglists/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(x: Int)(y: Int): Unit = macro Impls.foo
   foo(40)(2)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-expand-nullary-generic/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-nullary-generic/Macros_Test_2.scala
index da418c63c6b9..edd90517546d 100644
--- a/tests/disabled/macro/run/macro-expand-nullary-generic/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-nullary-generic/Macros_Test_2.scala
@@ -5,7 +5,7 @@ object Macros {
   def bar2[T](x: Int)(): Unit = macro Impls.barEmpty[T]
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo1[Int]
   Macros.foo2[Int]
   Macros.foo2[Int]()
diff --git a/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala
index a14d981cee2e..51915dfb27a8 100644
--- a/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-nullary-nongeneric/Macros_Test_2.scala
@@ -5,7 +5,7 @@ object Macros {
   def bar2(x: Int)(): Unit = macro Impls.barEmpty
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo1
   Macros.foo2
   Macros.foo2()
diff --git a/tests/disabled/macro/run/macro-expand-overload/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-overload/Macros_Test_2.scala
index b367f35b7636..87cff2ecbd37 100644
--- a/tests/disabled/macro/run/macro-expand-overload/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-overload/Macros_Test_2.scala
@@ -10,7 +10,7 @@ class Macros {
   def foo(x: Boolean): Unit = println("fooClassBoolean")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo("42")
   Macros.foo(42)
   Macros.foo(true)
diff --git a/tests/disabled/macro/run/macro-expand-override/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-override/Macros_Test_2.scala
index 46c1f49cc234..160831c54e6b 100644
--- a/tests/disabled/macro/run/macro-expand-override/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-override/Macros_Test_2.scala
@@ -14,7 +14,7 @@ class Z extends D {
   override def foo(x: Boolean): Unit = println("fooZBoolean")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val dd: D = new D()
   dd.foo("42")
diff --git a/tests/disabled/macro/run/macro-expand-recursive/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-recursive/Macros_Test_2.scala
index e8a88afc9f6a..5332fdaceefd 100644
--- a/tests/disabled/macro/run/macro-expand-recursive/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-recursive/Macros_Test_2.scala
@@ -3,6 +3,6 @@ object Macros {
   def fooFoo: Unit = macro Impls.fooFoo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.fooFoo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-expand-tparams-bounds/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-tparams-bounds/Macros_Test_2.scala
index f1cab82ec724..6cb2b53465bc 100644
--- a/tests/disabled/macro/run/macro-expand-tparams-bounds/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-bounds/Macros_Test_2.scala
@@ -6,7 +6,7 @@ object Macros2 {
   def foo[T <: D]: Unit = macro Impls2.foo[T]
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros1.foo[String]
   Macros2.foo[D]
 }
diff --git a/tests/disabled/macro/run/macro-expand-tparams-explicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-tparams-explicit/Macros_Test_2.scala
index 14154ee03b1c..2cf7b19d2a94 100644
--- a/tests/disabled/macro/run/macro-expand-tparams-explicit/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-explicit/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo[U]: Unit = macro Impls.foo[U]
   foo[Int]
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-expand-tparams-implicit/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-tparams-implicit/Macros_Test_2.scala
index 3868174693b1..119293193128 100644
--- a/tests/disabled/macro/run/macro-expand-tparams-implicit/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-implicit/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo[U](x: U): Unit = macro Impls.foo[U]
   foo(42)
   foo("42")
diff --git a/tests/disabled/macro/run/macro-expand-tparams-prefix/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-tparams-prefix/Macros_Test_2.scala
index 8916f03e4235..c8f68b4affda 100644
--- a/tests/disabled/macro/run/macro-expand-tparams-prefix/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-tparams-prefix/Macros_Test_2.scala
@@ -29,7 +29,7 @@ object Macros5 {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println("===Macros1===")
   new Macros1.C[Int]().foo(42)
   new Macros1.C[Boolean]().foo(42)
diff --git a/tests/disabled/macro/run/macro-expand-unapply-a/Test_2.scala b/tests/disabled/macro/run/macro-expand-unapply-a/Test_2.scala
index ce52df8023b2..6169d86b1907 100644
--- a/tests/disabled/macro/run/macro-expand-unapply-a/Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-unapply-a/Test_2.scala
@@ -1,6 +1,6 @@
 import Macros._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   List(1, 2) match { case UnapplyMacro(x, y) => println((x, y)) }
   List(1, 2, 3) match { case UnapplyMacro(x, y, z) => println((x, y, z)) }
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala
index 868fb8d918e7..64aaa07bf287 100644
--- a/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-bad/Macros_Test_2.scala
@@ -2,7 +2,7 @@ object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala
index 7eba411cdaf5..13d7cd5d5dd6 100644
--- a/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-nonvarargs-good/Macros_Test_2.scala
@@ -2,7 +2,7 @@ object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val numbers = List(1, 2, 3, 4, 5)
   Macros.foo(numbers: _*)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala
index 7eba411cdaf5..13d7cd5d5dd6 100644
--- a/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-explicit-over-varargs/Macros_Test_2.scala
@@ -2,7 +2,7 @@ object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val numbers = List(1, 2, 3, 4, 5)
   Macros.foo(numbers: _*)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala
index f50a5d742f8d..9ab1be9e2352 100644
--- a/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-nonvarargs/Macros_Test_2.scala
@@ -2,6 +2,6 @@ object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo(1, 2, 3, 4, 5)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala
index f50a5d742f8d..9ab1be9e2352 100644
--- a/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-expand-varargs-implicit-over-varargs/Macros_Test_2.scala
@@ -2,6 +2,6 @@ object Macros {
   def foo(xs: Int*): Unit = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo(1, 2, 3, 4, 5)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-impl-default-params/Test_2.scala b/tests/disabled/macro/run/macro-impl-default-params/Test_2.scala
index 476c881f8e74..90e850df2138 100644
--- a/tests/disabled/macro/run/macro-impl-default-params/Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-default-params/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println("foo_targs:")
   new Macros[Int]().foo_targs[String](42)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-impl-relaxed/Test_2.scala b/tests/disabled/macro/run/macro-impl-relaxed/Test_2.scala
index 460626272980..2eaeef0fd041 100644
--- a/tests/disabled/macro/run/macro-impl-relaxed/Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-relaxed/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.fooUU(2))
   println(Macros.fooTU(2))
   println(Macros.fooUT(2))
diff --git a/tests/disabled/macro/run/macro-impl-rename-context/Test_2.scala b/tests/disabled/macro/run/macro-impl-rename-context/Test_2.scala
index 6b1cdecd048e..bd9c49354469 100644
--- a/tests/disabled/macro/run/macro-impl-rename-context/Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-rename-context/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println("foo")
   Macros.foo(42)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala
index b626ce35ee1e..4901e24481f0 100644
--- a/tests/disabled/macro/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-tparam-only-in-impl/Macros_Test_2.scala
@@ -2,7 +2,7 @@ object Macros {
   def foo: Unit = macro Impls.foo[String]
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala
index 14154ee03b1c..2cf7b19d2a94 100644
--- a/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-impl-tparam-typetag-is-optional/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo[U]: Unit = macro Impls.foo[U]
   foo[Int]
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala
index dea6e6d62268..61f0bdfadcd3 100644
--- a/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-invalidret-nontypeable/Test_2.scala b/tests/disabled/macro/run/macro-invalidret-nontypeable/Test_2.scala
index 26de1d9de556..7cd474ff5264 100644
--- a/tests/disabled/macro/run/macro-invalidret-nontypeable/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidret-nontypeable/Test_2.scala
@@ -1,4 +1,4 @@
-  object Test extends dotty.runtime.LegacyApp {
+  object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-invalidusage-badret/Test_2.scala b/tests/disabled/macro/run/macro-invalidusage-badret/Test_2.scala
index 1d208aeb1d6c..fc71353f5421 100644
--- a/tests/disabled/macro/run/macro-invalidusage-badret/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-badret/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams/Test_2.scala b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams/Test_2.scala
index ba763eda52a6..9a34c62e0f13 100644
--- a/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication-with-tparams/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-invalidusage-partialapplication/Test_2.scala b/tests/disabled/macro/run/macro-invalidusage-partialapplication/Test_2.scala
index a0b90ee6be40..75b8c139d41d 100644
--- a/tests/disabled/macro/run/macro-invalidusage-partialapplication/Test_2.scala
+++ b/tests/disabled/macro/run/macro-invalidusage-partialapplication/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-openmacros/Test_2.scala b/tests/disabled/macro/run/macro-openmacros/Test_2.scala
index d75fbd0db39e..5d19639cddff 100644
--- a/tests/disabled/macro/run/macro-openmacros/Test_2.scala
+++ b/tests/disabled/macro/run/macro-openmacros/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
diff --git a/tests/disabled/macro/run/macro-parse-position-malformed/Test_2.scala b/tests/disabled/macro/run/macro-parse-position-malformed/Test_2.scala
index 1b04d2af2852..cff569bd81b1 100644
--- a/tests/disabled/macro/run/macro-parse-position-malformed/Test_2.scala
+++ b/tests/disabled/macro/run/macro-parse-position-malformed/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo)
 }
diff --git a/tests/disabled/macro/run/macro-parse-position/Test_2.scala b/tests/disabled/macro/run/macro-parse-position/Test_2.scala
index 1b04d2af2852..cff569bd81b1 100644
--- a/tests/disabled/macro/run/macro-parse-position/Test_2.scala
+++ b/tests/disabled/macro/run/macro-parse-position/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo)
 }
diff --git a/tests/disabled/macro/run/macro-quasiinvalidbody-c/Test_2.scala b/tests/disabled/macro/run/macro-quasiinvalidbody-c/Test_2.scala
index 91053843dcb1..dec29aa8575f 100644
--- a/tests/disabled/macro/run/macro-quasiinvalidbody-c/Test_2.scala
+++ b/tests/disabled/macro/run/macro-quasiinvalidbody-c/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   println(foo(42))
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-quasiquotes/Test_2.scala b/tests/disabled/macro/run/macro-quasiquotes/Test_2.scala
index b7d203197f3e..4be193938f9b 100644
--- a/tests/disabled/macro/run/macro-quasiquotes/Test_2.scala
+++ b/tests/disabled/macro/run/macro-quasiquotes/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.m1
   Macros.m2
   println(Macros.m3)
diff --git a/tests/disabled/macro/run/macro-range/Expansion_Impossible_2.scala b/tests/disabled/macro/run/macro-range/Expansion_Impossible_2.scala
index b3c2fa3481f4..242e83a61a62 100644
--- a/tests/disabled/macro/run/macro-range/Expansion_Impossible_2.scala
+++ b/tests/disabled/macro/run/macro-range/Expansion_Impossible_2.scala
@@ -48,6 +48,6 @@ class Range(val from: Int, val to: Int) extends RangeDefault {
   override def foreach(f: Int => Unit): Unit = macro Impls.foreach
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Range(1, 10) foreach println
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-range/Expansion_Possible_3.scala b/tests/disabled/macro/run/macro-range/Expansion_Possible_3.scala
index b1fbba765e4c..e7ecbcc3627e 100644
--- a/tests/disabled/macro/run/macro-range/Expansion_Possible_3.scala
+++ b/tests/disabled/macro/run/macro-range/Expansion_Possible_3.scala
@@ -2,6 +2,6 @@ class Range(val from: Int, val to: Int) extends RangeDefault {
   override def foreach(f: Int => Unit): Unit = macro Impls.foreach
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Range(1, 10) foreach println
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-rangepos-args/Test_2.scala b/tests/disabled/macro/run/macro-rangepos-args/Test_2.scala
index 936b945c766e..8c770e901075 100644
--- a/tests/disabled/macro/run/macro-rangepos-args/Test_2.scala
+++ b/tests/disabled/macro/run/macro-rangepos-args/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = 2
   println(Macros.pos(x + 2))
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-rangepos-subpatterns/Test_2.scala b/tests/disabled/macro/run/macro-rangepos-subpatterns/Test_2.scala
index b9b308cea880..7b076e663239 100644
--- a/tests/disabled/macro/run/macro-rangepos-subpatterns/Test_2.scala
+++ b/tests/disabled/macro/run/macro-rangepos-subpatterns/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   42 match {
     case Extractor(a) => println(a)
   }
diff --git a/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi/Test_2.scala b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi/Test_2.scala
index b8d969b836b1..267d1bc7b0ed 100644
--- a/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reflective-ma-normal-mdmi/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala b/tests/disabled/macro/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
index 0b867e7878f1..410ec1b527f2 100644
--- a/tests/disabled/macro/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala
@@ -2,7 +2,7 @@
 //  def foo(x: Int) = macro Impls.foo
 //}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.universe.Flag._
   import scala.reflect.runtime.{currentMirror => cm}
diff --git a/tests/disabled/macro/run/macro-reify-basic/Test_2.scala b/tests/disabled/macro/run/macro-reify-basic/Test_2.scala
index 26b2c7d9ffa4..0a762f7ad7b8 100644
--- a/tests/disabled/macro/run/macro-reify-basic/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-basic/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo("world")
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-reify-chained1/Test_2.scala b/tests/disabled/macro/run/macro-reify-chained1/Test_2.scala
index 01a021893ce8..2adb07b03528 100644
--- a/tests/disabled/macro/run/macro-reify-chained1/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-chained1/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val q : Queryable[Any] = new Queryable[Any]
   q.map(x => x).map(x => x)
 
diff --git a/tests/disabled/macro/run/macro-reify-chained2/Test_2.scala b/tests/disabled/macro/run/macro-reify-chained2/Test_2.scala
index 01a021893ce8..2adb07b03528 100644
--- a/tests/disabled/macro/run/macro-reify-chained2/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-chained2/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val q : Queryable[Any] = new Queryable[Any]
   q.map(x => x).map(x => x)
 
diff --git a/tests/disabled/macro/run/macro-reify-freevars/Test_2.scala b/tests/disabled/macro/run/macro-reify-freevars/Test_2.scala
index 11c8128cd0a8..c2d0118e1735 100644
--- a/tests/disabled/macro/run/macro-reify-freevars/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-freevars/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-reify-nested-a1/Test_2.scala b/tests/disabled/macro/run/macro-reify-nested-a1/Test_2.scala
index 37282cad750f..b99c4c55e4b2 100644
--- a/tests/disabled/macro/run/macro-reify-nested-a1/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-a1/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val q : Queryable[Any] = new Queryable[Any]
   q.map(e1 => q.map(e2=>e1))
 
diff --git a/tests/disabled/macro/run/macro-reify-nested-a2/Test_2.scala b/tests/disabled/macro/run/macro-reify-nested-a2/Test_2.scala
index 37282cad750f..b99c4c55e4b2 100644
--- a/tests/disabled/macro/run/macro-reify-nested-a2/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-a2/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val q : Queryable[Any] = new Queryable[Any]
   q.map(e1 => q.map(e2=>e1))
 
diff --git a/tests/disabled/macro/run/macro-reify-nested-b1/Test_2.scala b/tests/disabled/macro/run/macro-reify-nested-b1/Test_2.scala
index b9d6846dcdec..b1990363492a 100644
--- a/tests/disabled/macro/run/macro-reify-nested-b1/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-b1/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val q : Queryable[Any] = new Queryable[Any]
   q.map(e1 => q.map(e2=>e1).map(e2=>e1))
 
diff --git a/tests/disabled/macro/run/macro-reify-nested-b2/Test_2.scala b/tests/disabled/macro/run/macro-reify-nested-b2/Test_2.scala
index b9d6846dcdec..b1990363492a 100644
--- a/tests/disabled/macro/run/macro-reify-nested-b2/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-nested-b2/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val q : Queryable[Any] = new Queryable[Any]
   q.map(e1 => q.map(e2=>e1).map(e2=>e1))
 
diff --git a/tests/disabled/macro/run/macro-reify-ref-to-packageless/Test_2.scala b/tests/disabled/macro/run/macro-reify-ref-to-packageless/Test_2.scala
index ff5b60a6a137..c167b160be55 100644
--- a/tests/disabled/macro/run/macro-reify-ref-to-packageless/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-ref-to-packageless/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo: Int = macro Impls.foo
   println(foo)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-reify-splice-outside-reify/Test_2.scala b/tests/disabled/macro/run/macro-reify-splice-outside-reify/Test_2.scala
index f99d40dad587..dbc17e7c158a 100644
--- a/tests/disabled/macro/run/macro-reify-splice-outside-reify/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-splice-outside-reify/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/macro-reify-staticXXX/Test_2.scala b/tests/disabled/macro/run/macro-reify-staticXXX/Test_2.scala
index 4c02e26f61f9..6e8cc360804c 100644
--- a/tests/disabled/macro/run/macro-reify-staticXXX/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-staticXXX/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   packageless.test
   packageful.Test.test
 }
diff --git a/tests/disabled/macro/run/macro-reify-tagful-a/Test_2.scala b/tests/disabled/macro/run/macro-reify-tagful-a/Test_2.scala
index 5095ddcaa05c..4d2716634155 100644
--- a/tests/disabled/macro/run/macro-reify-tagful-a/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-tagful-a/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val list: List[String] = Macros.foo("hello world")
   println(list)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-reify-tagless-a/Test_2.scala b/tests/disabled/macro/run/macro-reify-tagless-a/Test_2.scala
index af882664d5c2..afb418a7550e 100644
--- a/tests/disabled/macro/run/macro-reify-tagless-a/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-tagless-a/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   //val list: List[String] = Macros.foo("hello world")
   //println(list)
 
diff --git a/tests/disabled/macro/run/macro-reify-type/Test_2.scala b/tests/disabled/macro/run/macro-reify-type/Test_2.scala
index c9e56d71814e..8ec60e9f6195 100644
--- a/tests/disabled/macro/run/macro-reify-type/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-type/Test_2.scala
@@ -1,6 +1,6 @@
 import StaticReflect._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   //println(method[List[Int]]("distinct"))
   println(method[List[Int]]("map"))
   //val $u: scala.reflect.runtime.universe.type = scala.reflect.runtime.universe;
diff --git a/tests/disabled/macro/run/macro-reify-typetag-notypeparams/Test.scala b/tests/disabled/macro/run/macro-reify-typetag-notypeparams/Test.scala
index 1eff6e93fe2f..29732ceb7e08 100644
--- a/tests/disabled/macro/run/macro-reify-typetag-notypeparams/Test.scala
+++ b/tests/disabled/macro/run/macro-reify-typetag-notypeparams/Test.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[TypeTag[Int]])
   println(implicitly[TypeTag[List[Int]]])
 }
diff --git a/tests/disabled/macro/run/macro-reify-typetag-typeparams-tags/Test.scala b/tests/disabled/macro/run/macro-reify-typetag-typeparams-tags/Test.scala
index 4540bb6b376f..ec68f9d1092c 100644
--- a/tests/disabled/macro/run/macro-reify-typetag-typeparams-tags/Test.scala
+++ b/tests/disabled/macro/run/macro-reify-typetag-typeparams-tags/Test.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def fooTypeTag[T: TypeTag] = {
     println(implicitly[TypeTag[T]])
     println(implicitly[TypeTag[List[T]]])
diff --git a/tests/disabled/macro/run/macro-reify-unreify/Test_2.scala b/tests/disabled/macro/run/macro-reify-unreify/Test_2.scala
index 26b2c7d9ffa4..0a762f7ad7b8 100644
--- a/tests/disabled/macro/run/macro-reify-unreify/Test_2.scala
+++ b/tests/disabled/macro/run/macro-reify-unreify/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo("world")
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-settings/Test_2.scala b/tests/disabled/macro/run/macro-settings/Test_2.scala
index 0fc472aa62e0..acfddae94215 100644
--- a/tests/disabled/macro/run/macro-settings/Test_2.scala
+++ b/tests/disabled/macro/run/macro-settings/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-sip19-revised/Test_2.scala b/tests/disabled/macro/run/macro-sip19-revised/Test_2.scala
index 483665ae4fa2..d9a4d7d4fc61 100644
--- a/tests/disabled/macro/run/macro-sip19-revised/Test_2.scala
+++ b/tests/disabled/macro/run/macro-sip19-revised/Test_2.scala
@@ -1,6 +1,6 @@
 import Macros._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(x: Int, y: Int)(implicit loc: SourceLocation): Int = {
     println("hey, i've been called from %s".format(loc))
     if (x < y) foo(y, x)
diff --git a/tests/disabled/macro/run/macro-sip19/Test_2.scala b/tests/disabled/macro/run/macro-sip19/Test_2.scala
index 0255f1381d79..32326e635203 100644
--- a/tests/disabled/macro/run/macro-sip19/Test_2.scala
+++ b/tests/disabled/macro/run/macro-sip19/Test_2.scala
@@ -1,6 +1,6 @@
 import Macros._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(x: Int, y: Int)(implicit loc0: SourceLocation): Int = {
     var loc = loc0;
     {
diff --git a/tests/disabled/macro/run/macro-subpatterns/Test_2.scala b/tests/disabled/macro/run/macro-subpatterns/Test_2.scala
index b19bd9b9ba0c..dc6e6688774d 100644
--- a/tests/disabled/macro/run/macro-subpatterns/Test_2.scala
+++ b/tests/disabled/macro/run/macro-subpatterns/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   42 match {
     case Extractor(a @ Extractor(b @ Extractor(c))) => println(a); println(b); println(c)
   }
diff --git a/tests/disabled/macro/run/macro-term-declared-in-annotation/Test_3.scala b/tests/disabled/macro/run/macro-term-declared-in-annotation/Test_3.scala
index 322ef9eb1899..866487f02872 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-annotation/Test_3.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-annotation/Test_3.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Api.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-anonymous/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-anonymous/Macros_Test_2.scala
index 894947e1ee2b..5039dffd5fed 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-anonymous/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-anonymous/Macros_Test_2.scala
@@ -1,6 +1,6 @@
 import scala.language.reflectiveCalls
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val macros = new { def foo: Unit = macro Impls.foo }
   macros.foo
 }
diff --git a/tests/disabled/macro/run/macro-term-declared-in-block/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-block/Macros_Test_2.scala
index eba5e4961c50..80bfc44beee3 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-block/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-block/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     def foo: Unit = macro Impls.foo
     foo
diff --git a/tests/disabled/macro/run/macro-term-declared-in-class-class/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-class-class/Macros_Test_2.scala
index 7f813a30d693..d6b1f9fab129 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-class-class/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-class/Macros_Test_2.scala
@@ -4,7 +4,7 @@ class Macros {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val outer = new Macros()
   new outer.Macros().foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-class-object/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-class-object/Macros_Test_2.scala
index 12c6328c9585..957f666bb0ef 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-class-object/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class-object/Macros_Test_2.scala
@@ -4,7 +4,7 @@ class Macros {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val outer = new Macros()
   outer.Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-class/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-class/Macros_Test_2.scala
index 0c9a7ccf00c2..5898d94dc1f5 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-class/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-class/Macros_Test_2.scala
@@ -2,6 +2,6 @@ class Macros {
   def foo: Unit = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Macros().foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-default-param/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-default-param/Macros_Test_2.scala
index 856a4e44f995..16bd95b1e612 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-default-param/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-default-param/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(bar: String = { def foo: String = macro Impls.foo; foo }) = println(bar)
 
   foo()
diff --git a/tests/disabled/macro/run/macro-term-declared-in-implicit-class/Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-implicit-class/Test_2.scala
index fd67062bec6f..d0bc9cc38c22 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-implicit-class/Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-implicit-class/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   println("2".toOptionOfInt)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-method/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-method/Macros_Test_2.scala
index d40eb4c6048e..523989df131d 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-method/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-method/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def bar() = {
     def foo: Unit = macro Impls.foo
     foo
diff --git a/tests/disabled/macro/run/macro-term-declared-in-object-class/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-object-class/Macros_Test_2.scala
index 89aed84c7067..fe9dbef25547 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-object-class/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-class/Macros_Test_2.scala
@@ -4,7 +4,7 @@ object Macros {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val outer = Macros
   new outer.Macros().foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-object-object/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-object-object/Macros_Test_2.scala
index c5950fe61a1a..4ba755181882 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-object-object/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object-object/Macros_Test_2.scala
@@ -4,7 +4,7 @@ object Macros {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val outer = Macros
   outer.Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-object/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-object/Macros_Test_2.scala
index f89a21d9206f..9ebf5d7dba26 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-object/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-object/Macros_Test_2.scala
@@ -2,6 +2,6 @@ object Macros {
   def foo: Unit = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-package-object/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-package-object/Macros_Test_2.scala
index 69f3803badd0..1f378b8bfd8d 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-package-object/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-package-object/Macros_Test_2.scala
@@ -2,7 +2,7 @@ package object Macros {
   def foo: Unit = macro Impls.foo
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-term-declared-in-refinement/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-refinement/Macros_Test_2.scala
index 49192291e3c3..b38616b71a53 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-refinement/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-refinement/Macros_Test_2.scala
@@ -2,7 +2,7 @@ import scala.language.reflectiveCalls
 
 class Base
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val macros = new Base { def foo: Unit = macro Impls.foo }
   macros.foo
 }
diff --git a/tests/disabled/macro/run/macro-term-declared-in-trait/Macros_Test_2.scala b/tests/disabled/macro/run/macro-term-declared-in-trait/Macros_Test_2.scala
index 5780aba45b5d..09c60df3517a 100644
--- a/tests/disabled/macro/run/macro-term-declared-in-trait/Macros_Test_2.scala
+++ b/tests/disabled/macro/run/macro-term-declared-in-trait/Macros_Test_2.scala
@@ -6,7 +6,7 @@ object Macros extends Base
 
 class Macros extends Base
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   (new Base {}).foo
   Macros.foo
   new Macros().foo
diff --git a/tests/disabled/macro/run/macro-typecheck-implicitsdisabled/Test_2.scala b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled/Test_2.scala
index 87d3148e9b28..127e955f0ef5 100644
--- a/tests/disabled/macro/run/macro-typecheck-implicitsdisabled/Test_2.scala
+++ b/tests/disabled/macro/run/macro-typecheck-implicitsdisabled/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo_with_implicits_enabled)
   println(Macros.foo_with_implicits_disabled)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-typecheck-macrosdisabled/Test_2.scala b/tests/disabled/macro/run/macro-typecheck-macrosdisabled/Test_2.scala
index 887f28c8c2be..bdba39195b0a 100644
--- a/tests/disabled/macro/run/macro-typecheck-macrosdisabled/Test_2.scala
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo_with_macros_enabled)
   println(Macros.foo_with_macros_disabled)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-typecheck-macrosdisabled2/Test_2.scala b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2/Test_2.scala
index 887f28c8c2be..bdba39195b0a 100644
--- a/tests/disabled/macro/run/macro-typecheck-macrosdisabled2/Test_2.scala
+++ b/tests/disabled/macro/run/macro-typecheck-macrosdisabled2/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo_with_macros_enabled)
   println(Macros.foo_with_macros_disabled)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-undetparams-consfromsls/Test_2.scala b/tests/disabled/macro/run/macro-undetparams-consfromsls/Test_2.scala
index 3386844018c6..f2c2ce0051af 100644
--- a/tests/disabled/macro/run/macro-undetparams-consfromsls/Test_2.scala
+++ b/tests/disabled/macro/run/macro-undetparams-consfromsls/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Macros._
   val xs = cons(1, nil)
   println(xs)
diff --git a/tests/disabled/macro/run/macro-undetparams-macroitself/Test_2.scala b/tests/disabled/macro/run/macro-undetparams-macroitself/Test_2.scala
index c315f35087a2..1a93ff13040d 100644
--- a/tests/disabled/macro/run/macro-undetparams-macroitself/Test_2.scala
+++ b/tests/disabled/macro/run/macro-undetparams-macroitself/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo(42)
   Macros.foo("42")
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macro-vampire-false-warning/Test_2.scala b/tests/disabled/macro/run/macro-vampire-false-warning/Test_2.scala
index d28849b88df3..6e44b6863545 100644
--- a/tests/disabled/macro/run/macro-vampire-false-warning/Test_2.scala
+++ b/tests/disabled/macro/run/macro-vampire-false-warning/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val foo = mkObject("x" -> "2", "y" -> 3)
   println(foo.x)
   println(foo.y)
diff --git a/tests/disabled/macro/run/macro-whitebox-dynamic-materialization/Test_2.scala b/tests/disabled/macro/run/macro-whitebox-dynamic-materialization/Test_2.scala
index 10d89dd3cc6d..abb5229bd0d9 100644
--- a/tests/disabled/macro/run/macro-whitebox-dynamic-materialization/Test_2.scala
+++ b/tests/disabled/macro/run/macro-whitebox-dynamic-materialization/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[Foo[C1]])
   println(implicitly[Foo[C2]])
 }
diff --git a/tests/disabled/macro/run/macro-whitebox-extractor/Test_2.scala b/tests/disabled/macro/run/macro-whitebox-extractor/Test_2.scala
index 7c354ecd654d..41be6f976713 100644
--- a/tests/disabled/macro/run/macro-whitebox-extractor/Test_2.scala
+++ b/tests/disabled/macro/run/macro-whitebox-extractor/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   42 match {
     case Extractor(x) => println(x)
   }
diff --git a/tests/disabled/macro/run/macro-whitebox-fundep-materialization/Test_2.scala b/tests/disabled/macro/run/macro-whitebox-fundep-materialization/Test_2.scala
index 72183ba8639b..40ca1d549c5b 100644
--- a/tests/disabled/macro/run/macro-whitebox-fundep-materialization/Test_2.scala
+++ b/tests/disabled/macro/run/macro-whitebox-fundep-materialization/Test_2.scala
@@ -1,5 +1,5 @@
 // see the comments for macroExpand.onDelayed for an explanation of what's tested here
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class Foo(i: Int, s: String, b: Boolean)
   def foo[C, L](c: C)(implicit iso: Iso[C, L]): L = iso.to(c)
 
diff --git a/tests/disabled/macro/run/macro-whitebox-structural/Test_2.scala b/tests/disabled/macro/run/macro-whitebox-structural/Test_2.scala
index 6fa47e1ddf2d..ea6a817e346e 100644
--- a/tests/disabled/macro/run/macro-whitebox-structural/Test_2.scala
+++ b/tests/disabled/macro/run/macro-whitebox-structural/Test_2.scala
@@ -1,5 +1,5 @@
 import Macros._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo.x)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macroPlugins-isBlackbox/Test_3.scala b/tests/disabled/macro/run/macroPlugins-isBlackbox/Test_3.scala
index f191e5de31f5..552e888143c7 100644
--- a/tests/disabled/macro/run/macroPlugins-isBlackbox/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-isBlackbox/Test_3.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x: Int = Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macroPlugins-macroArgs/Test_3.scala b/tests/disabled/macro/run/macroPlugins-macroArgs/Test_3.scala
index 8d3be78bbf1a..a54d60817898 100644
--- a/tests/disabled/macro/run/macroPlugins-macroArgs/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroArgs/Test_3.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo("1")
   Macros.foo("2")
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macroPlugins-macroExpand/Test_3.scala b/tests/disabled/macro/run/macroPlugins-macroExpand/Test_3.scala
index a730821f22e0..def9b5608a3a 100644
--- a/tests/disabled/macro/run/macroPlugins-macroExpand/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroExpand/Test_3.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo1
   Macros.foo2
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macroPlugins-macroRuntime/Test_3.scala b/tests/disabled/macro/run/macroPlugins-macroRuntime/Test_3.scala
index 8d3be78bbf1a..a54d60817898 100644
--- a/tests/disabled/macro/run/macroPlugins-macroRuntime/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-macroRuntime/Test_3.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo("1")
   Macros.foo("2")
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/macroPlugins-typedMacroBody/Test_3.scala b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Test_3.scala
index a730821f22e0..def9b5608a3a 100644
--- a/tests/disabled/macro/run/macroPlugins-typedMacroBody/Test_3.scala
+++ b/tests/disabled/macro/run/macroPlugins-typedMacroBody/Test_3.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo1
   Macros.foo2
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/reflection-magicsymbols-invoke.scala b/tests/disabled/macro/run/reflection-magicsymbols-invoke.scala
index bbcf8f5245e3..1fff85171c3f 100644
--- a/tests/disabled/macro/run/reflection-magicsymbols-invoke.scala
+++ b/tests/disabled/macro/run/reflection-magicsymbols-invoke.scala
@@ -8,7 +8,7 @@ package scala {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def key(sym: Symbol) = sym + ": " + sym.info
   def test(tpe: Type, receiver: Any, method: String, args: Any*): Unit = {
     def wrap[T](op: => T) =
diff --git a/tests/disabled/macro/run/reify-staticXXX.scala b/tests/disabled/macro/run/reify-staticXXX.scala
index cfbd756ec205..e80157dd8f7f 100644
--- a/tests/disabled/macro/run/reify-staticXXX.scala
+++ b/tests/disabled/macro/run/reify-staticXXX.scala
@@ -50,7 +50,7 @@ package packageful {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   packageless.test
   packageful.Test.test
 }
diff --git a/tests/disabled/macro/run/reify_ann1a.scala b/tests/disabled/macro/run/reify_ann1a.scala
index 9252ddcf7168..1078514eaddd 100644
--- a/tests/disabled/macro/run/reify_ann1a.scala
+++ b/tests/disabled/macro/run/reify_ann1a.scala
@@ -5,7 +5,7 @@ import scala.tools.reflect.ToolBox
 
 class ann(bar: List[String]) extends annotation.StaticAnnotation
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{
     @ann(bar=List("1a")) @ann(bar=List("1b")) class C[@ann(bar=List("2a")) @ann(bar=List("2b")) T](@ann(bar=List("3a")) @ann(bar=List("3b")) x: T @ann(bar=List("4a")) @ann(bar=List("4b"))) {
diff --git a/tests/disabled/macro/run/reify_ann1b.scala b/tests/disabled/macro/run/reify_ann1b.scala
index d3c6a4da3a6c..847120edb072 100644
--- a/tests/disabled/macro/run/reify_ann1b.scala
+++ b/tests/disabled/macro/run/reify_ann1b.scala
@@ -5,7 +5,7 @@ import scala.tools.reflect.ToolBox
 
 class ann(bar: String) extends annotation.ClassfileAnnotation
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{
     @ann(bar="1a") @ann(bar="1b") class C[@ann(bar="2a") @ann(bar="2b") T](@ann(bar="3a") @ann(bar="3b") x: T @ann(bar="4a") @ann(bar="4b")) {
diff --git a/tests/disabled/macro/run/reify_ann2a.scala b/tests/disabled/macro/run/reify_ann2a.scala
index 861cb6297353..7ae2dc48d1b1 100644
--- a/tests/disabled/macro/run/reify_ann2a.scala
+++ b/tests/disabled/macro/run/reify_ann2a.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{
     class ann(bar: List[String]) extends annotation.StaticAnnotation
diff --git a/tests/disabled/macro/run/reify_ann3.scala b/tests/disabled/macro/run/reify_ann3.scala
index 7eadd569bd55..be9f9c8e9a85 100644
--- a/tests/disabled/macro/run/reify_ann3.scala
+++ b/tests/disabled/macro/run/reify_ann3.scala
@@ -5,7 +5,7 @@ import scala.tools.reflect.ToolBox
 import scala.annotation._
 import scala.annotation.meta._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{
     class Tree[A, +B](@(inline @getter) final val key: A)
diff --git a/tests/disabled/macro/run/reify_ann4.scala b/tests/disabled/macro/run/reify_ann4.scala
index 074ceb81548c..6ba4b8c21516 100644
--- a/tests/disabled/macro/run/reify_ann4.scala
+++ b/tests/disabled/macro/run/reify_ann4.scala
@@ -5,7 +5,7 @@ import scala.tools.reflect.ToolBox
 import scala.annotation._
 import scala.annotation.meta._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{
     class D extends StaticAnnotation
diff --git a/tests/disabled/macro/run/reify_ann5.scala b/tests/disabled/macro/run/reify_ann5.scala
index 84e5bda9c43c..3cc355249108 100644
--- a/tests/disabled/macro/run/reify_ann5.scala
+++ b/tests/disabled/macro/run/reify_ann5.scala
@@ -6,7 +6,7 @@ import scala.annotation._
 import scala.annotation.meta._
 import scala.beans._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{
     class C(@BeanProperty @(inline @beanGetter) val x: Int)
diff --git a/tests/disabled/macro/run/reify_anonymous.scala b/tests/disabled/macro/run/reify_anonymous.scala
index a7aad4065cfa..f2e9a5023031 100644
--- a/tests/disabled/macro/run/reify_anonymous.scala
+++ b/tests/disabled/macro/run/reify_anonymous.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     println(new {def x = 2; def y = x * x}.y)
   }.eval
diff --git a/tests/disabled/macro/run/reify_classfileann_a.scala b/tests/disabled/macro/run/reify_classfileann_a.scala
index 74546df37159..7df81f2b56a0 100644
--- a/tests/disabled/macro/run/reify_classfileann_a.scala
+++ b/tests/disabled/macro/run/reify_classfileann_a.scala
@@ -5,7 +5,7 @@ import scala.tools.reflect.ToolBox
 
 class ann(bar: String, quux: Array[String] = Array(), baz: ann = null) extends annotation.ClassfileAnnotation
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{
     @ann(bar="1", quux=Array("2", "3"), baz = new ann(bar = "4")) class C
diff --git a/tests/disabled/macro/run/reify_classfileann_b.scala b/tests/disabled/macro/run/reify_classfileann_b.scala
index 920d671f9874..8ddab9bc55b2 100644
--- a/tests/disabled/macro/run/reify_classfileann_b.scala
+++ b/tests/disabled/macro/run/reify_classfileann_b.scala
@@ -5,7 +5,7 @@ import scala.tools.reflect.ToolBox
 
 class ann(bar: String, quux: Array[String] = Array(), baz: ann = null) extends annotation.ClassfileAnnotation
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{
     class C {
diff --git a/tests/disabled/macro/run/reify_closure1.scala b/tests/disabled/macro/run/reify_closure1.scala
index 6a5684b2aaa9..0652cff8c0bb 100644
--- a/tests/disabled/macro/run/reify_closure1.scala
+++ b/tests/disabled/macro/run/reify_closure1.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo[T](ys: List[T]): Int => Int = {
     val fun = reify{(x: Int) => {
       x
diff --git a/tests/disabled/macro/run/reify_closure2a.scala b/tests/disabled/macro/run/reify_closure2a.scala
index cc194bc6d14c..fa66ef6972dd 100644
--- a/tests/disabled/macro/run/reify_closure2a.scala
+++ b/tests/disabled/macro/run/reify_closure2a.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(y: Int): Int => Int = {
     val fun = reify{(x: Int) => {
       x + y
diff --git a/tests/disabled/macro/run/reify_closure3a.scala b/tests/disabled/macro/run/reify_closure3a.scala
index 0d540d1dd9af..945416c0502d 100644
--- a/tests/disabled/macro/run/reify_closure3a.scala
+++ b/tests/disabled/macro/run/reify_closure3a.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(y: Int): Int => Int = {
     def y1 = y
 
diff --git a/tests/disabled/macro/run/reify_closure4a.scala b/tests/disabled/macro/run/reify_closure4a.scala
index 373c3b2fa8e1..6e7cce7de9f2 100644
--- a/tests/disabled/macro/run/reify_closure4a.scala
+++ b/tests/disabled/macro/run/reify_closure4a.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(y: Int): Int => Int = {
     val y1 = y
 
diff --git a/tests/disabled/macro/run/reify_closure5a.scala b/tests/disabled/macro/run/reify_closure5a.scala
index e2bd24ad2375..f8a39ee2eee0 100644
--- a/tests/disabled/macro/run/reify_closure5a.scala
+++ b/tests/disabled/macro/run/reify_closure5a.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo[T: TypeTag](ys: List[T]): Int => Int = {
     val fun = reify{(x: Int) => {
       x + ys.length
diff --git a/tests/disabled/macro/run/reify_closure6.scala b/tests/disabled/macro/run/reify_closure6.scala
index 1c3589cdf0db..beaf17e6cbe3 100644
--- a/tests/disabled/macro/run/reify_closure6.scala
+++ b/tests/disabled/macro/run/reify_closure6.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   var q = 0
   def foo[T: TypeTag](ys: List[T]): Int => Int = {
     val z = 1
diff --git a/tests/disabled/macro/run/reify_closure7.scala b/tests/disabled/macro/run/reify_closure7.scala
index 93f2f22a45c0..7c0ff0b284f0 100644
--- a/tests/disabled/macro/run/reify_closure7.scala
+++ b/tests/disabled/macro/run/reify_closure7.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   var q = 0
   var clo: Int => Int = null
   def foo[T: TypeTag](ys: List[T]): Int => Int = {
diff --git a/tests/disabled/macro/run/reify_closure8a.scala b/tests/disabled/macro/run/reify_closure8a.scala
index ad343dd15528..150db0f5caea 100644
--- a/tests/disabled/macro/run/reify_closure8a.scala
+++ b/tests/disabled/macro/run/reify_closure8a.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class Foo(val y: Int) {
     def fun = reify{y}
   }
diff --git a/tests/disabled/macro/run/reify_closure8b.scala b/tests/disabled/macro/run/reify_closure8b.scala
index f28b18e01fbf..b5322896f30f 100644
--- a/tests/disabled/macro/run/reify_closure8b.scala
+++ b/tests/disabled/macro/run/reify_closure8b.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // will fail because y is a private field
   // reification doesn't magically make unavailable stuff available
   class Foo(y: Int) {
diff --git a/tests/disabled/macro/run/reify_closures10.scala b/tests/disabled/macro/run/reify_closures10.scala
index 9c486e4361c5..cd25453b84c9 100644
--- a/tests/disabled/macro/run/reify_closures10.scala
+++ b/tests/disabled/macro/run/reify_closures10.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = 2
   val y = 3
   val code = reify{println(x + y); x + y}
diff --git a/tests/disabled/macro/run/reify_complex.scala b/tests/disabled/macro/run/reify_complex.scala
index 45b72d899674..885a6323bc26 100644
--- a/tests/disabled/macro/run/reify_complex.scala
+++ b/tests/disabled/macro/run/reify_complex.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class Complex(val re: Double, val im: Double) {
       def + (that: Complex) =
diff --git a/tests/disabled/macro/run/reify_copypaste1.scala b/tests/disabled/macro/run/reify_copypaste1.scala
index e255403ad9fc..12cc7dfe19d1 100644
--- a/tests/disabled/macro/run/reify_copypaste1.scala
+++ b/tests/disabled/macro/run/reify_copypaste1.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.universe.definitions._
 import scala.reflect.runtime.universe.Flag._
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val stdout = System.out
   val output = new java.io.ByteArrayOutputStream()
   System.setOut(new java.io.PrintStream(output))
diff --git a/tests/disabled/macro/run/reify_copypaste2.scala b/tests/disabled/macro/run/reify_copypaste2.scala
index 2f9bea1fe617..e64a729dfad0 100644
--- a/tests/disabled/macro/run/reify_copypaste2.scala
+++ b/tests/disabled/macro/run/reify_copypaste2.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = 2
   val outer = reify{reify{x}}
   println(outer.tree)
diff --git a/tests/disabled/macro/run/reify_csv.scala b/tests/disabled/macro/run/reify_csv.scala
index 1c567c9042b0..c35624469cd0 100644
--- a/tests/disabled/macro/run/reify_csv.scala
+++ b/tests/disabled/macro/run/reify_csv.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val csv = """
     |    phase name;  id;  description
     |        parser;   1;  parse source into ASTs, perform simple desugaring
diff --git a/tests/disabled/macro/run/reify_extendbuiltins.scala b/tests/disabled/macro/run/reify_extendbuiltins.scala
index 3056db6e4253..46d5b7e55e5a 100644
--- a/tests/disabled/macro/run/reify_extendbuiltins.scala
+++ b/tests/disabled/macro/run/reify_extendbuiltins.scala
@@ -3,7 +3,7 @@ import scala.language.{ implicitConversions, postfixOps }
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     def fact(n: Int): BigInt =
       if (n == 0) 1 else fact(n-1) * n
diff --git a/tests/disabled/macro/run/reify_for1.scala b/tests/disabled/macro/run/reify_for1.scala
index 1233782adbb7..e0d7e41bcd04 100644
--- a/tests/disabled/macro/run/reify_for1.scala
+++ b/tests/disabled/macro/run/reify_for1.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val sumOfSquares1 = (for (i <- 1 to 100; if (i % 3 == 0)) yield Math.pow(i, 2)).sum
     val sumOfSquares2 = (1 to 100).filter(_ % 3 == 0).map(Math.pow(_, 2)).sum
diff --git a/tests/disabled/macro/run/reify_fors_newpatmat.scala b/tests/disabled/macro/run/reify_fors_newpatmat.scala
index d366169a40c4..e01f0f6c6f39 100644
--- a/tests/disabled/macro/run/reify_fors_newpatmat.scala
+++ b/tests/disabled/macro/run/reify_fors_newpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     object Persons {
       /** A list of persons. To create a list, we use Predef.List
diff --git a/tests/disabled/macro/run/reify_fors_oldpatmat.scala b/tests/disabled/macro/run/reify_fors_oldpatmat.scala
index d366169a40c4..e01f0f6c6f39 100644
--- a/tests/disabled/macro/run/reify_fors_oldpatmat.scala
+++ b/tests/disabled/macro/run/reify_fors_oldpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     object Persons {
       /** A list of persons. To create a list, we use Predef.List
diff --git a/tests/disabled/macro/run/reify_generic.scala b/tests/disabled/macro/run/reify_generic.scala
index 4221dbf6ce68..35a46f686015 100644
--- a/tests/disabled/macro/run/reify_generic.scala
+++ b/tests/disabled/macro/run/reify_generic.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val product = List(1, 2, 3).head * List[Any](4, 2, 0).head.asInstanceOf[Int]
     println(product)
diff --git a/tests/disabled/macro/run/reify_generic2.scala b/tests/disabled/macro/run/reify_generic2.scala
index 6941d9ff7100..0582f6aaa55d 100644
--- a/tests/disabled/macro/run/reify_generic2.scala
+++ b/tests/disabled/macro/run/reify_generic2.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class C
     val product = List(new C, new C).length * List[C](new C, new C).length
diff --git a/tests/disabled/macro/run/reify_getter.scala b/tests/disabled/macro/run/reify_getter.scala
index 18c9a1a3260d..054baf10883d 100644
--- a/tests/disabled/macro/run/reify_getter.scala
+++ b/tests/disabled/macro/run/reify_getter.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     class C {
       val x = 2
diff --git a/tests/disabled/macro/run/reify_implicits-new.scala b/tests/disabled/macro/run/reify_implicits-new.scala
index 5ff90871ab4c..1d90d907eaa5 100644
--- a/tests/disabled/macro/run/reify_implicits-new.scala
+++ b/tests/disabled/macro/run/reify_implicits-new.scala
@@ -4,7 +4,7 @@ import scala.reflect.{ClassTag, classTag}
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     implicit def arrayWrapper[A : ClassTag](x: Array[A]) =
       new {
diff --git a/tests/disabled/macro/run/reify_implicits-old.scala b/tests/disabled/macro/run/reify_implicits-old.scala
index ccd9375d6d5e..a4e90488e5a8 100644
--- a/tests/disabled/macro/run/reify_implicits-old.scala
+++ b/tests/disabled/macro/run/reify_implicits-old.scala
@@ -3,7 +3,7 @@ import scala.language.{ implicitConversions, reflectiveCalls }
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     implicit def arrayWrapper[A : ClassManifest](x: Array[A]) =
       new {
diff --git a/tests/disabled/macro/run/reify_inheritance.scala b/tests/disabled/macro/run/reify_inheritance.scala
index f4fb49edc78e..bbd0a46e48a0 100644
--- a/tests/disabled/macro/run/reify_inheritance.scala
+++ b/tests/disabled/macro/run/reify_inheritance.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class C {
       def x = 2
diff --git a/tests/disabled/macro/run/reify_inner1.scala b/tests/disabled/macro/run/reify_inner1.scala
index bae49f910a1b..9238bbb737cc 100644
--- a/tests/disabled/macro/run/reify_inner1.scala
+++ b/tests/disabled/macro/run/reify_inner1.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class C {
       class D {
diff --git a/tests/disabled/macro/run/reify_inner2.scala b/tests/disabled/macro/run/reify_inner2.scala
index fbe54b072b42..6616bae72e0f 100644
--- a/tests/disabled/macro/run/reify_inner2.scala
+++ b/tests/disabled/macro/run/reify_inner2.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class C {
       object D {
diff --git a/tests/disabled/macro/run/reify_inner3.scala b/tests/disabled/macro/run/reify_inner3.scala
index 004041b7dc22..859b63f9436f 100644
--- a/tests/disabled/macro/run/reify_inner3.scala
+++ b/tests/disabled/macro/run/reify_inner3.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     object C {
       class D {
diff --git a/tests/disabled/macro/run/reify_inner4.scala b/tests/disabled/macro/run/reify_inner4.scala
index 5292cf040f8a..e2fc921c55c2 100644
--- a/tests/disabled/macro/run/reify_inner4.scala
+++ b/tests/disabled/macro/run/reify_inner4.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     object C {
       object D {
diff --git a/tests/disabled/macro/run/reify_lazyevaluation.scala b/tests/disabled/macro/run/reify_lazyevaluation.scala
index 564e7f1cdf0e..3f2530ddee8c 100644
--- a/tests/disabled/macro/run/reify_lazyevaluation.scala
+++ b/tests/disabled/macro/run/reify_lazyevaluation.scala
@@ -3,7 +3,7 @@ import scala.language.{ implicitConversions }
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     object lazyLib {
 
diff --git a/tests/disabled/macro/run/reify_lazyunit.scala b/tests/disabled/macro/run/reify_lazyunit.scala
index 70caf4f33866..78b00cde2894 100644
--- a/tests/disabled/macro/run/reify_lazyunit.scala
+++ b/tests/disabled/macro/run/reify_lazyunit.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     lazy val x = { 0; println("12")}
     x
diff --git a/tests/disabled/macro/run/reify_maps_newpatmat.scala b/tests/disabled/macro/run/reify_maps_newpatmat.scala
index 18adb5c36a03..57c9d560ae45 100644
--- a/tests/disabled/macro/run/reify_maps_newpatmat.scala
+++ b/tests/disabled/macro/run/reify_maps_newpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val colors = Map("red" -> 0xFF0000,
                      "turquoise" -> 0x00FFFF,
diff --git a/tests/disabled/macro/run/reify_maps_oldpatmat.scala b/tests/disabled/macro/run/reify_maps_oldpatmat.scala
index 18adb5c36a03..57c9d560ae45 100644
--- a/tests/disabled/macro/run/reify_maps_oldpatmat.scala
+++ b/tests/disabled/macro/run/reify_maps_oldpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val colors = Map("red" -> 0xFF0000,
                      "turquoise" -> 0x00FFFF,
diff --git a/tests/disabled/macro/run/reify_metalevel_breach_+0_refers_to_1.scala b/tests/disabled/macro/run/reify_metalevel_breach_+0_refers_to_1.scala
index 2f930c25e692..3ca47c436024 100644
--- a/tests/disabled/macro/run/reify_metalevel_breach_+0_refers_to_1.scala
+++ b/tests/disabled/macro/run/reify_metalevel_breach_+0_refers_to_1.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify{
     val x = 2
     val inner = reify{x}
diff --git a/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_a.scala b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_a.scala
index 526ed3d13505..a8b45b3a46ae 100644
--- a/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_a.scala
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_a.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = 2
   val outer = reify{reify{x}}
 // was:  val code = reify{outer.splice.splice}
diff --git a/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_b.scala b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_b.scala
index 96793c6348d0..7378774ba22e 100644
--- a/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_b.scala
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_0_b.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = 2
   val code = reify{
     {
diff --git a/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_1.scala b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_1.scala
index 0fc985b6aac7..f2fb53400390 100644
--- a/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_1.scala
+++ b/tests/disabled/macro/run/reify_metalevel_breach_-1_refers_to_1.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify{
     val x = 2
     val inner = reify{reify{x}}
diff --git a/tests/disabled/macro/run/reify_nested_inner_refers_to_global.scala b/tests/disabled/macro/run/reify_nested_inner_refers_to_global.scala
index 41d378e91436..e9845732995e 100644
--- a/tests/disabled/macro/run/reify_nested_inner_refers_to_global.scala
+++ b/tests/disabled/macro/run/reify_nested_inner_refers_to_global.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = {
     val x = 2
     reify{
diff --git a/tests/disabled/macro/run/reify_nested_inner_refers_to_local.scala b/tests/disabled/macro/run/reify_nested_inner_refers_to_local.scala
index 102278c84e0f..802071ffbe07 100644
--- a/tests/disabled/macro/run/reify_nested_inner_refers_to_local.scala
+++ b/tests/disabled/macro/run/reify_nested_inner_refers_to_local.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify{
     val x = 2
 // was:    reify{x}.eval
diff --git a/tests/disabled/macro/run/reify_nested_outer_refers_to_global.scala b/tests/disabled/macro/run/reify_nested_outer_refers_to_global.scala
index bff5dc407ce7..374f8a536d38 100644
--- a/tests/disabled/macro/run/reify_nested_outer_refers_to_global.scala
+++ b/tests/disabled/macro/run/reify_nested_outer_refers_to_global.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = {
     val x = 2
     val outer = reify{x}
diff --git a/tests/disabled/macro/run/reify_nested_outer_refers_to_local.scala b/tests/disabled/macro/run/reify_nested_outer_refers_to_local.scala
index 70c400bc2cae..2d6fd64174b1 100644
--- a/tests/disabled/macro/run/reify_nested_outer_refers_to_local.scala
+++ b/tests/disabled/macro/run/reify_nested_outer_refers_to_local.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val outer = {
     val x = 2
     reify{x}
diff --git a/tests/disabled/macro/run/reify_newimpl_01.scala b/tests/disabled/macro/run/reify_newimpl_01.scala
index 1a5f96b539ba..20167da16fae 100644
--- a/tests/disabled/macro/run/reify_newimpl_01.scala
+++ b/tests/disabled/macro/run/reify_newimpl_01.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val x = 2
     val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_02.scala b/tests/disabled/macro/run/reify_newimpl_02.scala
index 1ef3f03ed5e7..4d72c780992a 100644
--- a/tests/disabled/macro/run/reify_newimpl_02.scala
+++ b/tests/disabled/macro/run/reify_newimpl_02.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var x = 2
     val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_03.scala b/tests/disabled/macro/run/reify_newimpl_03.scala
index 531bc76fe40a..2fbd89ccb2d5 100644
--- a/tests/disabled/macro/run/reify_newimpl_03.scala
+++ b/tests/disabled/macro/run/reify_newimpl_03.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val code = reify {
       val x = 2
diff --git a/tests/disabled/macro/run/reify_newimpl_04.scala b/tests/disabled/macro/run/reify_newimpl_04.scala
index b6071f843db7..c75207b30d2b 100644
--- a/tests/disabled/macro/run/reify_newimpl_04.scala
+++ b/tests/disabled/macro/run/reify_newimpl_04.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val code = reify {
       var x = 2
diff --git a/tests/disabled/macro/run/reify_newimpl_05.scala b/tests/disabled/macro/run/reify_newimpl_05.scala
index 0ff5bb07c933..758a296e3ffe 100644
--- a/tests/disabled/macro/run/reify_newimpl_05.scala
+++ b/tests/disabled/macro/run/reify_newimpl_05.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val code = reify {
       var x = 2
diff --git a/tests/disabled/macro/run/reify_newimpl_06.scala b/tests/disabled/macro/run/reify_newimpl_06.scala
index 8743da10033d..49022e962685 100644
--- a/tests/disabled/macro/run/reify_newimpl_06.scala
+++ b/tests/disabled/macro/run/reify_newimpl_06.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C(val y: Int) {
     val code = reify {
       reify{y}.eval
diff --git a/tests/disabled/macro/run/reify_newimpl_11.scala b/tests/disabled/macro/run/reify_newimpl_11.scala
index bb08808c2c72..9cc15747dbc7 100644
--- a/tests/disabled/macro/run/reify_newimpl_11.scala
+++ b/tests/disabled/macro/run/reify_newimpl_11.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C[T] {
     val code = reify {
       List[T](2.asInstanceOf[T])
diff --git a/tests/disabled/macro/run/reify_newimpl_12.scala b/tests/disabled/macro/run/reify_newimpl_12.scala
index c2b9d42ca65b..739f6ff6792a 100644
--- a/tests/disabled/macro/run/reify_newimpl_12.scala
+++ b/tests/disabled/macro/run/reify_newimpl_12.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C[T: TypeTag] {
     val code = reify {
       List[T](2.asInstanceOf[T])
diff --git a/tests/disabled/macro/run/reify_newimpl_13.scala b/tests/disabled/macro/run/reify_newimpl_13.scala
index 79a99c334ee3..5aa14aa553a0 100644
--- a/tests/disabled/macro/run/reify_newimpl_13.scala
+++ b/tests/disabled/macro/run/reify_newimpl_13.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     class C[T] {
       val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_14.scala b/tests/disabled/macro/run/reify_newimpl_14.scala
index af2c7f136231..547df10c0868 100644
--- a/tests/disabled/macro/run/reify_newimpl_14.scala
+++ b/tests/disabled/macro/run/reify_newimpl_14.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     class C[T: TypeTag] {
       val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_15.scala b/tests/disabled/macro/run/reify_newimpl_15.scala
index 4bcfc7107121..504cdf7c7034 100644
--- a/tests/disabled/macro/run/reify_newimpl_15.scala
+++ b/tests/disabled/macro/run/reify_newimpl_15.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C {
     type T = Int
     val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_18.scala b/tests/disabled/macro/run/reify_newimpl_18.scala
index e60bed8c77c9..7d6401c62f67 100644
--- a/tests/disabled/macro/run/reify_newimpl_18.scala
+++ b/tests/disabled/macro/run/reify_newimpl_18.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C[U: TypeTag] {
     type T = U
     val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_19.scala b/tests/disabled/macro/run/reify_newimpl_19.scala
index eaa6ca20669a..eca455279f90 100644
--- a/tests/disabled/macro/run/reify_newimpl_19.scala
+++ b/tests/disabled/macro/run/reify_newimpl_19.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C {
     type T
     val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_20.scala b/tests/disabled/macro/run/reify_newimpl_20.scala
index c483e0b7e0f5..b5c6499023ca 100644
--- a/tests/disabled/macro/run/reify_newimpl_20.scala
+++ b/tests/disabled/macro/run/reify_newimpl_20.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C {
     type T
     implicit val tt: TypeTag[T] = implicitly[TypeTag[Int]].asInstanceOf[TypeTag[T]]
diff --git a/tests/disabled/macro/run/reify_newimpl_21.scala b/tests/disabled/macro/run/reify_newimpl_21.scala
index 0875ede6ba14..ff78d9bb7909 100644
--- a/tests/disabled/macro/run/reify_newimpl_21.scala
+++ b/tests/disabled/macro/run/reify_newimpl_21.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   trait C {
     type T
     implicit val tt: TypeTag[T]
diff --git a/tests/disabled/macro/run/reify_newimpl_27.scala b/tests/disabled/macro/run/reify_newimpl_27.scala
index 332dbec91360..b9e95f5bddcd 100644
--- a/tests/disabled/macro/run/reify_newimpl_27.scala
+++ b/tests/disabled/macro/run/reify_newimpl_27.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object C {
     type T = Int
     val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_29.scala b/tests/disabled/macro/run/reify_newimpl_29.scala
index 1865075f44dc..ad4419bb67e6 100644
--- a/tests/disabled/macro/run/reify_newimpl_29.scala
+++ b/tests/disabled/macro/run/reify_newimpl_29.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C {
     type T = Int
     val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_30.scala b/tests/disabled/macro/run/reify_newimpl_30.scala
index afc199d5068c..bc34f1bb6cc7 100644
--- a/tests/disabled/macro/run/reify_newimpl_30.scala
+++ b/tests/disabled/macro/run/reify_newimpl_30.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.{ ToolBox, ToolBoxError }
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     class C {
       type T = Int
diff --git a/tests/disabled/macro/run/reify_newimpl_31.scala b/tests/disabled/macro/run/reify_newimpl_31.scala
index 535c9b67b3b5..55661753490d 100644
--- a/tests/disabled/macro/run/reify_newimpl_31.scala
+++ b/tests/disabled/macro/run/reify_newimpl_31.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object C {
     type T = Int
     val code = reify {
diff --git a/tests/disabled/macro/run/reify_newimpl_33.scala b/tests/disabled/macro/run/reify_newimpl_33.scala
index 55a808edadc1..523285445ffa 100644
--- a/tests/disabled/macro/run/reify_newimpl_33.scala
+++ b/tests/disabled/macro/run/reify_newimpl_33.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object C {
     type T = Int
     val c = C
diff --git a/tests/disabled/macro/run/reify_newimpl_36.scala b/tests/disabled/macro/run/reify_newimpl_36.scala
index 19f8617c69e6..df4799803ffb 100644
--- a/tests/disabled/macro/run/reify_newimpl_36.scala
+++ b/tests/disabled/macro/run/reify_newimpl_36.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val x = 42
     def foo() = reify(reify(x));
diff --git a/tests/disabled/macro/run/reify_newimpl_37.scala b/tests/disabled/macro/run/reify_newimpl_37.scala
index 5eeda212544d..c8ceba340703 100644
--- a/tests/disabled/macro/run/reify_newimpl_37.scala
+++ b/tests/disabled/macro/run/reify_newimpl_37.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val x = 42
     def foo() = reify(reify(reify(x)));
diff --git a/tests/disabled/macro/run/reify_newimpl_38.scala b/tests/disabled/macro/run/reify_newimpl_38.scala
index a313b7d8dd22..b3160f0183f8 100644
--- a/tests/disabled/macro/run/reify_newimpl_38.scala
+++ b/tests/disabled/macro/run/reify_newimpl_38.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val x = 42
     def foo() = reify{ val y = x; reify(y) };
diff --git a/tests/disabled/macro/run/reify_newimpl_39.scala b/tests/disabled/macro/run/reify_newimpl_39.scala
index 4b779fc07069..0568eb482476 100644
--- a/tests/disabled/macro/run/reify_newimpl_39.scala
+++ b/tests/disabled/macro/run/reify_newimpl_39.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val x = 42
     def foo() = reify{ val y = x; reify{ val z = y; reify(z) } };
diff --git a/tests/disabled/macro/run/reify_newimpl_40.scala b/tests/disabled/macro/run/reify_newimpl_40.scala
index 1bc37973f81d..0409f71ad9c9 100644
--- a/tests/disabled/macro/run/reify_newimpl_40.scala
+++ b/tests/disabled/macro/run/reify_newimpl_40.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val x = 42
     def foo() = reify{ val y = x; reify{ val z = y * x; reify(z * x) } };
diff --git a/tests/disabled/macro/run/reify_newimpl_41.scala b/tests/disabled/macro/run/reify_newimpl_41.scala
index 514e206a3f33..5eb5e5780f33 100644
--- a/tests/disabled/macro/run/reify_newimpl_41.scala
+++ b/tests/disabled/macro/run/reify_newimpl_41.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var _x = 42
     def x = { val x0 = _x; _x += 1; x0 }
diff --git a/tests/disabled/macro/run/reify_newimpl_42.scala b/tests/disabled/macro/run/reify_newimpl_42.scala
index 64c1cf3452c7..669932e422b2 100644
--- a/tests/disabled/macro/run/reify_newimpl_42.scala
+++ b/tests/disabled/macro/run/reify_newimpl_42.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var _x = 42
     def x = { val x0 = _x; _x += 1; x0 }
diff --git a/tests/disabled/macro/run/reify_newimpl_43.scala b/tests/disabled/macro/run/reify_newimpl_43.scala
index 736536cb30ce..823464015f50 100644
--- a/tests/disabled/macro/run/reify_newimpl_43.scala
+++ b/tests/disabled/macro/run/reify_newimpl_43.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var counter = 0
     lazy val x = { counter += 1; counter }
diff --git a/tests/disabled/macro/run/reify_newimpl_44.scala b/tests/disabled/macro/run/reify_newimpl_44.scala
index 736536cb30ce..823464015f50 100644
--- a/tests/disabled/macro/run/reify_newimpl_44.scala
+++ b/tests/disabled/macro/run/reify_newimpl_44.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var counter = 0
     lazy val x = { counter += 1; counter }
diff --git a/tests/disabled/macro/run/reify_newimpl_45.scala b/tests/disabled/macro/run/reify_newimpl_45.scala
index cfda46a6a3e9..148c3650aaad 100644
--- a/tests/disabled/macro/run/reify_newimpl_45.scala
+++ b/tests/disabled/macro/run/reify_newimpl_45.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import internal._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C[T >: Null] {
     val code = reify{val x: T = "2".asInstanceOf[T]; println("ima worx: %s".format(x)); x}
     println(freeTypes(code.tree))
diff --git a/tests/disabled/macro/run/reify_newimpl_47.scala b/tests/disabled/macro/run/reify_newimpl_47.scala
index c0ad6cbe5a00..b78189399932 100644
--- a/tests/disabled/macro/run/reify_newimpl_47.scala
+++ b/tests/disabled/macro/run/reify_newimpl_47.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val outer = {
     val x = 2
     reify{x}
diff --git a/tests/disabled/macro/run/reify_newimpl_48.scala b/tests/disabled/macro/run/reify_newimpl_48.scala
index 7d1c1d642445..5ad7eb961169 100644
--- a/tests/disabled/macro/run/reify_newimpl_48.scala
+++ b/tests/disabled/macro/run/reify_newimpl_48.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val outer1 = {
     val x = 2
     reify{x}
diff --git a/tests/disabled/macro/run/reify_newimpl_49.scala b/tests/disabled/macro/run/reify_newimpl_49.scala
index 61ddfafa3601..957c5bbde76a 100644
--- a/tests/disabled/macro/run/reify_newimpl_49.scala
+++ b/tests/disabled/macro/run/reify_newimpl_49.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var y = 1
     def x = { y += 2; y }
diff --git a/tests/disabled/macro/run/reify_newimpl_50.scala b/tests/disabled/macro/run/reify_newimpl_50.scala
index 8ecdeb55c778..64d52eb50bf3 100644
--- a/tests/disabled/macro/run/reify_newimpl_50.scala
+++ b/tests/disabled/macro/run/reify_newimpl_50.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var y = 1
     def x = { y += 2; y }
diff --git a/tests/disabled/macro/run/reify_newimpl_51.scala b/tests/disabled/macro/run/reify_newimpl_51.scala
index 8a4a325f033d..011d9a6cebc8 100644
--- a/tests/disabled/macro/run/reify_newimpl_51.scala
+++ b/tests/disabled/macro/run/reify_newimpl_51.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var counter = 0
     lazy val x = { counter += 1; counter }
diff --git a/tests/disabled/macro/run/reify_newimpl_52.scala b/tests/disabled/macro/run/reify_newimpl_52.scala
index 4dc82b145261..8b473ffcf797 100644
--- a/tests/disabled/macro/run/reify_newimpl_52.scala
+++ b/tests/disabled/macro/run/reify_newimpl_52.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     var counter = 0
     lazy val x = { counter += 1; counter }
diff --git a/tests/disabled/macro/run/reify_printf.scala b/tests/disabled/macro/run/reify_printf.scala
index b957c41bb93a..c4ade7983740 100644
--- a/tests/disabled/macro/run/reify_printf.scala
+++ b/tests/disabled/macro/run/reify_printf.scala
@@ -8,7 +8,7 @@ import scala.reflect.api.Trees
 import scala.reflect.internal.Types
 import scala.util.matching.Regex
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   //val output = new ByteArrayOutputStream()
   //Console.setOut(new PrintStream(output))
   val toolbox = cm.mkToolBox()
diff --git a/tests/disabled/macro/run/reify_properties.scala b/tests/disabled/macro/run/reify_properties.scala
index b6ce5f305312..01a9b12a9295 100644
--- a/tests/disabled/macro/run/reify_properties.scala
+++ b/tests/disabled/macro/run/reify_properties.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     /** A mutable property whose getter and setter may be customized. */
     case class Property[T](init: T) {
diff --git a/tests/disabled/macro/run/reify_renamed_term_basic.scala b/tests/disabled/macro/run/reify_renamed_term_basic.scala
index 7971d3d11778..563ce1e8cf83 100644
--- a/tests/disabled/macro/run/reify_renamed_term_basic.scala
+++ b/tests/disabled/macro/run/reify_renamed_term_basic.scala
@@ -7,7 +7,7 @@ object A {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import A.{B => X}
   import A.B.{c => y}
   import X.{c => z}
diff --git a/tests/disabled/macro/run/reify_renamed_term_local_to_reifee.scala b/tests/disabled/macro/run/reify_renamed_term_local_to_reifee.scala
index b9327937620d..44725ff435a0 100644
--- a/tests/disabled/macro/run/reify_renamed_term_local_to_reifee.scala
+++ b/tests/disabled/macro/run/reify_renamed_term_local_to_reifee.scala
@@ -7,7 +7,7 @@ object A {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val expr = reify {
     import A.{B => X}
     import A.B.{c => y}
diff --git a/tests/disabled/macro/run/reify_renamed_term_overloaded_method.scala b/tests/disabled/macro/run/reify_renamed_term_overloaded_method.scala
index 1f78976792a1..a93c8f60fd89 100644
--- a/tests/disabled/macro/run/reify_renamed_term_overloaded_method.scala
+++ b/tests/disabled/macro/run/reify_renamed_term_overloaded_method.scala
@@ -6,7 +6,7 @@ object O {
   def show(s: String) = s
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import O.{show => s}
 
   val expr = reify {
diff --git a/tests/disabled/macro/run/reify_renamed_term_t5841.scala b/tests/disabled/macro/run/reify_renamed_term_t5841.scala
index d4c051c1bf00..551d5afe59b1 100644
--- a/tests/disabled/macro/run/reify_renamed_term_t5841.scala
+++ b/tests/disabled/macro/run/reify_renamed_term_t5841.scala
@@ -2,6 +2,6 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{universe => ru}
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(reify{ru}.eval.getClass)
 }
diff --git a/tests/disabled/macro/run/reify_renamed_type_basic.scala b/tests/disabled/macro/run/reify_renamed_type_basic.scala
index 50506e1442ca..1666c9687cbe 100644
--- a/tests/disabled/macro/run/reify_renamed_type_basic.scala
+++ b/tests/disabled/macro/run/reify_renamed_type_basic.scala
@@ -5,7 +5,7 @@ object O {
   type A = Unit
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import O.{A => X}
 
   def expr = reify {
diff --git a/tests/disabled/macro/run/reify_renamed_type_local_to_reifee.scala b/tests/disabled/macro/run/reify_renamed_type_local_to_reifee.scala
index 01280e99319b..56dfa881cc6f 100644
--- a/tests/disabled/macro/run/reify_renamed_type_local_to_reifee.scala
+++ b/tests/disabled/macro/run/reify_renamed_type_local_to_reifee.scala
@@ -5,7 +5,7 @@ object O {
   type A = Unit
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val expr = reify {
     import O.{A => X}
 
diff --git a/tests/disabled/macro/run/reify_renamed_type_spliceable.scala b/tests/disabled/macro/run/reify_renamed_type_spliceable.scala
index 6a34d17227c2..73de3cc160a9 100644
--- a/tests/disabled/macro/run/reify_renamed_type_spliceable.scala
+++ b/tests/disabled/macro/run/reify_renamed_type_spliceable.scala
@@ -5,7 +5,7 @@ abstract class C {
   type T >: Null
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(c: C) = {
     import c.{T => U}
     reify {
diff --git a/tests/disabled/macro/run/reify_sort.scala b/tests/disabled/macro/run/reify_sort.scala
index b484111edd97..867f33c3368b 100644
--- a/tests/disabled/macro/run/reify_sort.scala
+++ b/tests/disabled/macro/run/reify_sort.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     /** Nested methods can use and even update everything
      *  visible in their scope (including local variables or
diff --git a/tests/disabled/macro/run/reify_sort1.scala b/tests/disabled/macro/run/reify_sort1.scala
index 24ca06283528..27bf1ba28e9e 100644
--- a/tests/disabled/macro/run/reify_sort1.scala
+++ b/tests/disabled/macro/run/reify_sort1.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     def sort(a: List[Int]): List[Int] = {
       if (a.length < 2)
diff --git a/tests/disabled/macro/run/reify_this.scala b/tests/disabled/macro/run/reify_this.scala
index 339fcca54153..c385da63600a 100644
--- a/tests/disabled/macro/run/reify_this.scala
+++ b/tests/disabled/macro/run/reify_this.scala
@@ -5,7 +5,7 @@ trait Transvaal {
   def eval(tree: Expr[_]) = tree.eval
 }
 
-object Test extends dotty.runtime.LegacyApp with Transvaal {
+object Test extends App with Transvaal {
   // select a value from package
   eval(reify{println("foo")})
   eval(reify{println((new Object).toString == (new Object).toString)})
diff --git a/tests/disabled/macro/run/reify_timeofday.scala b/tests/disabled/macro/run/reify_timeofday.scala
index ff30a962b451..44b428d7c9a0 100644
--- a/tests/disabled/macro/run/reify_timeofday.scala
+++ b/tests/disabled/macro/run/reify_timeofday.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class DateError extends Exception
 
diff --git a/tests/disabled/macro/run/reify_typerefs_1a.scala b/tests/disabled/macro/run/reify_typerefs_1a.scala
index b4f608a950ac..a4ea4f92344f 100644
--- a/tests/disabled/macro/run/reify_typerefs_1a.scala
+++ b/tests/disabled/macro/run/reify_typerefs_1a.scala
@@ -7,7 +7,7 @@ class Expression {
   override def toString = "Expression"
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     List(new Expression, new Expression)
   };
diff --git a/tests/disabled/macro/run/reify_typerefs_1b.scala b/tests/disabled/macro/run/reify_typerefs_1b.scala
index 7c4d025f0bbc..ecc8d2b9b40a 100644
--- a/tests/disabled/macro/run/reify_typerefs_1b.scala
+++ b/tests/disabled/macro/run/reify_typerefs_1b.scala
@@ -7,7 +7,7 @@ object Expression {
   override def toString = "Expression"
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     List(Expression, Expression)
   };
diff --git a/tests/disabled/macro/run/reify_typerefs_2a.scala b/tests/disabled/macro/run/reify_typerefs_2a.scala
index a2d5676c07ba..3a3fcc41e510 100644
--- a/tests/disabled/macro/run/reify_typerefs_2a.scala
+++ b/tests/disabled/macro/run/reify_typerefs_2a.scala
@@ -9,7 +9,7 @@ package foo {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     List(new foo.Expression, new foo.Expression)
   };
diff --git a/tests/disabled/macro/run/reify_typerefs_2b.scala b/tests/disabled/macro/run/reify_typerefs_2b.scala
index f5543eaf6bca..26c44d03c1e5 100644
--- a/tests/disabled/macro/run/reify_typerefs_2b.scala
+++ b/tests/disabled/macro/run/reify_typerefs_2b.scala
@@ -9,7 +9,7 @@ package foo {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     List(foo.Expression, foo.Expression)
   };
diff --git a/tests/disabled/macro/run/reify_typerefs_3a.scala b/tests/disabled/macro/run/reify_typerefs_3a.scala
index 8d81721f1be9..217dab3936da 100644
--- a/tests/disabled/macro/run/reify_typerefs_3a.scala
+++ b/tests/disabled/macro/run/reify_typerefs_3a.scala
@@ -9,7 +9,7 @@ object foo {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     List(new foo.Expression, new foo.Expression)
   };
diff --git a/tests/disabled/macro/run/reify_typerefs_3b.scala b/tests/disabled/macro/run/reify_typerefs_3b.scala
index 212f40fc04d9..2967c129f68e 100644
--- a/tests/disabled/macro/run/reify_typerefs_3b.scala
+++ b/tests/disabled/macro/run/reify_typerefs_3b.scala
@@ -9,7 +9,7 @@ object foo {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     List(foo.Expression, foo.Expression)
   };
diff --git a/tests/disabled/macro/run/reify_varargs.scala b/tests/disabled/macro/run/reify_varargs.scala
index 36777fe98ca2..d157149b467e 100644
--- a/tests/disabled/macro/run/reify_varargs.scala
+++ b/tests/disabled/macro/run/reify_varargs.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val msg = java.text.MessageFormat.format(
       "On {1} there was {2} on planet {0}.",
diff --git a/tests/disabled/macro/run/runtimeEval1.scala b/tests/disabled/macro/run/runtimeEval1.scala
index 0202dfd06322..84861c6c8f2d 100644
--- a/tests/disabled/macro/run/runtimeEval1.scala
+++ b/tests/disabled/macro/run/runtimeEval1.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val x = 2
     println(x)
diff --git a/tests/disabled/macro/run/runtimeEval2.scala b/tests/disabled/macro/run/runtimeEval2.scala
index 2708f9dbc9d6..a566487c5b8a 100644
--- a/tests/disabled/macro/run/runtimeEval2.scala
+++ b/tests/disabled/macro/run/runtimeEval2.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = 2
   val outer = reify{reify{x}}
   println(outer.eval.eval)
diff --git a/tests/disabled/macro/run/showdecl/Test_2.scala b/tests/disabled/macro/run/showdecl/Test_2.scala
index fc212ab05470..6eb64baf3406 100644
--- a/tests/disabled/macro/run/showdecl/Test_2.scala
+++ b/tests/disabled/macro/run/showdecl/Test_2.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(sym: Symbol): Unit = {
     println(s"autoinitialized ${sym.name}: ${showDecl(sym)}")
     sym.info
diff --git a/tests/disabled/macro/run/showraw_mods.scala b/tests/disabled/macro/run/showraw_mods.scala
index 872685c37ec9..77d80f57f6eb 100644
--- a/tests/disabled/macro/run/showraw_mods.scala
+++ b/tests/disabled/macro/run/showraw_mods.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree = reify{trait C { private[this] val x = 2; var y = x; lazy val z = y }}
   println(showRaw(tree.tree))
 }
diff --git a/tests/disabled/macro/run/showraw_tree.scala b/tests/disabled/macro/run/showraw_tree.scala
index fbd4c1dfaa25..8f3999a35df0 100644
--- a/tests/disabled/macro/run/showraw_tree.scala
+++ b/tests/disabled/macro/run/showraw_tree.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree1 = reify(new collection.immutable.HashMap[String, String])
   val tree2 = reify(new collection.mutable.HashMap[String, String])
   println(showRaw(tree1.tree))
diff --git a/tests/disabled/macro/run/showraw_tree_ids.scala b/tests/disabled/macro/run/showraw_tree_ids.scala
index 739ea55b5f6c..8b44a88757d0 100644
--- a/tests/disabled/macro/run/showraw_tree_ids.scala
+++ b/tests/disabled/macro/run/showraw_tree_ids.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree1 = reify(new collection.immutable.HashMap[String, String])
   val tree2 = reify(new collection.mutable.HashMap[String, String])
   def stabilize(s: String) = """#\d+""".r.replaceAllIn(s, "#<id>")
diff --git a/tests/disabled/macro/run/showraw_tree_kinds.scala b/tests/disabled/macro/run/showraw_tree_kinds.scala
index 0891015ac552..bfb0094f5eaf 100644
--- a/tests/disabled/macro/run/showraw_tree_kinds.scala
+++ b/tests/disabled/macro/run/showraw_tree_kinds.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree1 = reify(new collection.immutable.HashMap[String, String])
   val tree2 = reify(new collection.mutable.HashMap[String, String])
   println(showRaw(tree1.tree, printKinds = true))
diff --git a/tests/disabled/macro/run/showraw_tree_types_ids.scala b/tests/disabled/macro/run/showraw_tree_types_ids.scala
index 30f51c549b97..5d60d904956d 100644
--- a/tests/disabled/macro/run/showraw_tree_types_ids.scala
+++ b/tests/disabled/macro/run/showraw_tree_types_ids.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = runtimeMirror(getClass.getClassLoader).mkToolBox()
   val tree1 = reify(new collection.immutable.HashMap[String, String])
   val tree2 = reify(new collection.mutable.HashMap[String, String])
diff --git a/tests/disabled/macro/run/showraw_tree_types_typed.scala b/tests/disabled/macro/run/showraw_tree_types_typed.scala
index e24eac9f83c3..6d52a23b0115 100644
--- a/tests/disabled/macro/run/showraw_tree_types_typed.scala
+++ b/tests/disabled/macro/run/showraw_tree_types_typed.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = runtimeMirror(getClass.getClassLoader).mkToolBox()
   val tree1 = reify(new collection.immutable.HashMap[String, String])
   val tree2 = reify(new collection.mutable.HashMap[String, String])
diff --git a/tests/disabled/macro/run/showraw_tree_types_untyped.scala b/tests/disabled/macro/run/showraw_tree_types_untyped.scala
index 87dfd72420e6..5feea3e6252f 100644
--- a/tests/disabled/macro/run/showraw_tree_types_untyped.scala
+++ b/tests/disabled/macro/run/showraw_tree_types_untyped.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree1 = reify(new collection.immutable.HashMap[String, String])
   val tree2 = reify(new collection.mutable.HashMap[String, String])
   println(showRaw(tree1.tree, printTypes = true))
diff --git a/tests/disabled/macro/run/showraw_tree_ultimate.scala b/tests/disabled/macro/run/showraw_tree_ultimate.scala
index 0a97622ad84d..5d39f176cac4 100644
--- a/tests/disabled/macro/run/showraw_tree_ultimate.scala
+++ b/tests/disabled/macro/run/showraw_tree_ultimate.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = runtimeMirror(getClass.getClassLoader).mkToolBox()
   val tree1 = reify(new collection.immutable.HashMap[String, String])
   val tree2 = reify(new collection.mutable.HashMap[String, String])
diff --git a/tests/disabled/macro/run/t5224.scala b/tests/disabled/macro/run/t5224.scala
index d0cd9a455e4b..5e92d4e04b38 100644
--- a/tests/disabled/macro/run/t5224.scala
+++ b/tests/disabled/macro/run/t5224.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 
 class Foo(bar: String) extends annotation.ClassfileAnnotation
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree = reify{@Foo(bar = "qwe") class C}.tree
   println(tree.toString)
 }
diff --git a/tests/disabled/macro/run/t5225_1.scala b/tests/disabled/macro/run/t5225_1.scala
index a553e83ceaab..68134ea144fe 100644
--- a/tests/disabled/macro/run/t5225_1.scala
+++ b/tests/disabled/macro/run/t5225_1.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree = reify{@transient @volatile var x = 2}.tree
   println(tree.toString)
 }
diff --git a/tests/disabled/macro/run/t5225_2.scala b/tests/disabled/macro/run/t5225_2.scala
index 54e7fec1ff24..30f08d64045b 100644
--- a/tests/disabled/macro/run/t5225_2.scala
+++ b/tests/disabled/macro/run/t5225_2.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree = reify{def foo(@annotation.elidable(0) x: Int) = ""}.tree
   println(tree.toString)
 }
diff --git a/tests/disabled/macro/run/t5229_1.scala b/tests/disabled/macro/run/t5229_1.scala
index 62341fdbb1df..218b0e8670d1 100644
--- a/tests/disabled/macro/run/t5229_1.scala
+++ b/tests/disabled/macro/run/t5229_1.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     object C
   }.eval
diff --git a/tests/disabled/macro/run/t5229_2.scala b/tests/disabled/macro/run/t5229_2.scala
index a9cd089479a3..39ee15666420 100644
--- a/tests/disabled/macro/run/t5229_2.scala
+++ b/tests/disabled/macro/run/t5229_2.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     object C {
       val x = 2
diff --git a/tests/disabled/macro/run/t5230.scala b/tests/disabled/macro/run/t5230.scala
index 5c934c3452f9..3b5b7c24b7f8 100644
--- a/tests/disabled/macro/run/t5230.scala
+++ b/tests/disabled/macro/run/t5230.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     class C {
       val x = 2
diff --git a/tests/disabled/macro/run/t5258a.scala b/tests/disabled/macro/run/t5258a.scala
index 5a22a251c2a1..4eaa0a58dfcf 100644
--- a/tests/disabled/macro/run/t5258a.scala
+++ b/tests/disabled/macro/run/t5258a.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     println(classOf[Int])
   }.eval
diff --git a/tests/disabled/macro/run/t5266_1.scala b/tests/disabled/macro/run/t5266_1.scala
index 5ed943ee678b..df94bda3df31 100644
--- a/tests/disabled/macro/run/t5266_1.scala
+++ b/tests/disabled/macro/run/t5266_1.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     def x = 2
     println(x)
diff --git a/tests/disabled/macro/run/t5266_2.scala b/tests/disabled/macro/run/t5266_2.scala
index c8c3ab82457d..a876aa384bdf 100644
--- a/tests/disabled/macro/run/t5266_2.scala
+++ b/tests/disabled/macro/run/t5266_2.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     def x = 2
     def y = x
diff --git a/tests/disabled/macro/run/t5269.scala b/tests/disabled/macro/run/t5269.scala
index dbaa1d1d8a24..bede89aa0138 100644
--- a/tests/disabled/macro/run/t5269.scala
+++ b/tests/disabled/macro/run/t5269.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     trait Z {
       val z = 2
diff --git a/tests/disabled/macro/run/t5270.scala b/tests/disabled/macro/run/t5270.scala
index 03ba765fde27..6dc0cd8989b2 100644
--- a/tests/disabled/macro/run/t5270.scala
+++ b/tests/disabled/macro/run/t5270.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class Y {
       def y = 100
diff --git a/tests/disabled/macro/run/t5271_1.scala b/tests/disabled/macro/run/t5271_1.scala
index cdae3df581e7..5c7b2607bfc3 100644
--- a/tests/disabled/macro/run/t5271_1.scala
+++ b/tests/disabled/macro/run/t5271_1.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     case class C(foo: Int, bar: Int)
   };
diff --git a/tests/disabled/macro/run/t5271_2.scala b/tests/disabled/macro/run/t5271_2.scala
index 654fa7b30b48..12073b3b93c6 100644
--- a/tests/disabled/macro/run/t5271_2.scala
+++ b/tests/disabled/macro/run/t5271_2.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     case class C(foo: Int, bar: Int)
     val c = C(2, 2)
diff --git a/tests/disabled/macro/run/t5271_3.scala b/tests/disabled/macro/run/t5271_3.scala
index 2fa4cea77b33..d05f4e5f491c 100644
--- a/tests/disabled/macro/run/t5271_3.scala
+++ b/tests/disabled/macro/run/t5271_3.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     object C { def qwe = 4 }
     case class C(foo: Int, bar: Int)
diff --git a/tests/disabled/macro/run/t5271_4.scala b/tests/disabled/macro/run/t5271_4.scala
index 03cca7c48ddb..a1519b713ac3 100644
--- a/tests/disabled/macro/run/t5271_4.scala
+++ b/tests/disabled/macro/run/t5271_4.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     case object C
   }.eval
diff --git a/tests/disabled/macro/run/t5272_1_newpatmat.scala b/tests/disabled/macro/run/t5272_1_newpatmat.scala
index 30d0c875d96b..5a3cf2abb75f 100644
--- a/tests/disabled/macro/run/t5272_1_newpatmat.scala
+++ b/tests/disabled/macro/run/t5272_1_newpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     2 match {
       case 2 => println("okay")
diff --git a/tests/disabled/macro/run/t5272_1_oldpatmat.scala b/tests/disabled/macro/run/t5272_1_oldpatmat.scala
index 30d0c875d96b..5a3cf2abb75f 100644
--- a/tests/disabled/macro/run/t5272_1_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5272_1_oldpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     2 match {
       case 2 => println("okay")
diff --git a/tests/disabled/macro/run/t5272_2_newpatmat.scala b/tests/disabled/macro/run/t5272_2_newpatmat.scala
index 436f0fd4f843..cb9037ca84a0 100644
--- a/tests/disabled/macro/run/t5272_2_newpatmat.scala
+++ b/tests/disabled/macro/run/t5272_2_newpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     2 match {
       case x => println("okay" + x)
diff --git a/tests/disabled/macro/run/t5272_2_oldpatmat.scala b/tests/disabled/macro/run/t5272_2_oldpatmat.scala
index 436f0fd4f843..cb9037ca84a0 100644
--- a/tests/disabled/macro/run/t5272_2_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5272_2_oldpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     2 match {
       case x => println("okay" + x)
diff --git a/tests/disabled/macro/run/t5273_1_newpatmat.scala b/tests/disabled/macro/run/t5273_1_newpatmat.scala
index 1ed2ce79af97..8eec4de27897 100644
--- a/tests/disabled/macro/run/t5273_1_newpatmat.scala
+++ b/tests/disabled/macro/run/t5273_1_newpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     List(1, 2, 3) match {
       case foo :: bar :: _ => println(foo * bar)
diff --git a/tests/disabled/macro/run/t5273_1_oldpatmat.scala b/tests/disabled/macro/run/t5273_1_oldpatmat.scala
index 1ed2ce79af97..8eec4de27897 100644
--- a/tests/disabled/macro/run/t5273_1_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5273_1_oldpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     List(1, 2, 3) match {
       case foo :: bar :: _ => println(foo * bar)
diff --git a/tests/disabled/macro/run/t5273_2a_newpatmat.scala b/tests/disabled/macro/run/t5273_2a_newpatmat.scala
index cb4c151462b4..03bf3da81a52 100644
--- a/tests/disabled/macro/run/t5273_2a_newpatmat.scala
+++ b/tests/disabled/macro/run/t5273_2a_newpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val foo :: bar :: _ = List(1, 2, 3)
     println(foo * bar)
diff --git a/tests/disabled/macro/run/t5273_2a_oldpatmat.scala b/tests/disabled/macro/run/t5273_2a_oldpatmat.scala
index cb4c151462b4..03bf3da81a52 100644
--- a/tests/disabled/macro/run/t5273_2a_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5273_2a_oldpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val foo :: bar :: _ = List(1, 2, 3)
     println(foo * bar)
diff --git a/tests/disabled/macro/run/t5273_2b_newpatmat.scala b/tests/disabled/macro/run/t5273_2b_newpatmat.scala
index ca4a31566dc8..2a5ec7752ebf 100644
--- a/tests/disabled/macro/run/t5273_2b_newpatmat.scala
+++ b/tests/disabled/macro/run/t5273_2b_newpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val RegexParser = """(.*) \d+([A-Z]+) \| (.*) \|.*""".r
     val RegexParser(name, shortname, value) = "American Dollar 1USD | 2,8567 | sometext"
diff --git a/tests/disabled/macro/run/t5273_2b_oldpatmat.scala b/tests/disabled/macro/run/t5273_2b_oldpatmat.scala
index ca4a31566dc8..2a5ec7752ebf 100644
--- a/tests/disabled/macro/run/t5273_2b_oldpatmat.scala
+++ b/tests/disabled/macro/run/t5273_2b_oldpatmat.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     val RegexParser = """(.*) \d+([A-Z]+) \| (.*) \|.*""".r
     val RegexParser(name, shortname, value) = "American Dollar 1USD | 2,8567 | sometext"
diff --git a/tests/disabled/macro/run/t5274_1.scala b/tests/disabled/macro/run/t5274_1.scala
index bc0ba99e45a1..00de442a97c3 100644
--- a/tests/disabled/macro/run/t5274_1.scala
+++ b/tests/disabled/macro/run/t5274_1.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     def factorial(n: BigInt): BigInt =
       if (n == 0) 1 else n * factorial(n-1)
diff --git a/tests/disabled/macro/run/t5274_2.scala b/tests/disabled/macro/run/t5274_2.scala
index b484111edd97..867f33c3368b 100644
--- a/tests/disabled/macro/run/t5274_2.scala
+++ b/tests/disabled/macro/run/t5274_2.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     /** Nested methods can use and even update everything
      *  visible in their scope (including local variables or
diff --git a/tests/disabled/macro/run/t5275.scala b/tests/disabled/macro/run/t5275.scala
index 38b77abab9be..a749c57c87f5 100644
--- a/tests/disabled/macro/run/t5275.scala
+++ b/tests/disabled/macro/run/t5275.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class C(val foo: Int)
     println(new C(2).foo)
diff --git a/tests/disabled/macro/run/t5276_1a.scala b/tests/disabled/macro/run/t5276_1a.scala
index ad76b2e69fcf..3173fb1dd18e 100644
--- a/tests/disabled/macro/run/t5276_1a.scala
+++ b/tests/disabled/macro/run/t5276_1a.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     lazy val x = 2
     println(x)
diff --git a/tests/disabled/macro/run/t5276_1b.scala b/tests/disabled/macro/run/t5276_1b.scala
index 8f11bdc6e6c7..d2e194567071 100644
--- a/tests/disabled/macro/run/t5276_1b.scala
+++ b/tests/disabled/macro/run/t5276_1b.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     implicit lazy val x = 2
     println(implicitly[Int])
diff --git a/tests/disabled/macro/run/t5276_2a.scala b/tests/disabled/macro/run/t5276_2a.scala
index 7086fc98306f..dbb263314cf4 100644
--- a/tests/disabled/macro/run/t5276_2a.scala
+++ b/tests/disabled/macro/run/t5276_2a.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class C {
       lazy val x = 2
diff --git a/tests/disabled/macro/run/t5276_2b.scala b/tests/disabled/macro/run/t5276_2b.scala
index cccc76a2d3a4..9cc789ec22c8 100644
--- a/tests/disabled/macro/run/t5276_2b.scala
+++ b/tests/disabled/macro/run/t5276_2b.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class C {
       implicit lazy val x = 2
diff --git a/tests/disabled/macro/run/t5277_1.scala b/tests/disabled/macro/run/t5277_1.scala
index 58009866600a..65232967c290 100644
--- a/tests/disabled/macro/run/t5277_1.scala
+++ b/tests/disabled/macro/run/t5277_1.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
 import scala.language.{ implicitConversions, postfixOps }
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     def fact(n: Int): BigInt =
       if (n == 0) 1 else fact(n-1) * n
diff --git a/tests/disabled/macro/run/t5277_2.scala b/tests/disabled/macro/run/t5277_2.scala
index 33e31da27328..f045312a38ae 100644
--- a/tests/disabled/macro/run/t5277_2.scala
+++ b/tests/disabled/macro/run/t5277_2.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     def p(implicit i: Int) = print(i)
     implicit val v = 2
diff --git a/tests/disabled/macro/run/t5279.scala b/tests/disabled/macro/run/t5279.scala
index ed151020455c..3688efaac835 100644
--- a/tests/disabled/macro/run/t5279.scala
+++ b/tests/disabled/macro/run/t5279.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     println(new Integer(10))
   }.eval
diff --git a/tests/disabled/macro/run/t5334_1.scala b/tests/disabled/macro/run/t5334_1.scala
index 58954c2f98dd..537187f88f86 100644
--- a/tests/disabled/macro/run/t5334_1.scala
+++ b/tests/disabled/macro/run/t5334_1.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     class C { override def toString = "C" }
     val ret = new C
diff --git a/tests/disabled/macro/run/t5334_2.scala b/tests/disabled/macro/run/t5334_2.scala
index 1058194056d0..0246dc31bb57 100644
--- a/tests/disabled/macro/run/t5334_2.scala
+++ b/tests/disabled/macro/run/t5334_2.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     class C { override def toString() = "C" }
     val ret = List((new C, new C))
diff --git a/tests/disabled/macro/run/t5335.scala b/tests/disabled/macro/run/t5335.scala
index c85c5730e6d8..3405ce0039ea 100644
--- a/tests/disabled/macro/run/t5335.scala
+++ b/tests/disabled/macro/run/t5335.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     println(new {def x = 2}.x)
   }.eval
diff --git a/tests/disabled/macro/run/t5415.scala b/tests/disabled/macro/run/t5415.scala
index cdc90b8aed5d..65de86245bba 100644
--- a/tests/disabled/macro/run/t5415.scala
+++ b/tests/disabled/macro/run/t5415.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   case class Queryable2[T]() { def filter(predicate: T => Boolean) = ??? }
   trait CoffeesTable{ def sales : Int }
   val q = Queryable2[CoffeesTable]()
diff --git a/tests/disabled/macro/run/t5418.scala b/tests/disabled/macro/run/t5418.scala
index beec4370d59e..f1ebe8fb3242 100644
--- a/tests/disabled/macro/run/t5418.scala
+++ b/tests/disabled/macro/run/t5418.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     new Object().getClass
   }.eval
diff --git a/tests/disabled/macro/run/t5418a.scala b/tests/disabled/macro/run/t5418a.scala
index 7223486851b6..a9c9204aa0a3 100644
--- a/tests/disabled/macro/run/t5418a.scala
+++ b/tests/disabled/macro/run/t5418a.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(scala.reflect.runtime.universe.reify(new Object().getClass))
 }
diff --git a/tests/disabled/macro/run/t5418b.scala b/tests/disabled/macro/run/t5418b.scala
index 650700ae26fd..f74730e46761 100644
--- a/tests/disabled/macro/run/t5418b.scala
+++ b/tests/disabled/macro/run/t5418b.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val untyped = reify(new Object().getClass).tree
   val typed = tb.typecheck(untyped)
diff --git a/tests/disabled/macro/run/t5419.scala b/tests/disabled/macro/run/t5419.scala
index e0ee02a5cbe9..d8ca28640f0a 100644
--- a/tests/disabled/macro/run/t5419.scala
+++ b/tests/disabled/macro/run/t5419.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 
 class Foo extends annotation.StaticAnnotation
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tree = reify{(5: @Foo).asInstanceOf[Int]}.tree
   println(tree.toString)
 }
diff --git a/tests/disabled/macro/run/t5704.scala b/tests/disabled/macro/run/t5704.scala
index b9765ebb62ec..f2cb8f375705 100644
--- a/tests/disabled/macro/run/t5704.scala
+++ b/tests/disabled/macro/run/t5704.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class MyQuerycollection{
     def findUserByName( name:String ) = {
       val tree = reify{ "test" == name }.tree
diff --git a/tests/disabled/macro/run/t5710-1.scala b/tests/disabled/macro/run/t5710-1.scala
index 5548ca4cabc3..29100ebb24b6 100644
--- a/tests/disabled/macro/run/t5710-1.scala
+++ b/tests/disabled/macro/run/t5710-1.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     val (x, y) = ("abc": Any) match { case x => (x, x) }
     (x, y)
diff --git a/tests/disabled/macro/run/t5710-2.scala b/tests/disabled/macro/run/t5710-2.scala
index c5129ce34e4f..4eb53893f763 100644
--- a/tests/disabled/macro/run/t5710-2.scala
+++ b/tests/disabled/macro/run/t5710-2.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     val (x, y) = "abc" match { case x => (x, x) }
     (x, y)
diff --git a/tests/disabled/macro/run/t5713/Test_2.scala b/tests/disabled/macro/run/t5713/Test_2.scala
index 7e4d02a80e65..24f9e79b11f1 100644
--- a/tests/disabled/macro/run/t5713/Test_2.scala
+++ b/tests/disabled/macro/run/t5713/Test_2.scala
@@ -1,5 +1,5 @@
 import m._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Logger.error("err")
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t5753_1/Test_2.scala b/tests/disabled/macro/run/t5753_1/Test_2.scala
index 413eefff320e..864d356fdbe9 100644
--- a/tests/disabled/macro/run/t5753_1/Test_2.scala
+++ b/tests/disabled/macro/run/t5753_1/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
     import Macros._
     println(foo(42))
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t5753_2/Test_2.scala b/tests/disabled/macro/run/t5753_2/Test_2.scala
index 413eefff320e..864d356fdbe9 100644
--- a/tests/disabled/macro/run/t5753_2/Test_2.scala
+++ b/tests/disabled/macro/run/t5753_2/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
     import Macros._
     println(foo(42))
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t5770.scala b/tests/disabled/macro/run/t5770.scala
index 409efb2d1899..b6c9236844e9 100644
--- a/tests/disabled/macro/run/t5770.scala
+++ b/tests/disabled/macro/run/t5770.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   var i = 0
   val action = reify { i += 1; println(i) }.tree
 
diff --git a/tests/disabled/macro/run/t5816.scala b/tests/disabled/macro/run/t5816.scala
index 4c2a5bcb7066..5cc396ff50b5 100644
--- a/tests/disabled/macro/run/t5816.scala
+++ b/tests/disabled/macro/run/t5816.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val toolbox = cm.mkToolBox()
 
   def printSource[T](expr: Expr[T]): Unit = {
diff --git a/tests/disabled/macro/run/t5824.scala b/tests/disabled/macro/run/t5824.scala
index c5cfc280f8cc..2ad169e2d169 100644
--- a/tests/disabled/macro/run/t5824.scala
+++ b/tests/disabled/macro/run/t5824.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     println("%s %s %s".format(List("a", "b", "c"): _*))
   }.eval
diff --git a/tests/disabled/macro/run/t5840.scala b/tests/disabled/macro/run/t5840.scala
index ba2376f0f864..bb1cd7fa4c21 100644
--- a/tests/disabled/macro/run/t5840.scala
+++ b/tests/disabled/macro/run/t5840.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   reify {
     class C[T <: String with Singleton]
   }
diff --git a/tests/disabled/macro/run/t5903a/Test_2.scala b/tests/disabled/macro/run/t5903a/Test_2.scala
index 55a8320b3333..3a0b68b56851 100644
--- a/tests/disabled/macro/run/t5903a/Test_2.scala
+++ b/tests/disabled/macro/run/t5903a/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import NewQuasiquotes._
   SomeTree match {
     case nq"$x + $y" => println((x, y))
diff --git a/tests/disabled/macro/run/t5903b/Test_2.scala b/tests/disabled/macro/run/t5903b/Test_2.scala
index 23a92225d71b..0f6f80d327db 100644
--- a/tests/disabled/macro/run/t5903b/Test_2.scala
+++ b/tests/disabled/macro/run/t5903b/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Interpolation._
   2 match {
     case t"$x" => println(x)
diff --git a/tests/disabled/macro/run/t5903c/Test_2.scala b/tests/disabled/macro/run/t5903c/Test_2.scala
index 23a92225d71b..0f6f80d327db 100644
--- a/tests/disabled/macro/run/t5903c/Test_2.scala
+++ b/tests/disabled/macro/run/t5903c/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Interpolation._
   2 match {
     case t"$x" => println(x)
diff --git a/tests/disabled/macro/run/t5903d/Test_2.scala b/tests/disabled/macro/run/t5903d/Test_2.scala
index 5df60f024b83..95c717a9d83a 100644
--- a/tests/disabled/macro/run/t5903d/Test_2.scala
+++ b/tests/disabled/macro/run/t5903d/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Interpolation._
   42 match {
     case t"$x" => println(x)
diff --git a/tests/disabled/macro/run/t5923a/Test_2.scala b/tests/disabled/macro/run/t5923a/Test_2.scala
index 1f0413bdfab7..001ff9aea8f4 100644
--- a/tests/disabled/macro/run/t5923a/Test_2.scala
+++ b/tests/disabled/macro/run/t5923a/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[C[Int]])
   println(implicitly[C[String]])
   println(implicitly[C[Nothing]])
diff --git a/tests/disabled/macro/run/t5923d/Test_2.scala b/tests/disabled/macro/run/t5923d/Test_2.scala
index e9c446209124..6be10227c2f6 100644
--- a/tests/disabled/macro/run/t5923d/Test_2.scala
+++ b/tests/disabled/macro/run/t5923d/Test_2.scala
@@ -1,7 +1,7 @@
 class RowA extends MappedRow
 class RowB extends MappedRow
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicitly[RowMapper[RowA]]
   implicitly[RowMapper[RowB]]
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t5940.scala b/tests/disabled/macro/run/t5940.scala
index 8560708218e4..7b025b43af57 100644
--- a/tests/disabled/macro/run/t5940.scala
+++ b/tests/disabled/macro/run/t5940.scala
@@ -22,7 +22,7 @@ object Test extends DirectTest {
   }
 
   def test_2 = """
-    object Test extends dotty.runtime.LegacyApp {
+    object Test extends App {
       println(Macros.foo)
     }
   """
diff --git a/tests/disabled/macro/run/t6023.scala b/tests/disabled/macro/run/t6023.scala
index 9ec8724a4388..2753b93ac48b 100644
--- a/tests/disabled/macro/run/t6023.scala
+++ b/tests/disabled/macro/run/t6023.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test 1: reify
   val tree = reify{ trait Foo { val a: Int } }.tree
   println(tree.toString)
diff --git a/tests/disabled/macro/run/t6187b.scala b/tests/disabled/macro/run/t6187b.scala
index 412880f38311..d2d3e9797ded 100644
--- a/tests/disabled/macro/run/t6187b.scala
+++ b/tests/disabled/macro/run/t6187b.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x: PartialFunction[Int, Int] = { case 1 => 1 }
   val o: Any = ""
   assert(x.applyOrElse(0, (_: Int) => o) == "")
diff --git a/tests/disabled/macro/run/t6221/Test_2.scala b/tests/disabled/macro/run/t6221/Test_2.scala
index bc295d4372b6..9f6b2280a744 100644
--- a/tests/disabled/macro/run/t6221/Test_2.scala
+++ b/tests/disabled/macro/run/t6221/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit class PimpedList[T](val list: List[T]) {
     def query(predicate: ReflectiveClosure[T, Boolean]): List[T] = {
       println(predicate.tree)
diff --git a/tests/disabled/macro/run/t6379/Test_2.scala b/tests/disabled/macro/run/t6379/Test_2.scala
index 05bdd5575a52..8e9c99465402 100644
--- a/tests/disabled/macro/run/t6379/Test_2.scala
+++ b/tests/disabled/macro/run/t6379/Test_2.scala
@@ -7,7 +7,7 @@ class Reader(fname: String) {
   def read() = in.read()
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(sym: MethodSymbol): Unit = {
     println(s"uninitialized ${sym.name}: ${sym.exceptions}")
     sym.info
diff --git a/tests/disabled/macro/run/t6394a/Test_2.scala b/tests/disabled/macro/run/t6394a/Test_2.scala
index 989ab3031c32..75e84f0e3869 100644
--- a/tests/disabled/macro/run/t6394a/Test_2.scala
+++ b/tests/disabled/macro/run/t6394a/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo)
   override def toString = "TEST"
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t6394b/Test_2.scala b/tests/disabled/macro/run/t6394b/Test_2.scala
index 989ab3031c32..75e84f0e3869 100644
--- a/tests/disabled/macro/run/t6394b/Test_2.scala
+++ b/tests/disabled/macro/run/t6394b/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo)
   override def toString = "TEST"
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t6591_1.scala b/tests/disabled/macro/run/t6591_1.scala
index 8c152f68acd2..6dd9a1d9fbca 100644
--- a/tests/disabled/macro/run/t6591_1.scala
+++ b/tests/disabled/macro/run/t6591_1.scala
@@ -8,7 +8,7 @@ object A extends O {
   val impl = new I {}
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     val v: A.I = A.impl
     v
diff --git a/tests/disabled/macro/run/t6591_2.scala b/tests/disabled/macro/run/t6591_2.scala
index 9e6c917e84fb..6214308dabb3 100644
--- a/tests/disabled/macro/run/t6591_2.scala
+++ b/tests/disabled/macro/run/t6591_2.scala
@@ -8,7 +8,7 @@ class A extends O {
   val impl = new I {}
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val code = reify {
     val v: A#I = (new A).impl
     v
diff --git a/tests/disabled/macro/run/t6591_3.scala b/tests/disabled/macro/run/t6591_3.scala
index 5069b800e5d9..b73a7baf4848 100644
--- a/tests/disabled/macro/run/t6591_3.scala
+++ b/tests/disabled/macro/run/t6591_3.scala
@@ -12,6 +12,6 @@ object A extends O {
   println(showRaw(code.tree))
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val v: A.I = A.code.eval
 }
diff --git a/tests/disabled/macro/run/t6591_5.scala b/tests/disabled/macro/run/t6591_5.scala
index dfb4cd5ade67..18d6f90a9be0 100644
--- a/tests/disabled/macro/run/t6591_5.scala
+++ b/tests/disabled/macro/run/t6591_5.scala
@@ -14,7 +14,7 @@ object A extends O {
   println(showRaw(code))
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   try {
     val v: A.x.I = A.code.eval
   } catch {
diff --git a/tests/disabled/macro/run/t6591_6.scala b/tests/disabled/macro/run/t6591_6.scala
index afb2da229f6b..2eee87928daf 100644
--- a/tests/disabled/macro/run/t6591_6.scala
+++ b/tests/disabled/macro/run/t6591_6.scala
@@ -15,7 +15,7 @@ class A extends O {
   println(showRaw(code))
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   try {
     val v = (new A).code.eval
   } catch {
diff --git a/tests/disabled/macro/run/t6591_7.scala b/tests/disabled/macro/run/t6591_7.scala
index cec0d2cdad8c..ee1fcbae643b 100644
--- a/tests/disabled/macro/run/t6591_7.scala
+++ b/tests/disabled/macro/run/t6591_7.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.tools.reflect.Eval
 import internal._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   locally {
     val x = 2
     def y = 3
diff --git a/tests/disabled/macro/run/t6814/Test_2.scala b/tests/disabled/macro/run/t6814/Test_2.scala
index 0fc472aa62e0..acfddae94215 100644
--- a/tests/disabled/macro/run/t6814/Test_2.scala
+++ b/tests/disabled/macro/run/t6814/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t6992/Test_2.scala b/tests/disabled/macro/run/t6992/Test_2.scala
index 5d1a64eac2c6..2399bf81df14 100644
--- a/tests/disabled/macro/run/t6992/Test_2.scala
+++ b/tests/disabled/macro/run/t6992/Test_2.scala
@@ -1,6 +1,6 @@
 import scala.language.reflectiveCalls
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val foo = Macros.foo("T")
   val ttpe = scala.reflect.runtime.universe.weakTypeOf[foo.T]
   println(ttpe)
diff --git a/tests/disabled/macro/run/t7008-scala-defined/Test_3.scala b/tests/disabled/macro/run/t7008-scala-defined/Test_3.scala
index 23adb88b2473..ee7b9d9cde0b 100644
--- a/tests/disabled/macro/run/t7008-scala-defined/Test_3.scala
+++ b/tests/disabled/macro/run/t7008-scala-defined/Test_3.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
   println("=============")
 
diff --git a/tests/disabled/macro/run/t7008/Test_3.scala b/tests/disabled/macro/run/t7008/Test_3.scala
index 00e0eb684a12..99db05e8105d 100644
--- a/tests/disabled/macro/run/t7008/Test_3.scala
+++ b/tests/disabled/macro/run/t7008/Test_3.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
   println("=============")
 
diff --git a/tests/disabled/macro/run/t7044/Test_2.scala b/tests/disabled/macro/run/t7044/Test_2.scala
index e7a34d04ca2e..8dfb349086e5 100644
--- a/tests/disabled/macro/run/t7044/Test_2.scala
+++ b/tests/disabled/macro/run/t7044/Test_2.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 
 class C
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(tpe: Type): Unit = {
     val sym = tpe.typeSymbol
     println(s"autoinitialized ${sym.name}: ${sym.pos.source.file.name} ${sym.pos.source.file.sizeOption.nonEmpty}")
diff --git a/tests/disabled/macro/run/t7047/Test_2.scala b/tests/disabled/macro/run/t7047/Test_2.scala
index 0fc472aa62e0..acfddae94215 100644
--- a/tests/disabled/macro/run/t7047/Test_2.scala
+++ b/tests/disabled/macro/run/t7047/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t7157/Test_2.scala b/tests/disabled/macro/run/t7157/Test_2.scala
index be0d54d7537a..cceb5ca17797 100644
--- a/tests/disabled/macro/run/t7157/Test_2.scala
+++ b/tests/disabled/macro/run/t7157/Test_2.scala
@@ -1,5 +1,5 @@
 import Macros._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   a""
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t7235.scala b/tests/disabled/macro/run/t7235.scala
index 2e6af545d0f4..60391897165a 100644
--- a/tests/disabled/macro/run/t7235.scala
+++ b/tests/disabled/macro/run/t7235.scala
@@ -5,7 +5,7 @@ import scala.tools.reflect.ToolBox
 
 class C
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val Block(List(ValDef(_, _, tpt: CompoundTypeTree, _)), _) = reify{ val x: C{} = ??? }.tree
   println(tpt)
   println(tpt.templ.parents)
diff --git a/tests/disabled/macro/run/t7240/Test_2.scala b/tests/disabled/macro/run/t7240/Test_2.scala
index 27d2893d3d9b..5cc2cc7f78eb 100644
--- a/tests/disabled/macro/run/t7240/Test_2.scala
+++ b/tests/disabled/macro/run/t7240/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val v = bakery.Bakery.failure
 }
diff --git a/tests/disabled/macro/run/t7375b/Test_2.scala b/tests/disabled/macro/run/t7375b/Test_2.scala
index 0fc472aa62e0..acfddae94215 100644
--- a/tests/disabled/macro/run/t7375b/Test_2.scala
+++ b/tests/disabled/macro/run/t7375b/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t7558.scala b/tests/disabled/macro/run/t7558.scala
index 26163555f0ba..bfcaaba5ccd5 100644
--- a/tests/disabled/macro/run/t7558.scala
+++ b/tests/disabled/macro/run/t7558.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val cm = reflect.runtime.currentMirror
   val u = cm.universe
   import scala.tools.reflect.ToolBox
diff --git a/tests/disabled/macro/run/t7617a/Test_2.scala b/tests/disabled/macro/run/t7617a/Test_2.scala
index aaf268a8c043..da6e34e09d32 100644
--- a/tests/disabled/macro/run/t7617a/Test_2.scala
+++ b/tests/disabled/macro/run/t7617a/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Module.value)
   Module.value = "world"
   println(Module.value)
diff --git a/tests/disabled/macro/run/t7617b/Test_2.scala b/tests/disabled/macro/run/t7617b/Test_2.scala
index 0ce77a1c7f10..e1d9acdc318f 100644
--- a/tests/disabled/macro/run/t7617b/Test_2.scala
+++ b/tests/disabled/macro/run/t7617b/Test_2.scala
@@ -5,7 +5,7 @@ class C extends Dynamic {
   def updateDynamic(name: String)(value: Any): Unit = macro Macros.impl
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = new C
   c.foo = 2
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t7657/Test_2.scala b/tests/disabled/macro/run/t7657/Test_2.scala
index 68dfb5c8bdb0..2c7422be6618 100644
--- a/tests/disabled/macro/run/t7657/Test_2.scala
+++ b/tests/disabled/macro/run/t7657/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = new C()
   println(c.t())
   println((c: T).t())
diff --git a/tests/disabled/macro/run/t7777/Test_2.scala b/tests/disabled/macro/run/t7777/Test_2.scala
index 7f84f64e432f..1fe8b63bab93 100644
--- a/tests/disabled/macro/run/t7777/Test_2.scala
+++ b/tests/disabled/macro/run/t7777/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   DynMacro.foo(1, 2)         // prints "foo(1, 2)"
   DynMacro.foo(3).bar(4, 5)  // prints "bar(4, 5)", then "foo(3)"
   DynMacro(6).bar(7)         // prints "bar(7)", then "apply(6)"
diff --git a/tests/disabled/macro/run/t7868b.scala b/tests/disabled/macro/run/t7868b.scala
index 33d33f10a29f..759eeaf8628a 100644
--- a/tests/disabled/macro/run/t7868b.scala
+++ b/tests/disabled/macro/run/t7868b.scala
@@ -2,7 +2,7 @@ object A {
   def unapply(n: Int): Option[Int] = Some(1)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import reflect.runtime.universe._
   println(reify {
     val A(x) = (0: Short)
diff --git a/tests/disabled/macro/run/t7871/Test_2.scala b/tests/disabled/macro/run/t7871/Test_2.scala
index 55a8320b3333..3a0b68b56851 100644
--- a/tests/disabled/macro/run/t7871/Test_2.scala
+++ b/tests/disabled/macro/run/t7871/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import NewQuasiquotes._
   SomeTree match {
     case nq"$x + $y" => println((x, y))
diff --git a/tests/disabled/macro/run/t8048a/Test_2.scala b/tests/disabled/macro/run/t8048a/Test_2.scala
index 623a22a3aad0..4e1c8b16b09d 100644
--- a/tests/disabled/macro/run/t8048a/Test_2.scala
+++ b/tests/disabled/macro/run/t8048a/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x: Option[Int] = Macros.foo
   println(x)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t8048b/Test_2.scala b/tests/disabled/macro/run/t8048b/Test_2.scala
index 8474a34ec2b5..fb410dab7ae5 100644
--- a/tests/disabled/macro/run/t8048b/Test_2.scala
+++ b/tests/disabled/macro/run/t8048b/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo1.x)
   println(Macros.foo2.x)
   println(Macros.foo3.x)
diff --git a/tests/disabled/macro/run/t8104/Test_2.scala b/tests/disabled/macro/run/t8104/Test_2.scala
index 4e97cdf9d29d..08451dfb2a79 100644
--- a/tests/disabled/macro/run/t8104/Test_2.scala
+++ b/tests/disabled/macro/run/t8104/Test_2.scala
@@ -5,7 +5,7 @@ object Generic {
   implicit def materializeGeneric[T, Repr]: Generic.Aux[T, Repr] = macro Macros.impl[T]
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class C(x: Int, y: Int)
 
   import scala.reflect.runtime.universe._
diff --git a/tests/disabled/macro/run/t8192/Test_2.scala b/tests/disabled/macro/run/t8192/Test_2.scala
index dec90ab6616f..89302083ad8f 100644
--- a/tests/disabled/macro/run/t8192/Test_2.scala
+++ b/tests/disabled/macro/run/t8192/Test_2.scala
@@ -6,7 +6,7 @@ class C(x: Int) {
   def this(x: String) = this(x.toInt)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(sym: ClassSymbol): Unit = {
     def fullyInitializeSymbol(sym: Symbol): Unit = {
       val internal = ru.asInstanceOf[scala.reflect.internal.SymbolTable]
diff --git a/tests/disabled/macro/run/t8321/Test_2.scala b/tests/disabled/macro/run/t8321/Test_2.scala
index d4944211727e..82ec32384ede 100644
--- a/tests/disabled/macro/run/t8321/Test_2.scala
+++ b/tests/disabled/macro/run/t8321/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Macros.foo.x)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t8425/Test_2.scala b/tests/disabled/macro/run/t8425/Test_2.scala
index 0fc472aa62e0..acfddae94215 100644
--- a/tests/disabled/macro/run/t8425/Test_2.scala
+++ b/tests/disabled/macro/run/t8425/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/t8437/Test_2.scala b/tests/disabled/macro/run/t8437/Test_2.scala
index fef54005f1f9..47bb84ad0e7e 100644
--- a/tests/disabled/macro/run/t8437/Test_2.scala
+++ b/tests/disabled/macro/run/t8437/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(InvokeBundle.foo)
   println(InvokeBundle.bar)
 }
\ No newline at end of file
diff --git a/tests/disabled/macro/run/toolbox_console_reporter.scala b/tests/disabled/macro/run/toolbox_console_reporter.scala
index 53cbcb0fbcc1..5a3157780586 100644
--- a/tests/disabled/macro/run/toolbox_console_reporter.scala
+++ b/tests/disabled/macro/run/toolbox_console_reporter.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, mkConsoleFrontEnd}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   //val oldErr = Console.err;
   val baos = new java.io.ByteArrayOutputStream()
   val errs = new java.io.PrintStream(baos)
diff --git a/tests/disabled/macro/run/toolbox_current_run_compiles.scala b/tests/disabled/macro/run/toolbox_current_run_compiles.scala
index 702741c2e668..68760a6f42bd 100644
--- a/tests/disabled/macro/run/toolbox_current_run_compiles.scala
+++ b/tests/disabled/macro/run/toolbox_current_run_compiles.scala
@@ -17,7 +17,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{universe => ru}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val cm = ru.runtimeMirror(getClass.getClassLoader)
   val toolbox = cm.mkToolBox()
   toolbox.eval(toolbox.parse("""{
diff --git a/tests/disabled/macro/run/toolbox_default_reporter_is_silent.scala b/tests/disabled/macro/run/toolbox_default_reporter_is_silent.scala
index 694720721037..691c54ed9297 100644
--- a/tests/disabled/macro/run/toolbox_default_reporter_is_silent.scala
+++ b/tests/disabled/macro/run/toolbox_default_reporter_is_silent.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val toolbox = cm.mkToolBox()
   toolbox.eval(reify{
     object Utils {
diff --git a/tests/disabled/macro/run/toolbox_silent_reporter.scala b/tests/disabled/macro/run/toolbox_silent_reporter.scala
index 72109b822447..d3a471005356 100644
--- a/tests/disabled/macro/run/toolbox_silent_reporter.scala
+++ b/tests/disabled/macro/run/toolbox_silent_reporter.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, mkSilentFrontEnd}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val toolbox = cm.mkToolBox(options = "-deprecation", frontEnd = mkSilentFrontEnd())
   toolbox.eval(reify{
     object Utils {
diff --git a/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled.scala b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled.scala
index 2aa0202e7ad4..5466cb776574 100644
--- a/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled.scala
+++ b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled.scala
@@ -8,7 +8,7 @@ import internal._
 // have accidentally changed the way type tags reify.  If so, validate
 // that your changes are accurate and update the check file.
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val toolbox = cm.mkToolBox()
   val rupkg = cm.staticModule("scala.reflect.runtime.package")
   val rusym = reificationSupport.selectTerm(rupkg, "universe")
diff --git a/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled2.scala b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled2.scala
index c554110edb15..606d3d40cb5c 100644
--- a/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled2.scala
+++ b/tests/disabled/macro/run/toolbox_typecheck_macrosdisabled2.scala
@@ -8,7 +8,7 @@ import internal._
 // have accidentally changed the way type tags reify.  If so, validate
 // that your changes are accurate and update the check file.
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val toolbox = cm.mkToolBox()
   val rupkg = cm.staticModule("scala.reflect.runtime.package")
   val rusym = reificationSupport.selectTerm(rupkg, "universe")
diff --git a/tests/disabled/macro/run/typecheck/Test_2.scala b/tests/disabled/macro/run/typecheck/Test_2.scala
index b79cc3b315da..01bf5198cccb 100644
--- a/tests/disabled/macro/run/typecheck/Test_2.scala
+++ b/tests/disabled/macro/run/typecheck/Test_2.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 
   val tb = cm.mkToolBox()
diff --git a/tests/disabled/macro/run/typed-annotated/Test_2.scala b/tests/disabled/macro/run/typed-annotated/Test_2.scala
index 0fc472aa62e0..acfddae94215 100644
--- a/tests/disabled/macro/run/typed-annotated/Test_2.scala
+++ b/tests/disabled/macro/run/typed-annotated/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Macros.foo
 }
\ No newline at end of file
diff --git a/tests/disabled/not-representable/pos/t5544/Test_2.scala b/tests/disabled/not-representable/pos/t5544/Test_2.scala
index ea92322213c6..285f8959e00a 100644
--- a/tests/disabled/not-representable/pos/t5544/Test_2.scala
+++ b/tests/disabled/not-representable/pos/t5544/Test_2.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Api.foo
 }
diff --git a/tests/disabled/partest/run/repl-javap-app.scala b/tests/disabled/partest/run/repl-javap-app.scala
index 73fc82ece554..ad6076c2d590 100644
--- a/tests/disabled/partest/run/repl-javap-app.scala
+++ b/tests/disabled/partest/run/repl-javap-app.scala
@@ -1,7 +1,7 @@
 
 import scala.tools.partest.ReplTest
 
-object MyApp extends dotty.runtime.LegacyApp {
+object MyApp extends App {
   Console println "Hello, delayed world."
 }
 
diff --git a/tests/disabled/partest/run/t5603.scala b/tests/disabled/partest/run/t5603.scala
index 79a1ba07697c..77c2775cc353 100644
--- a/tests/disabled/partest/run/t5603.scala
+++ b/tests/disabled/partest/run/t5603.scala
@@ -21,7 +21,7 @@ object Test extends DirectTest {
       println(msg)
     }
 
-    object Test extends dotty.runtime.LegacyApp {}
+    object Test extends App {}
   """.trim
 
   override def show(): Unit = {
diff --git a/tests/disabled/partest/run/t6240-universe-code-gen.scala b/tests/disabled/partest/run/t6240-universe-code-gen.scala
index 09d917a448df..6c78ee9764b9 100644
--- a/tests/disabled/partest/run/t6240-universe-code-gen.scala
+++ b/tests/disabled/partest/run/t6240-universe-code-gen.scala
@@ -1,6 +1,6 @@
 import scala.tools.partest.nest.FileManager._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val cm = reflect.runtime.currentMirror
   val u = cm.universe
   import u._
diff --git a/tests/disabled/partest/run/t6331b.scala b/tests/disabled/partest/run/t6331b.scala
index 8dd070f0861b..3a560ea64b08 100644
--- a/tests/disabled/partest/run/t6331b.scala
+++ b/tests/disabled/partest/run/t6331b.scala
@@ -2,7 +2,7 @@ import scala.tools.partest.Util.trace
 import scala.util.control.Exception.allCatch
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def intercept = allCatch.withApply(_.getClass)
   val t: Boolean = true
   trace(if (t) -0d else 0d)
diff --git a/tests/disabled/partest/run/tailcalls.scala b/tests/disabled/partest/run/tailcalls.scala
index d89a89b41bfa..8df2dcfcb635 100644
--- a/tests/disabled/partest/run/tailcalls.scala
+++ b/tests/disabled/partest/run/tailcalls.scala
@@ -193,7 +193,7 @@ object FancyTailCalls {
   val f2 = new FancyTailCalls
 }
 
-object PolyObject extends dotty.runtime.LegacyApp {
+object PolyObject extends App {
   def tramp[A](x: Int): Int =
     if (x > 0)
       tramp[A](x - 1)
diff --git a/tests/disabled/partest/run/typetags_without_scala_reflect_manifest_lookup.scala b/tests/disabled/partest/run/typetags_without_scala_reflect_manifest_lookup.scala
index 2b1af02f2565..6fd3d2dc2be1 100644
--- a/tests/disabled/partest/run/typetags_without_scala_reflect_manifest_lookup.scala
+++ b/tests/disabled/partest/run/typetags_without_scala_reflect_manifest_lookup.scala
@@ -5,7 +5,7 @@ object Test extends DirectTest {
   override def extraSettings = "-cp " + sys.props("partest.lib") + " -d \"" + testOutput.path + "\""
 
   def code = """
-    object Test extends dotty.runtime.LegacyApp {
+    object Test extends App {
       // manifest lookup also involves type tag lookup
       // because we support manifest <-> typetag convertability
       //
diff --git a/tests/disabled/partest/run/typetags_without_scala_reflect_typetag_lookup.scala b/tests/disabled/partest/run/typetags_without_scala_reflect_typetag_lookup.scala
index 819efc92f7f0..3d2b9f77be3c 100644
--- a/tests/disabled/partest/run/typetags_without_scala_reflect_typetag_lookup.scala
+++ b/tests/disabled/partest/run/typetags_without_scala_reflect_typetag_lookup.scala
@@ -16,7 +16,7 @@ object Test extends StoreReporterDirectTest {
   }
 
   def app = """
-    object Test extends dotty.runtime.LegacyApp {
+    object Test extends App {
       // tries to materialize a type tag not having scala-reflect.jar on the classpath
       // even though it's easy to materialize a type tag of Int, this line will fail
       // because materialization involves classes from scala-reflect.jar
diff --git a/tests/disabled/reflect/run/abstypetags_core.scala b/tests/disabled/reflect/run/abstypetags_core.scala
index ac4f07d46dad..4c98a65c0d87 100644
--- a/tests/disabled/reflect/run/abstypetags_core.scala
+++ b/tests/disabled/reflect/run/abstypetags_core.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[WeakTypeTag[Byte]] eq WeakTypeTag.Byte)
   println(implicitly[WeakTypeTag[Byte]])
   println(implicitly[WeakTypeTag[Short]] eq WeakTypeTag.Short)
diff --git a/tests/disabled/reflect/run/abstypetags_serialize.scala b/tests/disabled/reflect/run/abstypetags_serialize.scala
index 23211b13443b..6ec97105fea1 100644
--- a/tests/disabled/reflect/run/abstypetags_serialize.scala
+++ b/tests/disabled/reflect/run/abstypetags_serialize.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(tag: WeakTypeTag[_]) =
     try {
       val fout = new ByteArrayOutputStream()
diff --git a/tests/disabled/reflect/run/classtags_core.scala b/tests/disabled/reflect/run/classtags_core.scala
index a30652d5f38f..0a9fc4a31dc6 100644
--- a/tests/disabled/reflect/run/classtags_core.scala
+++ b/tests/disabled/reflect/run/classtags_core.scala
@@ -1,6 +1,6 @@
 import scala.reflect.{ClassTag, classTag}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[ClassTag[Byte]] eq ClassTag.Byte)
   println(implicitly[ClassTag[Byte]])
   println(implicitly[ClassTag[Short]] eq ClassTag.Short)
diff --git a/tests/disabled/reflect/run/classtags_multi.scala b/tests/disabled/reflect/run/classtags_multi.scala
index 19f6aa7730ac..ee9481be37a5 100644
--- a/tests/disabled/reflect/run/classtags_multi.scala
+++ b/tests/disabled/reflect/run/classtags_multi.scala
@@ -1,6 +1,6 @@
 import scala.reflect.{ClassTag, classTag}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classTag[Int])
   println(classTag[Array[Int]])
   println(classTag[Array[Array[Int]]])
diff --git a/tests/disabled/reflect/run/existentials.scala b/tests/disabled/reflect/run/existentials.scala
index 6aa4697cd85a..d900e7ad94f9 100644
--- a/tests/disabled/reflect/run/existentials.scala
+++ b/tests/disabled/reflect/run/existentials.scala
@@ -53,7 +53,7 @@ object Bug1189 {
   println(f(x))
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val x = { class I; class J; (new C(new I), new C(new J)) }
   val y: (C[X], C[Y]) forSome { type X; type Y }(C[X], C[Y]) forSome { type X; type Y } = x
diff --git a/tests/disabled/reflect/run/freetypes_false_alarm2.scala b/tests/disabled/reflect/run/freetypes_false_alarm2.scala
index 6e6fd4c9ca83..4b6633fa24a4 100644
--- a/tests/disabled/reflect/run/freetypes_false_alarm2.scala
+++ b/tests/disabled/reflect/run/freetypes_false_alarm2.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.tools.reflect.Eval
 import internal._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tpe = typeOf[ru.Type]
   println(isFreeType(tpe.typeSymbol))
 }
diff --git a/tests/disabled/reflect/run/interop_manifests_are_abstypetags.scala b/tests/disabled/reflect/run/interop_manifests_are_abstypetags.scala
index 5dbfdc969a9d..e864aec1099e 100644
--- a/tests/disabled/reflect/run/interop_manifests_are_abstypetags.scala
+++ b/tests/disabled/reflect/run/interop_manifests_are_abstypetags.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def manifestIsWeakTypeTag[T: Manifest] = {
     println(implicitly[WeakTypeTag[T]].tpe)
   }
diff --git a/tests/disabled/reflect/run/interop_manifests_are_classtags.scala b/tests/disabled/reflect/run/interop_manifests_are_classtags.scala
index 195fac9d99dc..705038ece7cb 100644
--- a/tests/disabled/reflect/run/interop_manifests_are_classtags.scala
+++ b/tests/disabled/reflect/run/interop_manifests_are_classtags.scala
@@ -1,7 +1,7 @@
 import scala.reflect.{ClassTag, classTag}
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def classManifestIsClassTag[T: ClassManifest] = {
     println(classTag[T])
     println(Array[T]().toList)
diff --git a/tests/disabled/reflect/run/interop_manifests_are_typetags.scala b/tests/disabled/reflect/run/interop_manifests_are_typetags.scala
index dd20c1719672..a228e701706e 100644
--- a/tests/disabled/reflect/run/interop_manifests_are_typetags.scala
+++ b/tests/disabled/reflect/run/interop_manifests_are_typetags.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def manifestIsTypeTag[T: Manifest] = {
     println(typeOf[T])
   }
diff --git a/tests/disabled/reflect/run/interop_typetags_are_manifests.scala b/tests/disabled/reflect/run/interop_typetags_are_manifests.scala
index 5f5781323b0d..071c3ff25f5c 100644
--- a/tests/disabled/reflect/run/interop_typetags_are_manifests.scala
+++ b/tests/disabled/reflect/run/interop_typetags_are_manifests.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.ClassTag
 import internal._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def typeTagIsManifest[T: TypeTag : ClassTag] = {
     println(manifest[T])
   }
diff --git a/tests/disabled/reflect/run/issue192.scala b/tests/disabled/reflect/run/issue192.scala
index b00a35917c82..8e6d13e5e130 100644
--- a/tests/disabled/reflect/run/issue192.scala
+++ b/tests/disabled/reflect/run/issue192.scala
@@ -1,6 +1,6 @@
 import scala.language.reflectiveCalls
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def f1(p: Any{def unary_+ : Int}) = +p
   def f2(p: Any{def unary_- : Int}) = -p
diff --git a/tests/disabled/reflect/run/macro-reify-abstypetag-notypeparams/Test.scala b/tests/disabled/reflect/run/macro-reify-abstypetag-notypeparams/Test.scala
index cd208668f625..c51f1a10c1ba 100644
--- a/tests/disabled/reflect/run/macro-reify-abstypetag-notypeparams/Test.scala
+++ b/tests/disabled/reflect/run/macro-reify-abstypetag-notypeparams/Test.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[WeakTypeTag[Int]])
   println(implicitly[WeakTypeTag[List[Int]]])
 }
diff --git a/tests/disabled/reflect/run/macro-reify-abstypetag-typeparams-notags/Test.scala b/tests/disabled/reflect/run/macro-reify-abstypetag-typeparams-notags/Test.scala
index 99f3689ee0de..19070eec8307 100644
--- a/tests/disabled/reflect/run/macro-reify-abstypetag-typeparams-notags/Test.scala
+++ b/tests/disabled/reflect/run/macro-reify-abstypetag-typeparams-notags/Test.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def fooNoTypeTag[T] = {
     println(implicitly[WeakTypeTag[T]])
     println(implicitly[WeakTypeTag[List[T]]])
diff --git a/tests/disabled/reflect/run/macro-reify-abstypetag-typeparams-tags/Test.scala b/tests/disabled/reflect/run/macro-reify-abstypetag-typeparams-tags/Test.scala
index 75846ee8c5ce..c32dff18aa68 100644
--- a/tests/disabled/reflect/run/macro-reify-abstypetag-typeparams-tags/Test.scala
+++ b/tests/disabled/reflect/run/macro-reify-abstypetag-typeparams-tags/Test.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def fooTypeTag[T: WeakTypeTag] = {
     println(implicitly[WeakTypeTag[T]])
     println(implicitly[WeakTypeTag[List[T]]])
diff --git a/tests/disabled/reflect/run/macro-reify-abstypetag-usetypetag/Test.scala b/tests/disabled/reflect/run/macro-reify-abstypetag-usetypetag/Test.scala
index 7b21555e80b7..af5b924f5fa5 100644
--- a/tests/disabled/reflect/run/macro-reify-abstypetag-usetypetag/Test.scala
+++ b/tests/disabled/reflect/run/macro-reify-abstypetag-usetypetag/Test.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def fooTypeTag[T: TypeTag] = {
     println(implicitly[WeakTypeTag[T]])
     println(implicitly[WeakTypeTag[List[T]]])
diff --git a/tests/disabled/reflect/run/macro-undetparams-implicitval/Test.scala b/tests/disabled/reflect/run/macro-undetparams-implicitval/Test.scala
index 5e38618f6031..c584e45b2bfd 100644
--- a/tests/disabled/reflect/run/macro-undetparams-implicitval/Test.scala
+++ b/tests/disabled/reflect/run/macro-undetparams-implicitval/Test.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo[T: TypeTag] = println(implicitly[TypeTag[T]])
   foo
 }
diff --git a/tests/disabled/reflect/run/manifests-undeprecated-in-2.10.0.scala b/tests/disabled/reflect/run/manifests-undeprecated-in-2.10.0.scala
index e7dd61145308..2a7321db99bb 100644
--- a/tests/disabled/reflect/run/manifests-undeprecated-in-2.10.0.scala
+++ b/tests/disabled/reflect/run/manifests-undeprecated-in-2.10.0.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def m1a: scala.reflect.Manifest[Int] = scala.reflect.Manifest.Int
   def m2a: scala.reflect.OptManifest[Int] = ???
   def m3a = scala.reflect.NoManifest
diff --git a/tests/disabled/reflect/run/mirror_symbolof_x.scala b/tests/disabled/reflect/run/mirror_symbolof_x.scala
index 43e46cf92866..8fec301f5694 100644
--- a/tests/disabled/reflect/run/mirror_symbolof_x.scala
+++ b/tests/disabled/reflect/run/mirror_symbolof_x.scala
@@ -6,7 +6,7 @@ import scala.reflect.api.Mirror
 class C
 object C
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object test1 {
     val m = cm
     type T = Int
diff --git a/tests/disabled/reflect/run/newTags.scala b/tests/disabled/reflect/run/newTags.scala
index a54bc3c6bc19..43c01256ee74 100644
--- a/tests/disabled/reflect/run/newTags.scala
+++ b/tests/disabled/reflect/run/newTags.scala
@@ -1,7 +1,7 @@
 import scala.reflect.api.{Universe => ApiUniverse}
 import scala.reflect.runtime.{universe => ru}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(ru.typeOf[List[Int]])
   def foo[T: ru.TypeTag] = {
     println(ru.typeOf[T])
diff --git a/tests/disabled/reflect/run/outertest.scala b/tests/disabled/reflect/run/outertest.scala
index edeac9f62645..f1030da236c5 100644
--- a/tests/disabled/reflect/run/outertest.scala
+++ b/tests/disabled/reflect/run/outertest.scala
@@ -33,7 +33,7 @@ class C extends A {
 }
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val b = new B
   val c0 = new C
   val c = new C {
diff --git a/tests/disabled/reflect/run/patmat_unapp_abstype-new.scala b/tests/disabled/reflect/run/patmat_unapp_abstype-new.scala
index fa8b2151cedd..c2927bd124a4 100644
--- a/tests/disabled/reflect/run/patmat_unapp_abstype-new.scala
+++ b/tests/disabled/reflect/run/patmat_unapp_abstype-new.scala
@@ -70,7 +70,7 @@ object TestUnappDynamicSynth extends RealFoos with Intermed {
  }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   TestUnappStaticallyKnownSynthetic.test()
   TestUnappDynamicSynth.test()
 }
diff --git a/tests/disabled/reflect/run/reflection-allmirrors-tostring.scala b/tests/disabled/reflect/run/reflection-allmirrors-tostring.scala
index bc2c080abafe..f0614e9a9895 100644
--- a/tests/disabled/reflect/run/reflection-allmirrors-tostring.scala
+++ b/tests/disabled/reflect/run/reflection-allmirrors-tostring.scala
@@ -18,7 +18,7 @@ class C {
 }
 object M
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val cm = scala.reflect.runtime.currentMirror
 //  println(cm)
 
diff --git a/tests/disabled/reflect/run/reflection-companion.scala b/tests/disabled/reflect/run/reflection-companion.scala
index f5c6702c1b76..63929091c9c2 100644
--- a/tests/disabled/reflect/run/reflection-companion.scala
+++ b/tests/disabled/reflect/run/reflection-companion.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 class C
 object C
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   type T = C
 
   println(showRaw(symbolOf[C].companion, printKinds = true))
diff --git a/tests/disabled/reflect/run/reflection-companiontype.scala b/tests/disabled/reflect/run/reflection-companiontype.scala
index 099f1013a54b..1111bbd06cec 100644
--- a/tests/disabled/reflect/run/reflection-companiontype.scala
+++ b/tests/disabled/reflect/run/reflection-companiontype.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 class C
 object C
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   type T = C
 
   println("TypeRefs")
diff --git a/tests/disabled/reflect/run/reflection-constructormirror-inner-badpath.scala b/tests/disabled/reflect/run/reflection-constructormirror-inner-badpath.scala
index 44743d137ca9..159aa1d518e9 100644
--- a/tests/disabled/reflect/run/reflection-constructormirror-inner-badpath.scala
+++ b/tests/disabled/reflect/run/reflection-constructormirror-inner-badpath.scala
@@ -26,7 +26,7 @@ class Foo{
  }
 
 }
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val foo = new Foo
   println( foo.foo )
 }
diff --git a/tests/disabled/reflect/run/reflection-constructormirror-inner-good.scala b/tests/disabled/reflect/run/reflection-constructormirror-inner-good.scala
index 0d00f24e16d6..c57a8d4b760b 100644
--- a/tests/disabled/reflect/run/reflection-constructormirror-inner-good.scala
+++ b/tests/disabled/reflect/run/reflection-constructormirror-inner-good.scala
@@ -20,7 +20,7 @@ class Foo{
  }
 
 }
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val foo = new Foo
   println( foo.foo )
 }
diff --git a/tests/disabled/reflect/run/reflection-constructormirror-nested-badpath.scala b/tests/disabled/reflect/run/reflection-constructormirror-nested-badpath.scala
index fa8ff04d3d5c..c5beb95c6b93 100644
--- a/tests/disabled/reflect/run/reflection-constructormirror-nested-badpath.scala
+++ b/tests/disabled/reflect/run/reflection-constructormirror-nested-badpath.scala
@@ -22,7 +22,7 @@ class Foo{
  }
 
 }
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   case class R(
     sales : Int,
     name : String
diff --git a/tests/disabled/reflect/run/reflection-constructormirror-nested-good.scala b/tests/disabled/reflect/run/reflection-constructormirror-nested-good.scala
index 94ddfac33464..7a5947a2b0d9 100644
--- a/tests/disabled/reflect/run/reflection-constructormirror-nested-good.scala
+++ b/tests/disabled/reflect/run/reflection-constructormirror-nested-good.scala
@@ -16,7 +16,7 @@ class Foo{
  }
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   case class R(
     sales : Int,
     name : String
diff --git a/tests/disabled/reflect/run/reflection-constructormirror-toplevel-badpath.scala b/tests/disabled/reflect/run/reflection-constructormirror-toplevel-badpath.scala
index e5d3756a0bb7..3fc9f3f557db 100644
--- a/tests/disabled/reflect/run/reflection-constructormirror-toplevel-badpath.scala
+++ b/tests/disabled/reflect/run/reflection-constructormirror-toplevel-badpath.scala
@@ -27,7 +27,7 @@ class Foo{
  }
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val foo = new Foo
   println( foo.foo )
 }
diff --git a/tests/disabled/reflect/run/reflection-constructormirror-toplevel-good.scala b/tests/disabled/reflect/run/reflection-constructormirror-toplevel-good.scala
index f16f8c734af4..de9149fb447a 100644
--- a/tests/disabled/reflect/run/reflection-constructormirror-toplevel-good.scala
+++ b/tests/disabled/reflect/run/reflection-constructormirror-toplevel-good.scala
@@ -21,7 +21,7 @@ class Foo{
  }
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val foo = new Foo
   println( foo.foo )
 }
diff --git a/tests/disabled/reflect/run/reflection-enclosed-basic.scala b/tests/disabled/reflect/run/reflection-enclosed-basic.scala
index 4bb3f62d982f..e001207e8279 100644
--- a/tests/disabled/reflect/run/reflection-enclosed-basic.scala
+++ b/tests/disabled/reflect/run/reflection-enclosed-basic.scala
@@ -9,7 +9,7 @@ private object B4 { override def toString = "B4"; def foo = 4 }
 object B5 extends B1 { override def toString = "B5"; override def foo = 5 }
 private object B6 extends B2 { override def toString = "B6"; override def foo = 6 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def testMethodInvocation(instance: Any) = {
     val instanceMirror = cm.reflect(instance)
     val method = instanceMirror.symbol.info.decl(TermName("foo")).asMethod
diff --git a/tests/disabled/reflect/run/reflection-enclosed-inner-basic.scala b/tests/disabled/reflect/run/reflection-enclosed-inner-basic.scala
index 920b78ae4772..fd81a8d115d7 100644
--- a/tests/disabled/reflect/run/reflection-enclosed-inner-basic.scala
+++ b/tests/disabled/reflect/run/reflection-enclosed-inner-basic.scala
@@ -11,7 +11,7 @@ class B {
   private object B6 extends B2 { override def toString = "B6"; override def foo = 6 }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val b = cm.classSymbol(classTag[B].runtimeClass)
   println(b)
   println(b.info.decls.toList)
diff --git a/tests/disabled/reflect/run/reflection-enclosed-inner-inner-basic.scala b/tests/disabled/reflect/run/reflection-enclosed-inner-inner-basic.scala
index 771f0cebb3bd..45dfb8a61f37 100644
--- a/tests/disabled/reflect/run/reflection-enclosed-inner-inner-basic.scala
+++ b/tests/disabled/reflect/run/reflection-enclosed-inner-inner-basic.scala
@@ -13,7 +13,7 @@ class B {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val b = cm.classSymbol(classTag[B#BB].runtimeClass)
   println(b)
   println(b.info.decls.toList)
diff --git a/tests/disabled/reflect/run/reflection-enclosed-inner-nested-basic.scala b/tests/disabled/reflect/run/reflection-enclosed-inner-nested-basic.scala
index edaf10f5e770..1973f47397e8 100644
--- a/tests/disabled/reflect/run/reflection-enclosed-inner-nested-basic.scala
+++ b/tests/disabled/reflect/run/reflection-enclosed-inner-nested-basic.scala
@@ -13,7 +13,7 @@ class B {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val outer1 = new B()
   val b = cm.moduleSymbol(classTag[outer1.BB.type].runtimeClass)
   println(b)
diff --git a/tests/disabled/reflect/run/reflection-enclosed-nested-basic.scala b/tests/disabled/reflect/run/reflection-enclosed-nested-basic.scala
index f81fa84101d7..4ff333d10fd4 100644
--- a/tests/disabled/reflect/run/reflection-enclosed-nested-basic.scala
+++ b/tests/disabled/reflect/run/reflection-enclosed-nested-basic.scala
@@ -11,7 +11,7 @@ object B {
   private object B6 extends B2 { override def toString = "B6"; override def foo = 6 }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val b = cm.moduleSymbol(classTag[B.type].runtimeClass)
   println(b)
   println(b.info.decls.toList)
diff --git a/tests/disabled/reflect/run/reflection-enclosed-nested-inner-basic.scala b/tests/disabled/reflect/run/reflection-enclosed-nested-inner-basic.scala
index 09290bdcfb0f..d45894c8c248 100644
--- a/tests/disabled/reflect/run/reflection-enclosed-nested-inner-basic.scala
+++ b/tests/disabled/reflect/run/reflection-enclosed-nested-inner-basic.scala
@@ -13,7 +13,7 @@ object B {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val b = cm.classSymbol(classTag[B.BB].runtimeClass)
   println(b)
   println(b.info.decls.toList)
diff --git a/tests/disabled/reflect/run/reflection-enclosed-nested-nested-basic.scala b/tests/disabled/reflect/run/reflection-enclosed-nested-nested-basic.scala
index a601f207c55f..8a630ea1fbde 100644
--- a/tests/disabled/reflect/run/reflection-enclosed-nested-nested-basic.scala
+++ b/tests/disabled/reflect/run/reflection-enclosed-nested-nested-basic.scala
@@ -13,7 +13,7 @@ object B {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val b = cm.moduleSymbol(classTag[B.BB.type].runtimeClass)
   println(b)
   println(b.info.decls.toList)
diff --git a/tests/disabled/reflect/run/reflection-fancy-java-classes/Test_2.scala b/tests/disabled/reflect/run/reflection-fancy-java-classes/Test_2.scala
index 2a98b1d37e3d..4dbf2855282b 100644
--- a/tests/disabled/reflect/run/reflection-fancy-java-classes/Test_2.scala
+++ b/tests/disabled/reflect/run/reflection-fancy-java-classes/Test_2.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println("===== JAVA POV =====")
   val jfancy = Class.forName("Foo_1$1")
   println(jfancy)
diff --git a/tests/disabled/reflect/run/reflection-fieldmirror-accessorsareokay.scala b/tests/disabled/reflect/run/reflection-fieldmirror-accessorsareokay.scala
index 9e68104e0cc8..0e75dcf7e65d 100644
--- a/tests/disabled/reflect/run/reflection-fieldmirror-accessorsareokay.scala
+++ b/tests/disabled/reflect/run/reflection-fieldmirror-accessorsareokay.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A {
     var x: Int = 42
   }
diff --git a/tests/disabled/reflect/run/reflection-fieldmirror-ctorparam.scala b/tests/disabled/reflect/run/reflection-fieldmirror-ctorparam.scala
index 20a13ba193fa..b5b6b2102771 100644
--- a/tests/disabled/reflect/run/reflection-fieldmirror-ctorparam.scala
+++ b/tests/disabled/reflect/run/reflection-fieldmirror-ctorparam.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A(x: Int) {
     private[this] var xx = x
   }
diff --git a/tests/disabled/reflect/run/reflection-fieldmirror-getsetval.scala b/tests/disabled/reflect/run/reflection-fieldmirror-getsetval.scala
index 94a83ddb19d8..4fe0d2e4f33a 100644
--- a/tests/disabled/reflect/run/reflection-fieldmirror-getsetval.scala
+++ b/tests/disabled/reflect/run/reflection-fieldmirror-getsetval.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A {
     val x: Int = 42
   }
diff --git a/tests/disabled/reflect/run/reflection-fieldmirror-getsetvar.scala b/tests/disabled/reflect/run/reflection-fieldmirror-getsetvar.scala
index 486ac26e734f..c64b0c46c08e 100644
--- a/tests/disabled/reflect/run/reflection-fieldmirror-getsetvar.scala
+++ b/tests/disabled/reflect/run/reflection-fieldmirror-getsetvar.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A {
     var x: Int = 42
   }
diff --git a/tests/disabled/reflect/run/reflection-fieldmirror-nmelocalsuffixstring.scala b/tests/disabled/reflect/run/reflection-fieldmirror-nmelocalsuffixstring.scala
index bc45ba0dd3e8..ddc6c42e7819 100644
--- a/tests/disabled/reflect/run/reflection-fieldmirror-nmelocalsuffixstring.scala
+++ b/tests/disabled/reflect/run/reflection-fieldmirror-nmelocalsuffixstring.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A {
     var x: Int = 42
   }
diff --git a/tests/disabled/reflect/run/reflection-fieldmirror-privatethis.scala b/tests/disabled/reflect/run/reflection-fieldmirror-privatethis.scala
index f6b65fe9bcf5..1ece46576d27 100644
--- a/tests/disabled/reflect/run/reflection-fieldmirror-privatethis.scala
+++ b/tests/disabled/reflect/run/reflection-fieldmirror-privatethis.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A {
     private[this] var x: Int = 42
   }
diff --git a/tests/disabled/reflect/run/reflection-fieldsymbol-navigation.scala b/tests/disabled/reflect/run/reflection-fieldsymbol-navigation.scala
index d3a5a0dc6b8f..924d97f5e947 100644
--- a/tests/disabled/reflect/run/reflection-fieldsymbol-navigation.scala
+++ b/tests/disabled/reflect/run/reflection-fieldsymbol-navigation.scala
@@ -4,7 +4,7 @@ class C {
   var x = 2
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = typeOf[C].member(TermName("x")).asTerm
   println(x)
   println(x.isVar)
diff --git a/tests/disabled/reflect/run/reflection-idtc.scala b/tests/disabled/reflect/run/reflection-idtc.scala
index c61b57b56d38..c2b0347c73d9 100644
--- a/tests/disabled/reflect/run/reflection-idtc.scala
+++ b/tests/disabled/reflect/run/reflection-idtc.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val idsym = tb.typecheck(q"type Id[X] = X").symbol.asType
   val idTC1 = idsym.info
diff --git a/tests/disabled/reflect/run/reflection-implClass.scala b/tests/disabled/reflect/run/reflection-implClass.scala
index 8e91db9a7774..4242530dd102 100644
--- a/tests/disabled/reflect/run/reflection-implClass.scala
+++ b/tests/disabled/reflect/run/reflection-implClass.scala
@@ -5,7 +5,7 @@
  * that exposes Java reflection information dressed up in
  * a Scala symbol.
  */
-object Test extends dotty.runtime.LegacyApp with Outer {
+object Test extends App with Outer {
   import scala.reflect.{ClassTag, classTag}
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
diff --git a/tests/disabled/reflect/run/reflection-implicit.scala b/tests/disabled/reflect/run/reflection-implicit.scala
index 5523545bf026..1e104d1e5809 100644
--- a/tests/disabled/reflect/run/reflection-implicit.scala
+++ b/tests/disabled/reflect/run/reflection-implicit.scala
@@ -8,7 +8,7 @@ class C {
   implicit class X(val x: Int)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val decls = typeOf[C].typeSymbol.info.decls.sorted.toList.filter(sym => !sym.isTerm || (sym.isMethod && !sym.asMethod.isConstructor))
   println(decls map (_.isImplicit))
   val param = decls.find(_.name.toString == "d").get.asMethod.paramLists.last.head
diff --git a/tests/disabled/reflect/run/reflection-java-annotations/Test_2.scala b/tests/disabled/reflect/run/reflection-java-annotations/Test_2.scala
index 3623b6bbb450..dec5b45ca74e 100644
--- a/tests/disabled/reflect/run/reflection-java-annotations/Test_2.scala
+++ b/tests/disabled/reflect/run/reflection-java-annotations/Test_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   val sym = typeOf[JavaAnnottee_1].typeSymbol
   sym.info
diff --git a/tests/disabled/reflect/run/reflection-java-crtp/Main_2.scala b/tests/disabled/reflect/run/reflection-java-crtp/Main_2.scala
index 0ebac1c5790f..b9347869e439 100644
--- a/tests/disabled/reflect/run/reflection-java-crtp/Main_2.scala
+++ b/tests/disabled/reflect/run/reflection-java-crtp/Main_2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   val enum = typeOf[JavaSimpleEnumeration_1].baseClasses(1).asClass
   // make sure that the E's in Enum<E extends Enum<E>> are represented by the same symbol
diff --git a/tests/disabled/reflect/run/reflection-magicsymbols-vanilla.scala b/tests/disabled/reflect/run/reflection-magicsymbols-vanilla.scala
index 3de2a5529966..328caf945d53 100644
--- a/tests/disabled/reflect/run/reflection-magicsymbols-vanilla.scala
+++ b/tests/disabled/reflect/run/reflection-magicsymbols-vanilla.scala
@@ -11,7 +11,7 @@ class A {
   def foo8(x: Singleton) = ???
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   def test(n: Int): Unit = {
     val sig = typeOf[A] member TermName("foo" + n) info
diff --git a/tests/disabled/reflect/run/reflection-methodsymbol-params.scala b/tests/disabled/reflect/run/reflection-methodsymbol-params.scala
index bbf578ecb20d..d8d76b2db173 100644
--- a/tests/disabled/reflect/run/reflection-methodsymbol-params.scala
+++ b/tests/disabled/reflect/run/reflection-methodsymbol-params.scala
@@ -12,7 +12,7 @@ class C {
   def y4[T](x: Int)(y: Int): Int = ???
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(typeOf[C].member(TermName("x1")).asMethod.paramLists)
   println(typeOf[C].member(TermName("x2")).asMethod.paramLists)
   println(typeOf[C].member(TermName("x3")).asMethod.paramLists)
diff --git a/tests/disabled/reflect/run/reflection-methodsymbol-returntype.scala b/tests/disabled/reflect/run/reflection-methodsymbol-returntype.scala
index d242d6941874..7cf5aa0c1667 100644
--- a/tests/disabled/reflect/run/reflection-methodsymbol-returntype.scala
+++ b/tests/disabled/reflect/run/reflection-methodsymbol-returntype.scala
@@ -12,7 +12,7 @@ class C {
   def y4[T](x: Int)(y: Int): Int = ???
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(typeOf[C].member(TermName("x1")).asMethod.returnType)
   println(typeOf[C].member(TermName("x2")).asMethod.returnType)
   println(typeOf[C].member(TermName("x3")).asMethod.returnType)
diff --git a/tests/disabled/reflect/run/reflection-methodsymbol-typeparams.scala b/tests/disabled/reflect/run/reflection-methodsymbol-typeparams.scala
index 4aa2454ebf33..51b52b24c37b 100644
--- a/tests/disabled/reflect/run/reflection-methodsymbol-typeparams.scala
+++ b/tests/disabled/reflect/run/reflection-methodsymbol-typeparams.scala
@@ -12,7 +12,7 @@ class C {
   def y4[T](x: Int)(y: Int): Int = ???
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(typeOf[C].member(TermName("x1")).asMethod.typeParams)
   println(typeOf[C].member(TermName("x2")).asMethod.typeParams)
   println(typeOf[C].member(TermName("x3")).asMethod.typeParams)
diff --git a/tests/disabled/reflect/run/reflection-modulemirror-inner-badpath.scala b/tests/disabled/reflect/run/reflection-modulemirror-inner-badpath.scala
index 94c3c5e7b4b3..6ecb4234f79e 100644
--- a/tests/disabled/reflect/run/reflection-modulemirror-inner-badpath.scala
+++ b/tests/disabled/reflect/run/reflection-modulemirror-inner-badpath.scala
@@ -18,7 +18,7 @@ class Foo{
  }
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val foo = new Foo
   println(foo.foo)
 }
diff --git a/tests/disabled/reflect/run/reflection-modulemirror-inner-good.scala b/tests/disabled/reflect/run/reflection-modulemirror-inner-good.scala
index 8d115d76a994..ec66c916015e 100644
--- a/tests/disabled/reflect/run/reflection-modulemirror-inner-good.scala
+++ b/tests/disabled/reflect/run/reflection-modulemirror-inner-good.scala
@@ -17,7 +17,7 @@ class Foo{
  }
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val foo = new Foo
   println(foo.foo)
 }
diff --git a/tests/disabled/reflect/run/reflection-modulemirror-nested-badpath.scala b/tests/disabled/reflect/run/reflection-modulemirror-nested-badpath.scala
index d957e45add61..43cae00f9ce1 100644
--- a/tests/disabled/reflect/run/reflection-modulemirror-nested-badpath.scala
+++ b/tests/disabled/reflect/run/reflection-modulemirror-nested-badpath.scala
@@ -19,7 +19,7 @@ class Foo{
 
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   object R { override def toString = "R" }
   val foo = new Foo
   println(foo.foo)
diff --git a/tests/disabled/reflect/run/reflection-modulemirror-nested-good.scala b/tests/disabled/reflect/run/reflection-modulemirror-nested-good.scala
index a165ecfdf2c5..cc123dbec163 100644
--- a/tests/disabled/reflect/run/reflection-modulemirror-nested-good.scala
+++ b/tests/disabled/reflect/run/reflection-modulemirror-nested-good.scala
@@ -17,7 +17,7 @@ class Foo{
  }
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   object R { override def toString = "R" }
   val foo = new Foo
   println(foo.foo)
diff --git a/tests/disabled/reflect/run/reflection-modulemirror-toplevel-badpath.scala b/tests/disabled/reflect/run/reflection-modulemirror-toplevel-badpath.scala
index 35df3eeb1a71..9fc69599fb4b 100644
--- a/tests/disabled/reflect/run/reflection-modulemirror-toplevel-badpath.scala
+++ b/tests/disabled/reflect/run/reflection-modulemirror-toplevel-badpath.scala
@@ -20,7 +20,7 @@ class Foo{
  }
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val foo = new Foo
   println(foo.foo)
 }
diff --git a/tests/disabled/reflect/run/reflection-modulemirror-toplevel-good.scala b/tests/disabled/reflect/run/reflection-modulemirror-toplevel-good.scala
index a278b728eaa9..6ca1071dd75e 100644
--- a/tests/disabled/reflect/run/reflection-modulemirror-toplevel-good.scala
+++ b/tests/disabled/reflect/run/reflection-modulemirror-toplevel-good.scala
@@ -14,7 +14,7 @@ class Foo{
  }
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val foo = new Foo
   println(foo.foo)
 }
diff --git a/tests/disabled/reflect/run/reflection-sanitychecks.scala b/tests/disabled/reflect/run/reflection-sanitychecks.scala
index 9febed474505..47dfcdcc261d 100644
--- a/tests/disabled/reflect/run/reflection-sanitychecks.scala
+++ b/tests/disabled/reflect/run/reflection-sanitychecks.scala
@@ -24,7 +24,7 @@ class E {
   override def toString = "an instance of class E"
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   import scala.reflect.runtime.{currentMirror => cm}
   val im = cm.reflect(new D)
diff --git a/tests/disabled/reflect/run/reflection-scala-annotations.scala b/tests/disabled/reflect/run/reflection-scala-annotations.scala
index d95f05fcbc40..f6a6895ee06b 100644
--- a/tests/disabled/reflect/run/reflection-scala-annotations.scala
+++ b/tests/disabled/reflect/run/reflection-scala-annotations.scala
@@ -10,7 +10,7 @@ class S
 @jann(y = Array(1, 2), x = 2)
 class J
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(symbolOf[S].annotations.head.tree)
   println(symbolOf[J].annotations.head.tree)
 }
diff --git a/tests/disabled/reflect/run/reflection-sync-potpourri.scala b/tests/disabled/reflect/run/reflection-sync-potpourri.scala
index 14e7f281be0f..0af48bb20e56 100644
--- a/tests/disabled/reflect/run/reflection-sync-potpourri.scala
+++ b/tests/disabled/reflect/run/reflection-sync-potpourri.scala
@@ -5,7 +5,7 @@ import scala.reflect.runtime.universe._
 // 2) symbols are correctly materialized into PackageScopes (no dupes)
 // 3) unpickling works okay even we unpickle the same symbol a lot of times
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo[T: TypeTag](x: T) = typeOf[T].toString
   val n = 1000
   val rng = new scala.util.Random()
diff --git a/tests/disabled/reflect/run/reflection-sync-subtypes.scala b/tests/disabled/reflect/run/reflection-sync-subtypes.scala
index 1542b816f349..bcfb24ebb8de 100644
--- a/tests/disabled/reflect/run/reflection-sync-subtypes.scala
+++ b/tests/disabled/reflect/run/reflection-sync-subtypes.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val n = 1000
   val rng = new scala.util.Random()
   val tasks = List(
diff --git a/tests/disabled/reflect/run/reflection-tags.scala b/tests/disabled/reflect/run/reflection-tags.scala
index 6f10519eb816..54b561b574c1 100644
--- a/tests/disabled/reflect/run/reflection-tags.scala
+++ b/tests/disabled/reflect/run/reflection-tags.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.ClassTag
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   var typeMembers = typeOf[scala.reflect.api.Universe].members.filter(sym => sym.isType && !sym.isClass).toList
   typeMembers = typeMembers.filter(_.name != TypeName("ModifiersCreator")) // type ModifiersCreator = ModifiersExtractor
   typeMembers = typeMembers.filter(_.name != TypeName("Importer")) // deprecated
diff --git a/tests/disabled/reflect/run/reflection-valueclasses-derived.scala b/tests/disabled/reflect/run/reflection-valueclasses-derived.scala
index 2121e260a374..8c03c2aab1ab 100644
--- a/tests/disabled/reflect/run/reflection-valueclasses-derived.scala
+++ b/tests/disabled/reflect/run/reflection-valueclasses-derived.scala
@@ -5,7 +5,7 @@ class C(val x: Int) extends AnyVal {
   def foo(y: Int) = x + y
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(cm.reflect(new C(2)).reflectMethod(typeOf[C].member(TermName("foo")).asMethod)(2))
   println(cm.reflect(new C(2)).reflectMethod(typeOf[C].member(TermName("getClass")).asMethod)())
   println(cm.reflect(new C(2)).reflectMethod(typeOf[C].member(TermName("toString")).asMethod)())
diff --git a/tests/disabled/reflect/run/reflection-valueclasses-magic.scala b/tests/disabled/reflect/run/reflection-valueclasses-magic.scala
index ef128a82d93a..e045b882f023 100644
--- a/tests/disabled/reflect/run/reflection-valueclasses-magic.scala
+++ b/tests/disabled/reflect/run/reflection-valueclasses-magic.scala
@@ -9,7 +9,7 @@ package scala {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def key(sym: Symbol) = {
     sym match {
       // initialize parameter symbols
diff --git a/tests/disabled/reflect/run/reflection-valueclasses-standard.scala b/tests/disabled/reflect/run/reflection-valueclasses-standard.scala
index 692c768f26e8..74719dcf55f9 100644
--- a/tests/disabled/reflect/run/reflection-valueclasses-standard.scala
+++ b/tests/disabled/reflect/run/reflection-valueclasses-standard.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.reflect.{ClassTag, classTag}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test[T: ClassTag: TypeTag](x: T) = {
     println(s"========${classTag[T].runtimeClass}========")
     println(cm.reflect(x).reflectMethod(typeOf[T].member(TermName("getClass")).asMethod)())
diff --git a/tests/disabled/reflect/run/reflinit.scala b/tests/disabled/reflect/run/reflinit.scala
index ae9ca407e60f..979dfb380800 100644
--- a/tests/disabled/reflect/run/reflinit.scala
+++ b/tests/disabled/reflect/run/reflinit.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tt2 = typeOf[List[Int]]
   println(tt2)
 }
diff --git a/tests/disabled/reflect/run/reify-aliases.scala b/tests/disabled/reflect/run/reify-aliases.scala
index 0b1d706551b2..31141f3ac4e2 100644
--- a/tests/disabled/reflect/run/reify-aliases.scala
+++ b/tests/disabled/reflect/run/reify-aliases.scala
@@ -1,5 +1,5 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(showRaw(typeOf[String]))
 }
diff --git a/tests/disabled/reflect/run/reify_magicsymbols.scala b/tests/disabled/reflect/run/reify_magicsymbols.scala
index 9d4e06b8a45b..54a6eab9cff0 100644
--- a/tests/disabled/reflect/run/reify_magicsymbols.scala
+++ b/tests/disabled/reflect/run/reify_magicsymbols.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(typeOf[Any])
   println(typeOf[AnyVal])
   println(typeOf[AnyRef])
diff --git a/tests/disabled/reflect/run/resetattrs-this.scala b/tests/disabled/reflect/run/resetattrs-this.scala
index 1c4c288da841..ff45d61dfee0 100644
--- a/tests/disabled/reflect/run/resetattrs-this.scala
+++ b/tests/disabled/reflect/run/resetattrs-this.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val tree = Select(This(cm.staticPackage("scala").moduleClass), TermName("Predef"))
   val ttree = tb.typecheck(tree)
diff --git a/tests/disabled/reflect/run/showraw_aliases.scala b/tests/disabled/reflect/run/showraw_aliases.scala
index fa41b57837c7..b78a72b2e587 100644
--- a/tests/disabled/reflect/run/showraw_aliases.scala
+++ b/tests/disabled/reflect/run/showraw_aliases.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = runtimeMirror(getClass.getClassLoader).mkToolBox()
   val tree = tb.parse("""
     import scala.reflect.runtime.{universe => ru}
diff --git a/tests/disabled/reflect/run/stringbuilder.scala b/tests/disabled/reflect/run/stringbuilder.scala
index 8448aad54889..a98f9cf37dd7 100644
--- a/tests/disabled/reflect/run/stringbuilder.scala
+++ b/tests/disabled/reflect/run/stringbuilder.scala
@@ -1,7 +1,7 @@
 
 import scala.language.reflectiveCalls
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val str = "ABCDEFGHIJKLMABCDEFGHIJKLM"
   val surrogateStr = "an old Turkic letter: \uD803\uDC22"
 
diff --git a/tests/disabled/reflect/run/structural.scala b/tests/disabled/reflect/run/structural.scala
index cb542c0fdbe3..f14086cc4393 100644
--- a/tests/disabled/reflect/run/structural.scala
+++ b/tests/disabled/reflect/run/structural.scala
@@ -196,7 +196,7 @@ object test4 {
 
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   test1
   test2
   test3
diff --git a/tests/disabled/reflect/run/t0421-new.scala b/tests/disabled/reflect/run/t0421-new.scala
index 96d39534c259..f743470a3ea7 100644
--- a/tests/disabled/reflect/run/t0421-new.scala
+++ b/tests/disabled/reflect/run/t0421-new.scala
@@ -1,7 +1,7 @@
 import scala.reflect.{ClassTag, classTag}
 
 // ticket #421
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def transpose[A: ClassTag](xss: Array[Array[A]]) = {
     for (i <- Array.range(0, xss(0).length)) yield
diff --git a/tests/disabled/reflect/run/t0677-new.scala b/tests/disabled/reflect/run/t0677-new.scala
index 8aee295c3bea..e1e2cefc9a47 100644
--- a/tests/disabled/reflect/run/t0677-new.scala
+++ b/tests/disabled/reflect/run/t0677-new.scala
@@ -1,6 +1,6 @@
 import scala.reflect.{ClassTag, classTag}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class X[T: ClassTag] {
     val a = Array.ofDim[T](3, 4)
   }
diff --git a/tests/disabled/reflect/run/t1110.scala b/tests/disabled/reflect/run/t1110.scala
index 964df7590e3c..81917789c8d4 100644
--- a/tests/disabled/reflect/run/t1110.scala
+++ b/tests/disabled/reflect/run/t1110.scala
@@ -10,6 +10,6 @@ class Stuff {
   assert(zoop(10) == 2)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Stuff
 }
diff --git a/tests/disabled/reflect/run/t1141.scala b/tests/disabled/reflect/run/t1141.scala
index ad22d26c0754..732c57943cf4 100644
--- a/tests/disabled/reflect/run/t1141.scala
+++ b/tests/disabled/reflect/run/t1141.scala
@@ -2,7 +2,7 @@
 
 import scala.language.reflectiveCalls
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val foo = new {
     def apply(args : String*) = args foreach println
   }
diff --git a/tests/disabled/reflect/run/t1766.scala b/tests/disabled/reflect/run/t1766.scala
index 150cf149544c..ff81da3f8e68 100644
--- a/tests/disabled/reflect/run/t1766.scala
+++ b/tests/disabled/reflect/run/t1766.scala
@@ -1,7 +1,7 @@
 
 import scala.language.{ reflectiveCalls }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   class C(s: String) {
 
diff --git a/tests/disabled/reflect/run/t2236-new.scala b/tests/disabled/reflect/run/t2236-new.scala
index dc441318f8bb..c50e85633a20 100644
--- a/tests/disabled/reflect/run/t2236-new.scala
+++ b/tests/disabled/reflect/run/t2236-new.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.universe._
 class T[A](implicit val m:TypeTag[A])
 class Foo
 class Bar extends T[Foo]
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Bar
 }
 
diff --git a/tests/disabled/reflect/run/t3346f.scala b/tests/disabled/reflect/run/t3346f.scala
index 1871b27bd469..b2dc16de5bfd 100644
--- a/tests/disabled/reflect/run/t3346f.scala
+++ b/tests/disabled/reflect/run/t3346f.scala
@@ -1,7 +1,7 @@
 import scala.language.implicitConversions
 import scala.language.reflectiveCalls
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   trait Foo[A]
   implicit def fooString: Foo[String] = null
   implicit def value[A](implicit foo: Foo[A]): Int = 5
diff --git a/tests/disabled/reflect/run/t3346j.scala b/tests/disabled/reflect/run/t3346j.scala
index b1d1f3c2e595..bfacb6d0e17a 100644
--- a/tests/disabled/reflect/run/t3346j.scala
+++ b/tests/disabled/reflect/run/t3346j.scala
@@ -2,7 +2,7 @@ import scala.language.implicitConversions
 import scala.language.reflectiveCalls
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A[T]
   class B[T]
   implicit def foo[T: TypeTag](a: A[T])(implicit b: B[T]): AnyRef{def baz: reflect.runtime.universe.Type} = new { def baz = typeOf[T] }
diff --git a/tests/disabled/reflect/run/t3507-new.scala b/tests/disabled/reflect/run/t3507-new.scala
index 5e690524efc7..bd16849e8aeb 100644
--- a/tests/disabled/reflect/run/t3507-new.scala
+++ b/tests/disabled/reflect/run/t3507-new.scala
@@ -9,7 +9,7 @@ class A {
   def m = b.c
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   var a: A = new A // mutable
   val c /*: object _1.b.c forSome { val _1: A } */ = a.m // widening using existential
 
diff --git a/tests/disabled/reflect/run/t4110-new.scala b/tests/disabled/reflect/run/t4110-new.scala
index 49a05dc9241d..47d2103213a6 100644
--- a/tests/disabled/reflect/run/t4110-new.scala
+++ b/tests/disabled/reflect/run/t4110-new.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def inferredType[T : TypeTag](v : T) = println(typeOf[T])
 
   trait A
diff --git a/tests/disabled/reflect/run/t4766.scala b/tests/disabled/reflect/run/t4766.scala
index b7d1b6cfa7ff..d67431f50e01 100644
--- a/tests/disabled/reflect/run/t4766.scala
+++ b/tests/disabled/reflect/run/t4766.scala
@@ -2,7 +2,7 @@
 import scala.language.postfixOps
 import scala.language.reflectiveCalls
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = new {
     def > = 1
   }
diff --git a/tests/disabled/reflect/run/t4813.scala b/tests/disabled/reflect/run/t4813.scala
index 1146bb16ec04..6d48ca87588e 100644
--- a/tests/disabled/reflect/run/t4813.scala
+++ b/tests/disabled/reflect/run/t4813.scala
@@ -2,7 +2,7 @@ import collection.mutable._
 import reflect._
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def runTest[T, U](col: T)(clone: T => U)(mod: T => Unit)(implicit ct: ClassTag[T]): Unit = {
      val cloned = clone(col)
      assert(cloned == col, s"cloned should be equal to original. $cloned != $col")
diff --git a/tests/disabled/reflect/run/t5080.scala b/tests/disabled/reflect/run/t5080.scala
index c20e378bbf5a..4099ba6f1fff 100644
--- a/tests/disabled/reflect/run/t5080.scala
+++ b/tests/disabled/reflect/run/t5080.scala
@@ -2,7 +2,7 @@
 import scala.language.implicitConversions
 import scala.language.reflectiveCalls
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   abstract class Value {
   }
diff --git a/tests/disabled/reflect/run/t5256a.scala b/tests/disabled/reflect/run/t5256a.scala
index a1ed76b11a49..5f8a10575ee7 100644
--- a/tests/disabled/reflect/run/t5256a.scala
+++ b/tests/disabled/reflect/run/t5256a.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 
 class A { def foo = ??? }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = cm.classSymbol(classOf[A])
   println(c)
   println(c.fullName)
diff --git a/tests/disabled/reflect/run/t5256b.scala b/tests/disabled/reflect/run/t5256b.scala
index 065890a2b2db..769d133b3bf2 100644
--- a/tests/disabled/reflect/run/t5256b.scala
+++ b/tests/disabled/reflect/run/t5256b.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A { def foo = ??? }
   val c = cm.classSymbol(classOf[A])
   println(c)
diff --git a/tests/disabled/reflect/run/t5256c.scala b/tests/disabled/reflect/run/t5256c.scala
index 21bac2e5d36c..6ef0cf9588d0 100644
--- a/tests/disabled/reflect/run/t5256c.scala
+++ b/tests/disabled/reflect/run/t5256c.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     class A { def foo = ??? }
     val c = cm.classSymbol(classOf[A])
diff --git a/tests/disabled/reflect/run/t5256e.scala b/tests/disabled/reflect/run/t5256e.scala
index a7a83d0683d8..cf5be9a9a908 100644
--- a/tests/disabled/reflect/run/t5256e.scala
+++ b/tests/disabled/reflect/run/t5256e.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C { class A { def foo = ??? } }
   val c = cm.classSymbol(classOf[C#A])
   println(c)
diff --git a/tests/disabled/reflect/run/t5256f.scala b/tests/disabled/reflect/run/t5256f.scala
index 3a9dd5998cf0..1de2592416c3 100644
--- a/tests/disabled/reflect/run/t5256f.scala
+++ b/tests/disabled/reflect/run/t5256f.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A1 { def foo = ??? }
 
   val c1 = cm.classSymbol(classOf[A1])
diff --git a/tests/disabled/reflect/run/t5256g.scala b/tests/disabled/reflect/run/t5256g.scala
index fce57ab6eedd..2d4c1b50681a 100644
--- a/tests/disabled/reflect/run/t5256g.scala
+++ b/tests/disabled/reflect/run/t5256g.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 class A
 trait B
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val mutant = new A with B
   val c = cm.classSymbol(mutant.getClass)
   println(c)
diff --git a/tests/disabled/reflect/run/t5256h.scala b/tests/disabled/reflect/run/t5256h.scala
index 5376caeffb15..435124a469f9 100644
--- a/tests/disabled/reflect/run/t5256h.scala
+++ b/tests/disabled/reflect/run/t5256h.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val mutant = new { val x = 2 }
   val c = cm.classSymbol(mutant.getClass)
   println(c)
diff --git a/tests/disabled/reflect/run/t5423.scala b/tests/disabled/reflect/run/t5423.scala
index 98aeda1299dc..eab029b30285 100644
--- a/tests/disabled/reflect/run/t5423.scala
+++ b/tests/disabled/reflect/run/t5423.scala
@@ -5,7 +5,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 final class table extends annotation.StaticAnnotation
 @table class A
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val s = cm.classSymbol(classOf[A])
   println(s.annotations)
 }
diff --git a/tests/disabled/reflect/run/t5565.scala b/tests/disabled/reflect/run/t5565.scala
index c46068caf5d6..91e238d0703f 100644
--- a/tests/disabled/reflect/run/t5565.scala
+++ b/tests/disabled/reflect/run/t5565.scala
@@ -1,7 +1,7 @@
 import scala.language.reflectiveCalls
 import scala.language.implicitConversions
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit def doubleWithApproxEquals(d: Double): AnyRef{def ~==(v: Double,margin: Double): Boolean; def ~==$default$2: Double @scala.annotation.unchecked.uncheckedVariance} = new {
     def ~==(v: Double, margin: Double = 0.001): Boolean =
       math.abs(d - v) < margin
diff --git a/tests/disabled/reflect/run/t5881.scala b/tests/disabled/reflect/run/t5881.scala
index 3191e975d4f7..14d794da9206 100644
--- a/tests/disabled/reflect/run/t5881.scala
+++ b/tests/disabled/reflect/run/t5881.scala
@@ -1,7 +1,7 @@
 import scala.language.existentials
 import scala.reflect.ClassTag
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[ClassTag[List[T forSome { type T <: List[T] }]]])
   println(implicitly[ClassTag[List[Any]]])
 }
diff --git a/tests/disabled/reflect/run/t5912.scala b/tests/disabled/reflect/run/t5912.scala
index 6e70205ab5ce..fc879a05371e 100644
--- a/tests/disabled/reflect/run/t5912.scala
+++ b/tests/disabled/reflect/run/t5912.scala
@@ -1,5 +1,5 @@
 import scala.language.existentials
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   import scala.reflect.runtime.{currentMirror=>cm}
   import scala.tools.reflect._
   import scala.reflect.runtime.universe._
diff --git a/tests/disabled/reflect/run/t5914.scala b/tests/disabled/reflect/run/t5914.scala
index 472c4c8530da..39a8dd3caa5c 100644
--- a/tests/disabled/reflect/run/t5914.scala
+++ b/tests/disabled/reflect/run/t5914.scala
@@ -15,7 +15,7 @@ trait Trees {
     }
 }
 
-object Test extends dotty.runtime.LegacyApp with Trees {
+object Test extends App with Trees {
   val ttTag = implicitly[ClassTag[TypeTree]]
   case class TypeTree(meh: String) extends Tree
   object TypeTree extends TypeTreeExtractor
diff --git a/tests/disabled/reflect/run/t5942.scala b/tests/disabled/reflect/run/t5942.scala
index b7a3c5138aff..c90d29e1ca33 100644
--- a/tests/disabled/reflect/run/t5942.scala
+++ b/tests/disabled/reflect/run/t5942.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   tb.parse("def x = {}")
   try { tb.parse("def x = {") } catch { case _: Throwable => }
diff --git a/tests/disabled/reflect/run/t5943a1.scala b/tests/disabled/reflect/run/t5943a1.scala
index ce13259d65bf..ee62ea76ba47 100644
--- a/tests/disabled/reflect/run/t5943a1.scala
+++ b/tests/disabled/reflect/run/t5943a1.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val expr = tb.parse("1 to 3 map (_+1)")
   println(tb.typecheck(expr))
diff --git a/tests/disabled/reflect/run/t5943a2.scala b/tests/disabled/reflect/run/t5943a2.scala
index 2ad87050f557..5007a4d5e859 100644
--- a/tests/disabled/reflect/run/t5943a2.scala
+++ b/tests/disabled/reflect/run/t5943a2.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val expr = tb.parse("1 to 3 map (_+1)")
   println(tb.eval(expr))
diff --git a/tests/disabled/reflect/run/t6011c.scala b/tests/disabled/reflect/run/t6011c.scala
index 8050c27a48e2..96a685b9cfd4 100644
--- a/tests/disabled/reflect/run/t6011c.scala
+++ b/tests/disabled/reflect/run/t6011c.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // A variation of SI-6011, which eluded the fix
   // in 2.10.0.
   //
diff --git a/tests/disabled/reflect/run/t6086-vanilla.scala b/tests/disabled/reflect/run/t6086-vanilla.scala
index 0fd5eedf6eea..84faa57f6f24 100644
--- a/tests/disabled/reflect/run/t6086-vanilla.scala
+++ b/tests/disabled/reflect/run/t6086-vanilla.scala
@@ -1,6 +1,6 @@
 case class X(s: String)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   println(typeOf[X])
 }
diff --git a/tests/disabled/reflect/run/t6113.scala b/tests/disabled/reflect/run/t6113.scala
index 5322a4a35d67..b77a56029ad1 100644
--- a/tests/disabled/reflect/run/t6113.scala
+++ b/tests/disabled/reflect/run/t6113.scala
@@ -2,7 +2,7 @@ import scala.language.higherKinds
 
 trait Foo[C[_]]
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   println(typeOf[Foo[({type l[X] = (Int, X)})#l]])
 }
diff --git a/tests/disabled/reflect/run/t6175.scala b/tests/disabled/reflect/run/t6175.scala
index 963177c9c648..5ee1ab05ea11 100644
--- a/tests/disabled/reflect/run/t6175.scala
+++ b/tests/disabled/reflect/run/t6175.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import reflect.runtime._
   val m = universe.typeOf[List[_]].members.head.asMethod
   currentMirror.reflect (List (2, 3, 1)).reflectMethod(m)
diff --git a/tests/disabled/reflect/run/t6178.scala b/tests/disabled/reflect/run/t6178.scala
index 04833f6171dc..2caea1eb263b 100644
--- a/tests/disabled/reflect/run/t6178.scala
+++ b/tests/disabled/reflect/run/t6178.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val plus = typeOf[java.lang.String].member(TermName("$plus")).asMethod
   println(cm.reflect("").reflectMethod(plus).apply("2"))
 }
diff --git a/tests/disabled/reflect/run/t6181.scala b/tests/disabled/reflect/run/t6181.scala
index 13f07497c85e..4ec9a4a0aec8 100644
--- a/tests/disabled/reflect/run/t6181.scala
+++ b/tests/disabled/reflect/run/t6181.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C { def test(x: => Int) = println(x) }
   val mm = cm.reflect(new C).reflectMethod(typeOf[C].member(TermName("test")).asMethod)
   mm(2)
diff --git a/tests/disabled/reflect/run/t6199-mirror.scala b/tests/disabled/reflect/run/t6199-mirror.scala
index 1b061d4dd756..b85ca9162797 100644
--- a/tests/disabled/reflect/run/t6199-mirror.scala
+++ b/tests/disabled/reflect/run/t6199-mirror.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C { def foo = () }
   println(cm.reflect(new C).reflectMethod(typeOf[C].member(TermName("foo")).asMethod)())
 }
diff --git a/tests/disabled/reflect/run/t6199-toolbox.scala b/tests/disabled/reflect/run/t6199-toolbox.scala
index 08209b3464b0..d11f566ea2d5 100644
--- a/tests/disabled/reflect/run/t6199-toolbox.scala
+++ b/tests/disabled/reflect/run/t6199-toolbox.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   println(tb.eval(q"()"))
 }
diff --git a/tests/disabled/reflect/run/t6240a/StepTwo.scala b/tests/disabled/reflect/run/t6240a/StepTwo.scala
index d2232c3f7e43..f20d7b83cb2a 100644
--- a/tests/disabled/reflect/run/t6240a/StepTwo.scala
+++ b/tests/disabled/reflect/run/t6240a/StepTwo.scala
@@ -1,7 +1,7 @@
 import java.io.File
 import java.net.URLClassLoader
 
-object StepTwo extends dotty.runtime.LegacyApp {
+object StepTwo extends App {
   import scala.reflect.runtime.universe._
   println(typeOf[StepTwo.type])
 }
diff --git a/tests/disabled/reflect/run/t6240a/Test.scala b/tests/disabled/reflect/run/t6240a/Test.scala
index e474b554c77a..844c0763ec82 100644
--- a/tests/disabled/reflect/run/t6240a/Test.scala
+++ b/tests/disabled/reflect/run/t6240a/Test.scala
@@ -1,7 +1,7 @@
 import java.io.File
 import scala.sys.process._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def prop(key: String) = {
     val value = System.getProperties.getProperty(key)
     assert(value != null, key)
diff --git a/tests/disabled/reflect/run/t6240b/StepThree.scala b/tests/disabled/reflect/run/t6240b/StepThree.scala
index a5432cdf1c1b..6690b8351461 100644
--- a/tests/disabled/reflect/run/t6240b/StepThree.scala
+++ b/tests/disabled/reflect/run/t6240b/StepThree.scala
@@ -1,4 +1,4 @@
-object StepThree extends dotty.runtime.LegacyApp {
+object StepThree extends App {
   import scala.reflect.runtime.universe._
   println(typeOf[StepThree.type])
 }
diff --git a/tests/disabled/reflect/run/t6240b/StepTwo.scala b/tests/disabled/reflect/run/t6240b/StepTwo.scala
index b3d977819869..d607c01cd1a7 100644
--- a/tests/disabled/reflect/run/t6240b/StepTwo.scala
+++ b/tests/disabled/reflect/run/t6240b/StepTwo.scala
@@ -1,7 +1,7 @@
 import java.io.File
 import java.net.URLClassLoader
 
-object StepTwo extends dotty.runtime.LegacyApp {
+object StepTwo extends App {
   val classes = new File(System.getProperty("launch.step.three"))
   val cl = new URLClassLoader(Array(classes.toURI.toURL), getClass.getClassLoader)
   val stepThree = cl.loadClass("StepThree")
diff --git a/tests/disabled/reflect/run/t6240b/Test.scala b/tests/disabled/reflect/run/t6240b/Test.scala
index e474b554c77a..844c0763ec82 100644
--- a/tests/disabled/reflect/run/t6240b/Test.scala
+++ b/tests/disabled/reflect/run/t6240b/Test.scala
@@ -1,7 +1,7 @@
 import java.io.File
 import scala.sys.process._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def prop(key: String) = {
     val value = System.getProperties.getProperty(key)
     assert(value != null, key)
diff --git a/tests/disabled/reflect/run/t6259.scala b/tests/disabled/reflect/run/t6259.scala
index 9b4d76b519bd..2280231f4d9e 100644
--- a/tests/disabled/reflect/run/t6259.scala
+++ b/tests/disabled/reflect/run/t6259.scala
@@ -44,7 +44,7 @@ object DoubleOk extends DoubleTrouble[String]({
   InnerTrouble
 })
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   B
   C.D
   val e = new E {}; e.F
diff --git a/tests/disabled/reflect/run/t6277.scala b/tests/disabled/reflect/run/t6277.scala
index 3e8616852ec2..48db23da2e25 100644
--- a/tests/disabled/reflect/run/t6277.scala
+++ b/tests/disabled/reflect/run/t6277.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   locally {
     val sym = typeOf[List[_]].typeSymbol.asClass
     val q = sym.isSealed
diff --git a/tests/disabled/reflect/run/t6287.scala b/tests/disabled/reflect/run/t6287.scala
index 0607e750b3fd..d0a0f70055d5 100644
--- a/tests/disabled/reflect/run/t6287.scala
+++ b/tests/disabled/reflect/run/t6287.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val t1 = tb.parse("1 to 3 map (_+1)")
   println(tb.eval(t1))
diff --git a/tests/disabled/reflect/run/t6318_derived.scala b/tests/disabled/reflect/run/t6318_derived.scala
index 024f8b35ed01..e704730624d8 100644
--- a/tests/disabled/reflect/run/t6318_derived.scala
+++ b/tests/disabled/reflect/run/t6318_derived.scala
@@ -1,6 +1,6 @@
 import scala.reflect.{ClassTag, classTag}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test[T: ClassTag](x: T): Unit = {
     println(classTag[T].runtimeClass.isAssignableFrom(x.getClass))
     println(classTag[T].unapply(x))
diff --git a/tests/disabled/reflect/run/t6318_primitives.scala b/tests/disabled/reflect/run/t6318_primitives.scala
index 3b2f968d440e..36e25de6266e 100644
--- a/tests/disabled/reflect/run/t6318_primitives.scala
+++ b/tests/disabled/reflect/run/t6318_primitives.scala
@@ -1,6 +1,6 @@
 import scala.reflect.{ClassTag, classTag}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test[T: ClassTag](x: T): Unit = {
     println(s"Checking if ${x.getClass} matches ${classTag[T].runtimeClass}")
     println(classTag[T].unapply(x))
diff --git a/tests/disabled/reflect/run/t6323b.scala b/tests/disabled/reflect/run/t6323b.scala
index 9cbc1b9ed815..88c2ae54dd41 100644
--- a/tests/disabled/reflect/run/t6323b.scala
+++ b/tests/disabled/reflect/run/t6323b.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => m}
 import scala.reflect.runtime.{universe => u}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   locally {
     try {
       case class Test(a:String,b:List[Int])
diff --git a/tests/disabled/reflect/run/t6329_vanilla.scala b/tests/disabled/reflect/run/t6329_vanilla.scala
index b1c1f7fd773b..ec84f1f938cf 100644
--- a/tests/disabled/reflect/run/t6329_vanilla.scala
+++ b/tests/disabled/reflect/run/t6329_vanilla.scala
@@ -1,7 +1,7 @@
 import scala.reflect.classTag
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classManifest[scala.List[_]])
   println(classTag[scala.List[_]])
   println(classManifest[scala.collection.immutable.List[_]])
diff --git a/tests/disabled/reflect/run/t6329_vanilla_bug.scala b/tests/disabled/reflect/run/t6329_vanilla_bug.scala
index 7d6e732ea772..a0e6092cd048 100644
--- a/tests/disabled/reflect/run/t6329_vanilla_bug.scala
+++ b/tests/disabled/reflect/run/t6329_vanilla_bug.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classManifest[List[_]])
   println(scala.reflect.classTag[List[_]])
 }
diff --git a/tests/disabled/reflect/run/t6392a.scala b/tests/disabled/reflect/run/t6392a.scala
index 727b19eb8848..0da8552fb4e0 100644
--- a/tests/disabled/reflect/run/t6392a.scala
+++ b/tests/disabled/reflect/run/t6392a.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val c = tb.parse("object C")
   println(tb.eval(c))
diff --git a/tests/disabled/reflect/run/t6392b.scala b/tests/disabled/reflect/run/t6392b.scala
index 4c02b09ef69e..29c9a0112f10 100644
--- a/tests/disabled/reflect/run/t6392b.scala
+++ b/tests/disabled/reflect/run/t6392b.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val c = tb.parse("object C")
   println(showRaw(tb.typecheck(c), printKinds = true))
diff --git a/tests/disabled/reflect/run/t6411a.scala b/tests/disabled/reflect/run/t6411a.scala
index 616b6cea90f0..aaf3c39d837f 100644
--- a/tests/disabled/reflect/run/t6411a.scala
+++ b/tests/disabled/reflect/run/t6411a.scala
@@ -29,7 +29,7 @@ object a {
   def zns_8(z: => Z[String])     = z.i
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(methName: String, arg: Any) = {
     val moduleA = cm.reflect(a)
     val msym = moduleA.symbol.info.decl(TermName(methName)).asMethod
diff --git a/tests/disabled/reflect/run/t6411b.scala b/tests/disabled/reflect/run/t6411b.scala
index 3543f24a9ee2..f303eb6ec5bd 100644
--- a/tests/disabled/reflect/run/t6411b.scala
+++ b/tests/disabled/reflect/run/t6411b.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.universe._
 case class Foo(n: Int) extends AnyVal
 case class Bar(foo: Foo)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val mirror = runtimeMirror(getClass.getClassLoader)
   val cm = mirror.reflectClass(typeOf[Bar].typeSymbol.asClass)
   val ctor = typeOf[Bar].decl(termNames.CONSTRUCTOR).asMethod
diff --git a/tests/disabled/reflect/run/t6548/Test_2.scala b/tests/disabled/reflect/run/t6548/Test_2.scala
index b392ff726e78..cb5abd9c3942 100644
--- a/tests/disabled/reflect/run/t6548/Test_2.scala
+++ b/tests/disabled/reflect/run/t6548/Test_2.scala
@@ -6,7 +6,7 @@ class Bean {
   def value = 1
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(cm.staticClass("Bean").isCaseClass)
   println(typeOf[Bean].decl(TermName("value")).annotations)
 }
diff --git a/tests/disabled/reflect/run/t6608.scala b/tests/disabled/reflect/run/t6608.scala
index 3671e2892b4d..2ba979649bc3 100644
--- a/tests/disabled/reflect/run/t6608.scala
+++ b/tests/disabled/reflect/run/t6608.scala
@@ -5,7 +5,7 @@ class C {
   @inline def foo = yyy
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import universe._
   val access = typeOf[C].decls
     .toList
diff --git a/tests/disabled/reflect/run/t6622.scala b/tests/disabled/reflect/run/t6622.scala
index ded10e8e22c7..cd52a5d0608e 100644
--- a/tests/disabled/reflect/run/t6622.scala
+++ b/tests/disabled/reflect/run/t6622.scala
@@ -36,7 +36,7 @@ object O4 {
 }
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def check(desc: String, clazz: Class[_]): Unit = {
     println(s" $desc isMemberClass = ${clazz.isMemberClass}, ${clazz.getEnclosingMethod}")
     println(reflect.runtime.currentMirror.classSymbol(clazz))
diff --git a/tests/disabled/reflect/run/t6690.scala b/tests/disabled/reflect/run/t6690.scala
index d8d6403119e8..d7e041fafb8a 100644
--- a/tests/disabled/reflect/run/t6690.scala
+++ b/tests/disabled/reflect/run/t6690.scala
@@ -2,7 +2,7 @@ import scala.collection.mutable
 
 import scala.language.{ reflectiveCalls }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def last0(ml: mutable.MutableList[Int]) =
     ml.asInstanceOf[{def last0: mutable.LinkedList[Int]}].last0
 
diff --git a/tests/disabled/reflect/run/t6719.scala b/tests/disabled/reflect/run/t6719.scala
index f55e3323f694..efde06435a07 100644
--- a/tests/disabled/reflect/run/t6719.scala
+++ b/tests/disabled/reflect/run/t6719.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val tree = tb.parse("(); val res = 0")
   println(tb.eval(tree))
diff --git a/tests/disabled/reflect/run/t6733.scala b/tests/disabled/reflect/run/t6733.scala
index 99164ae5261e..27efadca3e3b 100644
--- a/tests/disabled/reflect/run/t6733.scala
+++ b/tests/disabled/reflect/run/t6733.scala
@@ -30,6 +30,6 @@ trait Foo {
   protected[this] object Pro8
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   typeOf[Foo].decls.sorted.foreach(m => println(s"$m: isPrivateThis = ${m.isPrivateThis}, isProtectedThis = ${m.isProtectedThis}"))
 }
diff --git a/tests/disabled/reflect/run/t6989/Test_2.scala b/tests/disabled/reflect/run/t6989/Test_2.scala
index 891f8f6c2ee2..932a369f6c0a 100644
--- a/tests/disabled/reflect/run/t6989/Test_2.scala
+++ b/tests/disabled/reflect/run/t6989/Test_2.scala
@@ -37,6 +37,6 @@ package object foo {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   foo.testAll()
 }
\ No newline at end of file
diff --git a/tests/disabled/reflect/run/t7045.scala b/tests/disabled/reflect/run/t7045.scala
index 330fa7fc6fab..305adeb3e158 100644
--- a/tests/disabled/reflect/run/t7045.scala
+++ b/tests/disabled/reflect/run/t7045.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 class C
 class D { self: C => }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val d = cm.staticClass("D")
   println(d.selfType)
   d.info
diff --git a/tests/disabled/reflect/run/t7046.scala b/tests/disabled/reflect/run/t7046.scala
index 96a5d154e564..761e5d178b7d 100644
--- a/tests/disabled/reflect/run/t7046.scala
+++ b/tests/disabled/reflect/run/t7046.scala
@@ -5,7 +5,7 @@ sealed class C
 class D extends C
 class E extends C
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = cm.staticClass("C")
   println(c.knownDirectSubclasses)
   c.info
diff --git a/tests/disabled/reflect/run/t7328.scala b/tests/disabled/reflect/run/t7328.scala
index 401a76e51174..1e7b19674e05 100644
--- a/tests/disabled/reflect/run/t7328.scala
+++ b/tests/disabled/reflect/run/t7328.scala
@@ -4,7 +4,7 @@ import scala.reflect.runtime.{currentMirror => cm}
 case class Foo(x: Int) extends AnyVal
 case class Bar(foo: Foo)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val foo = typeOf[Bar].decl(TermName("foo")).asMethod
   println(foo.returnType) // Foo
 
diff --git a/tests/disabled/reflect/run/t7331a.scala b/tests/disabled/reflect/run/t7331a.scala
index 057713af8da4..cd9d2aa73367 100644
--- a/tests/disabled/reflect/run/t7331a.scala
+++ b/tests/disabled/reflect/run/t7331a.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val tree = tb.parse("x")
   println(tree.pos)
diff --git a/tests/disabled/reflect/run/t7331b.scala b/tests/disabled/reflect/run/t7331b.scala
index 0d55e558e8be..e499fc0b3267 100644
--- a/tests/disabled/reflect/run/t7331b.scala
+++ b/tests/disabled/reflect/run/t7331b.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.{ToolBox, ToolBoxError}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   try tb.parse("f(x")
   catch {
diff --git a/tests/disabled/reflect/run/t7331c.scala b/tests/disabled/reflect/run/t7331c.scala
index ba6fbd01e7fe..cd5cf88b06de 100644
--- a/tests/disabled/reflect/run/t7331c.scala
+++ b/tests/disabled/reflect/run/t7331c.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val tree = tb.parse("class C").asInstanceOf[ClassDef]
   println(showRaw(tree))
diff --git a/tests/disabled/reflect/run/t7359/Test_2.scala b/tests/disabled/reflect/run/t7359/Test_2.scala
index c8e5788d5862..bb6f4cb2d94f 100644
--- a/tests/disabled/reflect/run/t7359/Test_2.scala
+++ b/tests/disabled/reflect/run/t7359/Test_2.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   typeOf[Cyclic].members
   println("ok")
 }
\ No newline at end of file
diff --git a/tests/disabled/reflect/run/t7510/Test_2.scala b/tests/disabled/reflect/run/t7510/Test_2.scala
index edb8bfba4253..7d7a95e0f215 100644
--- a/tests/disabled/reflect/run/t7510/Test_2.scala
+++ b/tests/disabled/reflect/run/t7510/Test_2.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   tb.compile(tb.parse("@foo.Ann_1 class C"))
 }
diff --git a/tests/disabled/reflect/run/t7533.scala b/tests/disabled/reflect/run/t7533.scala
index ac0c662e43d1..308ad493d79f 100644
--- a/tests/disabled/reflect/run/t7533.scala
+++ b/tests/disabled/reflect/run/t7533.scala
@@ -22,7 +22,7 @@ class D extends C {
 }
 object M
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println("Testing Symbol.isAbstract...")
   def test[T: TypeTag] = {
     val sym = typeOf[T].typeSymbol
diff --git a/tests/disabled/reflect/run/t7570a.scala b/tests/disabled/reflect/run/t7570a.scala
index 1e01488d91fb..7a264ce8db84 100644
--- a/tests/disabled/reflect/run/t7570a.scala
+++ b/tests/disabled/reflect/run/t7570a.scala
@@ -4,7 +4,7 @@ import scala.tools.reflect.ToolBox
 import definitions._
 import Flag._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val csym = tb.define(q"""class C { override def toString = "C" }""")
   println(tb.eval(q"new $csym"))
diff --git a/tests/disabled/reflect/run/t7570b.scala b/tests/disabled/reflect/run/t7570b.scala
index 8c149853176b..df41d9d27976 100644
--- a/tests/disabled/reflect/run/t7570b.scala
+++ b/tests/disabled/reflect/run/t7570b.scala
@@ -5,7 +5,7 @@ import definitions._
 import Flag._
 import internal._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val msg = internal.reificationSupport.newFreeTerm("msg", "C")
   internal.reificationSupport.setInfo(msg, typeOf[String])
diff --git a/tests/disabled/reflect/run/t7570c.scala b/tests/disabled/reflect/run/t7570c.scala
index 9fa3ac8b1daa..f8ba0fea1b01 100644
--- a/tests/disabled/reflect/run/t7570c.scala
+++ b/tests/disabled/reflect/run/t7570c.scala
@@ -4,7 +4,7 @@ import scala.tools.reflect.{ToolBox, ToolBoxError}
 import definitions._
 import Flag._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   val csym = tb.define(q"""class C { override def toString = "C" }""")
   println((csym, csym.isClass, csym.isModule, csym.isModuleClass))
diff --git a/tests/disabled/reflect/run/t7779.scala b/tests/disabled/reflect/run/t7779.scala
index bc92403a9c36..db32cb751f22 100644
--- a/tests/disabled/reflect/run/t7779.scala
+++ b/tests/disabled/reflect/run/t7779.scala
@@ -45,7 +45,7 @@ package pack {
 }
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import reflect.runtime.universe._
   def test[T: TypeTag] = {
     val tt = typeTag[T]
diff --git a/tests/disabled/reflect/run/t7817.scala b/tests/disabled/reflect/run/t7817.scala
index 547ec9d846a6..905b8aeb09d6 100644
--- a/tests/disabled/reflect/run/t7817.scala
+++ b/tests/disabled/reflect/run/t7817.scala
@@ -20,7 +20,7 @@ package test {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object fooable { def foo = "foo" }
   def check(result: Any) = assert(result == "foo", result.toString)
 
diff --git a/tests/disabled/reflect/run/t8047.scala b/tests/disabled/reflect/run/t8047.scala
index 9139ce01c4cc..f5660541e839 100644
--- a/tests/disabled/reflect/run/t8047.scala
+++ b/tests/disabled/reflect/run/t8047.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.runtime.universe._
   //
   // x's owner is outer Test scope. Previosly the quasiquote expansion
diff --git a/tests/disabled/reflect/run/t8190.scala b/tests/disabled/reflect/run/t8190.scala
index 4e6f7c462b1e..e1bcc8faeb17 100644
--- a/tests/disabled/reflect/run/t8190.scala
+++ b/tests/disabled/reflect/run/t8190.scala
@@ -94,7 +94,7 @@ trait Overloads {
   def test(x: TreeCopier) = "TreeCopier"
 }
 
-object Test extends dotty.runtime.LegacyApp with Overloads {
+object Test extends App with Overloads {
   val buf = scala.collection.mutable.ListBuffer[String]()
   def record(result: String): Unit = {
     println(result)
diff --git a/tests/disabled/reflect/run/t8196.scala b/tests/disabled/reflect/run/t8196.scala
index bb40aa205973..e219ac166b0d 100644
--- a/tests/disabled/reflect/run/t8196.scala
+++ b/tests/disabled/reflect/run/t8196.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.{ universe => ru }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
  
   trait FormTrait {
 
diff --git a/tests/disabled/reflect/run/t8549.scala b/tests/disabled/reflect/run/t8549.scala
index f30841174d50..e9acad97cbfa 100644
--- a/tests/disabled/reflect/run/t8549.scala
+++ b/tests/disabled/reflect/run/t8549.scala
@@ -9,7 +9,7 @@ import scala.reflect.io.File
 //    )
 //
 // Use this to re-establish a baseline for serialization compatibility.
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val overwrite: Option[File] = sys.props.get("overwrite.source").map(s => new File(new java.io.File(s)))
 
   def serialize(o: AnyRef): String = {
diff --git a/tests/disabled/reflect/run/t8574.scala b/tests/disabled/reflect/run/t8574.scala
index e241868c1c18..9a7f6b2ba3c5 100644
--- a/tests/disabled/reflect/run/t8574.scala
+++ b/tests/disabled/reflect/run/t8574.scala
@@ -4,7 +4,7 @@ import annotation._
   def foo(t: T) = t
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def checkUID(cls: Class[_], expected: Long) = {
     val actual = java.io.ObjectStreamClass.lookup(cls).getSerialVersionUID
     assert(actual == expected, s"$actual != expected for ${cls}")
diff --git a/tests/disabled/reflect/run/t8637.scala b/tests/disabled/reflect/run/t8637.scala
index 16c042b9ac2a..8671a6a05dd9 100644
--- a/tests/disabled/reflect/run/t8637.scala
+++ b/tests/disabled/reflect/run/t8637.scala
@@ -2,7 +2,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.currentMirror
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = currentMirror.mkToolBox()
   tb.compile(q"true > true")
   tb.typecheck(q"true > true")
diff --git a/tests/disabled/reflect/run/toolbox_parse_package.scala b/tests/disabled/reflect/run/toolbox_parse_package.scala
index a4ba71aaa0da..d566e760f9da 100644
--- a/tests/disabled/reflect/run/toolbox_parse_package.scala
+++ b/tests/disabled/reflect/run/toolbox_parse_package.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val toolbox = cm.mkToolBox()
   println(toolbox.parse("package foo { object bar }"))
 }
diff --git a/tests/disabled/reflect/run/toolbox_typecheck_implicitsdisabled.scala b/tests/disabled/reflect/run/toolbox_typecheck_implicitsdisabled.scala
index 542a44b7ad77..686592479d25 100644
--- a/tests/disabled/reflect/run/toolbox_typecheck_implicitsdisabled.scala
+++ b/tests/disabled/reflect/run/toolbox_typecheck_implicitsdisabled.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 import scala.tools.reflect.ToolBox
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val toolbox = cm.mkToolBox()
 
   val tree1 = Block(List(
diff --git a/tests/disabled/reflect/run/toolbox_typecheck_inferimplicitvalue.scala b/tests/disabled/reflect/run/toolbox_typecheck_inferimplicitvalue.scala
index 73c47e01fba0..9f2f73397094 100644
--- a/tests/disabled/reflect/run/toolbox_typecheck_inferimplicitvalue.scala
+++ b/tests/disabled/reflect/run/toolbox_typecheck_inferimplicitvalue.scala
@@ -7,7 +7,7 @@ object C {
   implicit object MC extends C
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val tb = cm.mkToolBox()
   println(tb.inferImplicitValue(typeOf[C]))
 }
diff --git a/tests/disabled/reflect/run/typetags_core.scala b/tests/disabled/reflect/run/typetags_core.scala
index 9250b4f32492..877abb7bb298 100644
--- a/tests/disabled/reflect/run/typetags_core.scala
+++ b/tests/disabled/reflect/run/typetags_core.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[TypeTag[Byte]] eq TypeTag.Byte)
   println(implicitly[TypeTag[Byte]])
   println(implicitly[TypeTag[Short]] eq TypeTag.Short)
diff --git a/tests/disabled/reflect/run/typetags_multi.scala b/tests/disabled/reflect/run/typetags_multi.scala
index 046de29ab590..e03bd30371a8 100644
--- a/tests/disabled/reflect/run/typetags_multi.scala
+++ b/tests/disabled/reflect/run/typetags_multi.scala
@@ -1,6 +1,6 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(implicitly[TypeTag[Int]])
   println(implicitly[TypeTag[Array[Int]]])
   println(implicitly[TypeTag[Array[Array[Int]]]])
diff --git a/tests/disabled/reflect/run/typetags_serialize.scala b/tests/disabled/reflect/run/typetags_serialize.scala
index aa0414096b4d..bfc739210041 100644
--- a/tests/disabled/reflect/run/typetags_serialize.scala
+++ b/tests/disabled/reflect/run/typetags_serialize.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{universe => ru}
 import scala.reflect.runtime.{currentMirror => cm}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class C[A] {
     def m(a: A): Int = 5
   }
diff --git a/tests/disabled/reflect/run/typetags_symbolof_x.scala b/tests/disabled/reflect/run/typetags_symbolof_x.scala
index 9f740cd026b5..333c4e7da45c 100644
--- a/tests/disabled/reflect/run/typetags_symbolof_x.scala
+++ b/tests/disabled/reflect/run/typetags_symbolof_x.scala
@@ -3,7 +3,7 @@ import scala.reflect.runtime.universe._
 class C
 object C
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   type T = Int
   type Id[X] = X
   println(symbolOf[Int])
diff --git a/tests/disabled/reflect/run/valueclasses-classtag-basic.scala b/tests/disabled/reflect/run/valueclasses-classtag-basic.scala
index ab86f58a67aa..cbad29609067 100644
--- a/tests/disabled/reflect/run/valueclasses-classtag-basic.scala
+++ b/tests/disabled/reflect/run/valueclasses-classtag-basic.scala
@@ -1,5 +1,5 @@
 class Foo(val x: Int) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(scala.reflect.classTag[Foo])
 }
diff --git a/tests/disabled/reflect/run/valueclasses-classtag-existential.scala b/tests/disabled/reflect/run/valueclasses-classtag-existential.scala
index 1e5cfe7a1d16..03048710b9e9 100644
--- a/tests/disabled/reflect/run/valueclasses-classtag-existential.scala
+++ b/tests/disabled/reflect/run/valueclasses-classtag-existential.scala
@@ -1,5 +1,5 @@
 class Foo[T](val x: T) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(scala.reflect.classTag[Foo[_]])
 }
diff --git a/tests/disabled/reflect/run/valueclasses-classtag-generic.scala b/tests/disabled/reflect/run/valueclasses-classtag-generic.scala
index d93ca5f0a8c8..34ac43729249 100644
--- a/tests/disabled/reflect/run/valueclasses-classtag-generic.scala
+++ b/tests/disabled/reflect/run/valueclasses-classtag-generic.scala
@@ -1,5 +1,5 @@
 class Foo[T](val x: T) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(scala.reflect.classTag[Foo[String]])
 }
diff --git a/tests/disabled/reflect/run/valueclasses-typetag-basic.scala b/tests/disabled/reflect/run/valueclasses-typetag-basic.scala
index 9273ad638701..897767027c77 100644
--- a/tests/disabled/reflect/run/valueclasses-typetag-basic.scala
+++ b/tests/disabled/reflect/run/valueclasses-typetag-basic.scala
@@ -1,5 +1,5 @@
 class Foo(val x: Int) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(scala.reflect.runtime.universe.typeOf[Foo])
 }
diff --git a/tests/disabled/reflect/run/valueclasses-typetag-existential.scala b/tests/disabled/reflect/run/valueclasses-typetag-existential.scala
index 8c1dd2a1a4b2..ab935fb0dab7 100644
--- a/tests/disabled/reflect/run/valueclasses-typetag-existential.scala
+++ b/tests/disabled/reflect/run/valueclasses-typetag-existential.scala
@@ -1,5 +1,5 @@
 class Foo[T](val x: T) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(scala.reflect.runtime.universe.typeOf[Foo[_]])
 }
diff --git a/tests/disabled/reflect/run/valueclasses-typetag-generic.scala b/tests/disabled/reflect/run/valueclasses-typetag-generic.scala
index 9253e52e9b8d..dd5e996b8cb0 100644
--- a/tests/disabled/reflect/run/valueclasses-typetag-generic.scala
+++ b/tests/disabled/reflect/run/valueclasses-typetag-generic.scala
@@ -1,5 +1,5 @@
 class Foo[T](val x: T) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(scala.reflect.runtime.universe.typeOf[Foo[String]])
 }
diff --git a/tests/disabled/reflect/run/virtpatmat_typetag.scala b/tests/disabled/reflect/run/virtpatmat_typetag.scala
index 3654decda0f4..02ec928edd99 100644
--- a/tests/disabled/reflect/run/virtpatmat_typetag.scala
+++ b/tests/disabled/reflect/run/virtpatmat_typetag.scala
@@ -12,7 +12,7 @@ trait Extractors {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def typeMatch[T: ClassTag](a: Any) = a match {
     case x : T => println(x +" is a "+ implicitly[ClassTag[T]])
     case _ => println(a+ " is not a "+ implicitly[ClassTag[T]] +"; it's a "+ a.getClass)
diff --git a/tests/disabled/run/t5293-map.scala b/tests/disabled/run/t5293-map.scala
index 1ef7d97e5b81..ad1bbcfe30d3 100644
--- a/tests/disabled/run/t5293-map.scala
+++ b/tests/disabled/run/t5293-map.scala
@@ -5,7 +5,7 @@ import scala.collection.JavaConverters._
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def bench(label: String)(body: => Unit): Long = {
     val start = System.nanoTime
diff --git a/tests/disabled/run/t5293.scala b/tests/disabled/run/t5293.scala
index 8a99989c5f4e..c42c967b42e2 100644
--- a/tests/disabled/run/t5293.scala
+++ b/tests/disabled/run/t5293.scala
@@ -5,7 +5,7 @@ import scala.collection.JavaConverters._
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def bench(label: String)(body: => Unit): Long = {
     val start = System.nanoTime
diff --git a/tests/disabled/scalac-dependent/neg/selfreq.scala b/tests/disabled/scalac-dependent/neg/selfreq.scala
index 1ca373b4bda3..cbcbb69723c0 100644
--- a/tests/disabled/scalac-dependent/neg/selfreq.scala
+++ b/tests/disabled/scalac-dependent/neg/selfreq.scala
@@ -26,7 +26,7 @@ object O {
 
 import scala.tools.nsc.interpreter.IMain
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val engine = new IMain.Factory getScriptEngine()
   engine.asInstanceOf[IMain].settings.usejavacp.value = true // no longer an error since we unpickle Scala2 inner classes with fixed syms
   val res2 = engine.asInstanceOf[javax.script.Compilable]
diff --git a/tests/disabled/scalac-dependent/run/t1618.scala b/tests/disabled/scalac-dependent/run/t1618.scala
index 248af9b4fb6b..91f6de587448 100644
--- a/tests/disabled/scalac-dependent/run/t1618.scala
+++ b/tests/disabled/scalac-dependent/run/t1618.scala
@@ -1,5 +1,5 @@
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.tools.nsc.io._
 
   val dir: VirtualDirectory = new VirtualDirectory("foo", None)
diff --git a/tests/disabled/scalac-dependent/run/var-arity-class-symbol.scala b/tests/disabled/scalac-dependent/run/var-arity-class-symbol.scala
index 2a7d329877d5..29fe960eb373 100644
--- a/tests/disabled/scalac-dependent/run/var-arity-class-symbol.scala
+++ b/tests/disabled/scalac-dependent/run/var-arity-class-symbol.scala
@@ -1,5 +1,5 @@
 import scala.reflect.runtime.universe._, definitions._
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // Tuples
   assert(TupleClass.seq.size == 22)
   assert(TupleClass(0) == NoSymbol)
diff --git a/tests/disabled/scalac-dependent/showraw_nosymbol.scala b/tests/disabled/scalac-dependent/showraw_nosymbol.scala
index 191647583276..d7f3f7c250c7 100644
--- a/tests/disabled/scalac-dependent/showraw_nosymbol.scala
+++ b/tests/disabled/scalac-dependent/showraw_nosymbol.scala
@@ -1,5 +1,5 @@
 import scala.reflect.runtime.universe._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(showRaw(NoSymbol))
 }
diff --git a/tests/disabled/scalac-dependent/sm-interpolator.scala b/tests/disabled/scalac-dependent/sm-interpolator.scala
index e4bec7afb02e..b99daa2a8bac 100644
--- a/tests/disabled/scalac-dependent/sm-interpolator.scala
+++ b/tests/disabled/scalac-dependent/sm-interpolator.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.reflect.internal.util.StringContextStripMarginOps
   def check(actual: Any, expected: Any) = if (actual != expected) sys.error(s"\nexpected:\n$expected\n\nactual:\n$actual")
 
diff --git a/tests/disabled/scalac-dependent/t6732.scala b/tests/disabled/scalac-dependent/t6732.scala
index ff0f0494d221..23c5f203da7d 100644
--- a/tests/disabled/scalac-dependent/t6732.scala
+++ b/tests/disabled/scalac-dependent/t6732.scala
@@ -1,7 +1,7 @@
 import scala.reflect.runtime.universe._
 import definitions._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(sym: Symbol): Unit = {
     println(s"${showRaw(sym, printKinds = true)}: ${sym.isModule}, ${sym.isModuleClass}, ${sym.isPackage}, ${sym.isPackageClass}")
   }
diff --git a/tests/fuzzy/a1dc444387638f31146f64d4745e896691a9c6a1.scala b/tests/fuzzy/a1dc444387638f31146f64d4745e896691a9c6a1.scala
index 6434b7bea2ad..a778c57abe32 100644
--- a/tests/fuzzy/a1dc444387638f31146f64d4745e896691a9c6a1.scala
+++ b/tests/fuzzy/a1dc444387638f31146f64d4745e896691a9c6a1.scala
@@ -31,5 +31,5 @@ object i17 {
 trait i2 {
 private object i10 {
 if (!i17.i3(i4) i8 Boolean }
-' LegacyApp { case _ => 1 }
-}
\ No newline at end of file
+' App { case _ => 1 }
+}
diff --git a/tests/neg/amp.scala b/tests/neg/amp.scala
index 92062eb0d4e9..f8de0096e968 100644
--- a/tests/neg/amp.scala
+++ b/tests/neg/amp.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def foo() = {
     def f: Int = 1
diff --git a/tests/neg/t8764.scala b/tests/neg/t8764.scala
index 0284794f45b6..79b6fedd9786 100644
--- a/tests/neg/t8764.scala
+++ b/tests/neg/t8764.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 case class IntOnly(i: Int, j: Int)
 
 println("IntOnly: should return an unboxed int")
diff --git a/tests/pending/run/arrayclone-old.scala b/tests/pending/run/arrayclone-old.scala
index d216e36f26df..fbca38b42e84 100644
--- a/tests/pending/run/arrayclone-old.scala
+++ b/tests/pending/run/arrayclone-old.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   BooleanArrayClone;
   ByteArrayClone;
   ShortArrayClone;
diff --git a/tests/pending/run/byname.scala b/tests/pending/run/byname.scala
index f825744c0b94..f776fc7a50ff 100644
--- a/tests/pending/run/byname.scala
+++ b/tests/pending/run/byname.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
 def test[A](name: String, expect: A, actual: => A): Unit = {
     if (expect != actual) throw new AssertionError("test " + name + " failed")
diff --git a/tests/pending/run/castsingleton.scala b/tests/pending/run/castsingleton.scala
index 3f2b6fca5585..339f5e00cf5f 100644
--- a/tests/pending/run/castsingleton.scala
+++ b/tests/pending/run/castsingleton.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class L();
   object N extends L();
 
diff --git a/tests/pending/run/checked.scala b/tests/pending/run/checked.scala
index a61547b81b5d..711181e5fd58 100644
--- a/tests/pending/run/checked.scala
+++ b/tests/pending/run/checked.scala
@@ -101,7 +101,7 @@ override val x = 10
 }
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def shouldThrow(t: => Unit) = try {
     t
diff --git a/tests/pending/run/delambdafyLambdaClassNames/Test.scala b/tests/pending/run/delambdafyLambdaClassNames/Test.scala
index 92a3d621c500..49a397d1d2b8 100644
--- a/tests/pending/run/delambdafyLambdaClassNames/Test.scala
+++ b/tests/pending/run/delambdafyLambdaClassNames/Test.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = Class.forName("A$$nestedInAnon$1$lambda$$run$1")
   println(c.getName)
 }
diff --git a/tests/pending/run/deprecate-early-type-defs.scala b/tests/pending/run/deprecate-early-type-defs.scala
index e617ee54f895..e5d56e5f876d 100644
--- a/tests/pending/run/deprecate-early-type-defs.scala
+++ b/tests/pending/run/deprecate-early-type-defs.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 // TODO NEEDS MANUAL CHANGE (early initializers)
 // BEGIN copied early initializers
 type T = Int
diff --git a/tests/pending/run/infix.scala b/tests/pending/run/infix.scala
index 6b754f2f0c4c..a867d03ce8dd 100644
--- a/tests/pending/run/infix.scala
+++ b/tests/pending/run/infix.scala
@@ -2,7 +2,7 @@ case class op(x: op, y: Int, z: Int) {
   def op(y: Int, z: Int) = new op(this, y, z)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val xs = new op(null, 0, 0) op (1, 1) op (2, 2)
   Console.println(xs)
   xs match {
diff --git a/tests/pending/run/interpolation.scala b/tests/pending/run/interpolation.scala
index 42ac3057e04c..14d981934895 100644
--- a/tests/pending/run/interpolation.scala
+++ b/tests/pending/run/interpolation.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def test1(n: Int) = {
     println(s"Bob is $n years old")
diff --git a/tests/pending/run/interpolationMultiline1.scala b/tests/pending/run/interpolationMultiline1.scala
index 5226282566f7..db634e7775be 100644
--- a/tests/pending/run/interpolationMultiline1.scala
+++ b/tests/pending/run/interpolationMultiline1.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def test1(n: Int) = {
     println(s"""Bob is $n years old""")
diff --git a/tests/pending/run/interpolationMultiline2.scala b/tests/pending/run/interpolationMultiline2.scala
index e750c0a553bc..2de4c4b22e83 100644
--- a/tests/pending/run/interpolationMultiline2.scala
+++ b/tests/pending/run/interpolationMultiline2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def test1(n: Int) = {
     val old = "old"
diff --git a/tests/pending/run/lazy-leaks.scala b/tests/pending/run/lazy-leaks.scala
index 6e5aa41f1e77..22a3770d075a 100644
--- a/tests/pending/run/lazy-leaks.scala
+++ b/tests/pending/run/lazy-leaks.scala
@@ -2,7 +2,7 @@ class Lazy(f: => Int) {
      lazy val get: Int = f
 }
 
-object Test extends dotty.runtime.LegacyApp
+object Test extends App
 {
      val buffer = new scala.collection.mutable.ListBuffer[Lazy]
 
diff --git a/tests/pending/run/lazy-locals.scala b/tests/pending/run/lazy-locals.scala
index cc994513a32c..e21a94e72aff 100644
--- a/tests/pending/run/lazy-locals.scala
+++ b/tests/pending/run/lazy-locals.scala
@@ -1,5 +1,5 @@
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   lazy val w = 10
 
diff --git a/tests/pending/run/nullable-lazyvals.scala b/tests/pending/run/nullable-lazyvals.scala
index 4c57a24f75e0..be5d82f3a7ab 100644
--- a/tests/pending/run/nullable-lazyvals.scala
+++ b/tests/pending/run/nullable-lazyvals.scala
@@ -9,7 +9,7 @@ class Foo(param1: => Object, param2: => String) {
 	lazy val field2 = try param2 finally println("")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	val foo = new Foo(new Object, "abc")
 
 	foo.field1
diff --git a/tests/pending/run/streams.scala b/tests/pending/run/streams.scala
index 0576607d4795..350e103eab0b 100644
--- a/tests/pending/run/streams.scala
+++ b/tests/pending/run/streams.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val s0: Stream[Int] = Stream.empty
   println(s0.take(1))
   println(s0.takeWhile(_ > 0))
diff --git a/tests/pending/run/stringinterpolation_macro-run.scala b/tests/pending/run/stringinterpolation_macro-run.scala
index 9af8d80feeb9..886fe16e3961 100644
--- a/tests/pending/run/stringinterpolation_macro-run.scala
+++ b/tests/pending/run/stringinterpolation_macro-run.scala
@@ -1,7 +1,7 @@
 /*
  * filter: inliner warnings; re-run with -Yinline-warnings for details
  */
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
 // 'b' / 'B' (category: general)
 // -----------------------------
diff --git a/tests/pending/run/synchronized.scala b/tests/pending/run/synchronized.scala
index c387dc7c97bd..d5f6d8651087 100644
--- a/tests/pending/run/synchronized.scala
+++ b/tests/pending/run/synchronized.scala
@@ -288,7 +288,7 @@ trait T {
 class C2 extends T
 object O2 extends T
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def check(name: String, result: Boolean): Unit = {
     println("%-10s %s" format (name +":", if (result) "OK" else "FAILED"))
   }
diff --git a/tests/pending/run/t0421-old.scala b/tests/pending/run/t0421-old.scala
index 99ec3567b9ef..dde89bc5421a 100644
--- a/tests/pending/run/t0421-old.scala
+++ b/tests/pending/run/t0421-old.scala
@@ -1,7 +1,7 @@
 // ticket #421
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def transpose[A: ClassManifest](xss: Array[Array[A]]) = {
     for (i <- Array.range(0, xss(0).length)) yield
diff --git a/tests/pending/run/t0508.scala b/tests/pending/run/t0508.scala
index 10fc0bfb461f..2283c46c36c8 100644
--- a/tests/pending/run/t0508.scala
+++ b/tests/pending/run/t0508.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   case class Foo(s: String, n: Int)
 
diff --git a/tests/pending/run/t0911.scala b/tests/pending/run/t0911.scala
index a0b5597d5c23..c895b53b5794 100644
--- a/tests/pending/run/t0911.scala
+++ b/tests/pending/run/t0911.scala
@@ -7,6 +7,6 @@ val baz = "bar"
 // END copied early initializers
 };
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   (new IP).bar();
 }
diff --git a/tests/pending/run/t1042.scala b/tests/pending/run/t1042.scala
index cbe00f91dd0b..302ff310537c 100644
--- a/tests/pending/run/t1042.scala
+++ b/tests/pending/run/t1042.scala
@@ -9,6 +9,6 @@ case class B() extends A {
   def toString(sb: StringBuilder): StringBuilder = sys.error("")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Console.println(B)
 }
diff --git a/tests/pending/run/t1167.scala b/tests/pending/run/t1167.scala
index 8b8976b5f32d..3dd0a30c00ca 100644
--- a/tests/pending/run/t1167.scala
+++ b/tests/pending/run/t1167.scala
@@ -23,7 +23,7 @@ abstract class Foo {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val foo = new Foo {}
   val bar = new foo.Bar {}
   println(foo)
diff --git a/tests/pending/run/t1247.scala b/tests/pending/run/t1247.scala
index f9f5c853b7e8..9a511c25d349 100644
--- a/tests/pending/run/t1247.scala
+++ b/tests/pending/run/t1247.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val f = () => 5
   def test(g: => Int): Unit = {
     val gFunc = g _
diff --git a/tests/pending/run/t1368.scala b/tests/pending/run/t1368.scala
index 7ec3605e84b2..04e9195d3ec1 100644
--- a/tests/pending/run/t1368.scala
+++ b/tests/pending/run/t1368.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   trait Happy { val status = "happy" }
   trait Sad { val status = "sad" }
 
diff --git a/tests/pending/run/t1503.scala b/tests/pending/run/t1503.scala
index 123265059f10..25e163d90fe8 100644
--- a/tests/pending/run/t1503.scala
+++ b/tests/pending/run/t1503.scala
@@ -2,7 +2,7 @@ object Whatever {
   override def equals(x: Any) = true
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // this should make it abundantly clear Any is the best return type we can guarantee
   def matchWhatever(x: Any): Any = x match { case n @ Whatever => n }
   // when left to its own devices, and not under -Xfuture, the return type is Whatever.type
diff --git a/tests/pending/run/t1503_future.scala b/tests/pending/run/t1503_future.scala
index 356f640b17f2..2e7d55e2e318 100644
--- a/tests/pending/run/t1503_future.scala
+++ b/tests/pending/run/t1503_future.scala
@@ -2,7 +2,7 @@ object Whatever {
   override def equals(x: Any) = true
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // this should make it abundantly clear Any is the best return type we can guarantee
   def matchWhatever(x: Any): Any = x match { case n @ Whatever => n }
   // when left to its own devices, and not under -Xfuture, the return type is Whatever.type
diff --git a/tests/pending/run/t1909.scala b/tests/pending/run/t1909.scala
index 20236775520e..8ead7bacf232 100644
--- a/tests/pending/run/t1909.scala
+++ b/tests/pending/run/t1909.scala
@@ -7,6 +7,6 @@ class Ticket1909 {
   def this(p: String) = this(try 0)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Ticket1909("")
 }
diff --git a/tests/pending/run/t2236-old.scala b/tests/pending/run/t2236-old.scala
index aa28062059a6..0c6f82813c8d 100644
--- a/tests/pending/run/t2236-old.scala
+++ b/tests/pending/run/t2236-old.scala
@@ -1,7 +1,7 @@
 class T[A](implicit val m:Manifest[A])
 class Foo
 class Bar extends T[Foo]
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Bar
 }
 
diff --git a/tests/pending/run/t2241.scala b/tests/pending/run/t2241.scala
index 4801749f8bdb..4a8a662b85b3 100644
--- a/tests/pending/run/t2241.scala
+++ b/tests/pending/run/t2241.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def f(a:Array[Int]) = a match {
     case Array(1, _*) => "yes"
     case _ => "no"
diff --git a/tests/pending/run/t2386-new.scala b/tests/pending/run/t2386-new.scala
index 8edefaada540..15d1859759c1 100644
--- a/tests/pending/run/t2386-new.scala
+++ b/tests/pending/run/t2386-new.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a = Array(Array(1, 2), Array("a","b"))
   println("a(0) = Array(" + (a(0) mkString ", ") + ")")
   println("a(1) = Array(" + (a(1) map (s => "\"" + s + "\"") mkString ", ") + ")")
diff --git a/tests/pending/run/t3346e.scala b/tests/pending/run/t3346e.scala
index e2b510fa02e9..e74f29f8935d 100644
--- a/tests/pending/run/t3346e.scala
+++ b/tests/pending/run/t3346e.scala
@@ -53,7 +53,7 @@ object MyEnhancements {
   implicit def toFM2[A, Repr <% TraversableLike[A, Repr]](a: Repr): FilterMapFixed[A,Repr] = new FilterMapFixed(a)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   import MyEnhancements._
 
diff --git a/tests/pending/run/t4047.scala b/tests/pending/run/t4047.scala
index a9019d5d72cf..08989bd2788f 100644
--- a/tests/pending/run/t4047.scala
+++ b/tests/pending/run/t4047.scala
@@ -18,7 +18,7 @@ class D extends Bar[Unit]{
   def foo = println("Unit: called D.foo")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a: Foo[Unit] = new A
   a.foo
   a.foo
diff --git a/tests/pending/run/t4110-old.scala b/tests/pending/run/t4110-old.scala
index 0b16c857b487..6022285e97b3 100644
--- a/tests/pending/run/t4110-old.scala
+++ b/tests/pending/run/t4110-old.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def inferredType[T : Manifest](v : T) = println(manifest[T])
 
   trait A
diff --git a/tests/pending/run/t4124.scala b/tests/pending/run/t4124.scala
index 79bcf55f01b1..9f35b57ce367 100644
--- a/tests/pending/run/t4124.scala
+++ b/tests/pending/run/t4124.scala
@@ -1,6 +1,6 @@
 import xml.Node
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val body: Node = <elem>hi</elem>	
   println ((body: AnyRef, "foo") match {
     case (node: Node, "bar")        => "bye"
diff --git a/tests/pending/run/t4396.scala b/tests/pending/run/t4396.scala
index 694360101fe9..2877a5f1dd00 100644
--- a/tests/pending/run/t4396.scala
+++ b/tests/pending/run/t4396.scala
@@ -19,7 +19,7 @@ object Main {
   def main(argv: Array[String]): Unit = {
     class Bip {
       class Foo { override def toString() = "foo" }
-      object Main extends dotty.runtime.LegacyApp {
+      object Main extends App {
         val cbn = new Foo()
       }
       Main.main(Array())
@@ -29,7 +29,7 @@ object Main {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new C(22)
   Main.main(Array())
 }
diff --git a/tests/pending/run/t5125.scala b/tests/pending/run/t5125.scala
index b9f732085a97..21de47f87186 100644
--- a/tests/pending/run/t5125.scala
+++ b/tests/pending/run/t5125.scala
@@ -12,7 +12,7 @@ object O2 {
   def g(): String => Int = s => s.hashCode
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def check(c: Class[_]): Unit = {
     val methodName = "f"
     val methods = c.getDeclaredMethods.filter(_.getName == methodName)
diff --git a/tests/pending/run/t5125b.scala b/tests/pending/run/t5125b.scala
index cf01db3248c7..5a77e311a518 100644
--- a/tests/pending/run/t5125b.scala
+++ b/tests/pending/run/t5125b.scala
@@ -23,7 +23,7 @@ class C4 {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def check(c: Class[_]): Unit = {
     val methodName = "f"
     val methods = c.getDeclaredMethods.filter(_.getName == methodName)
diff --git a/tests/pending/run/t5134.scala b/tests/pending/run/t5134.scala
index fe946040f3c1..384442fda289 100644
--- a/tests/pending/run/t5134.scala
+++ b/tests/pending/run/t5134.scala
@@ -1,6 +1,6 @@
 import language._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def b = new AnyRef {
     def a= ()
   }
diff --git a/tests/pending/run/t5652c/t5652c.scala b/tests/pending/run/t5652c/t5652c.scala
index 0a7e584f6b76..c9774832805c 100644
--- a/tests/pending/run/t5652c/t5652c.scala
+++ b/tests/pending/run/t5652c/t5652c.scala
@@ -3,7 +3,7 @@ class A1 {
   def f2 = { def g = 2 ; class A { def a = g } ; new A().a }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classOf[A1].getDeclaredMethods.map(_.toString).sorted.mkString("\n"))
   println(new A1().f1)
   println(new A1().f2)
diff --git a/tests/pending/run/t5907.scala b/tests/pending/run/t5907.scala
index 02a5b88932b4..14366a6ed18a 100644
--- a/tests/pending/run/t5907.scala
+++ b/tests/pending/run/t5907.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   t
 
   def t: Unit = {
diff --git a/tests/pending/run/t5923b/Test.scala b/tests/pending/run/t5923b/Test.scala
index ee4e67f2b2be..3facd2b283fa 100644
--- a/tests/pending/run/t5923b/Test.scala
+++ b/tests/pending/run/t5923b/Test.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.collection.generic.CanBuildFrom
   val cbf = implicitly[CanBuildFrom[Nothing, Nothing, Array[Nothing]]]
   println(cbf().result.getClass)
diff --git a/tests/pending/run/t6135.scala b/tests/pending/run/t6135.scala
index c258842ff196..fdbe6048f0fa 100644
--- a/tests/pending/run/t6135.scala
+++ b/tests/pending/run/t6135.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class A { class V }
 
   abstract class B[S] {
diff --git a/tests/pending/run/t6260b.scala b/tests/pending/run/t6260b.scala
index 4450ac4fe16d..dd2cf4bc4e45 100644
--- a/tests/pending/run/t6260b.scala
+++ b/tests/pending/run/t6260b.scala
@@ -6,7 +6,7 @@ class DD {
   def baz[A](c: C[A]) = ()
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   classOf[DD].getMethod("foo", classOf[String])
   classOf[DD].getMethod("bar", classOf[String])
   classOf[DD].getMethod("baz", classOf[Object])
diff --git a/tests/pending/run/t6327.scala b/tests/pending/run/t6327.scala
index 723f5ce91f85..7683101f1424 100644
--- a/tests/pending/run/t6327.scala
+++ b/tests/pending/run/t6327.scala
@@ -1,6 +1,6 @@
 import language._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   case class R[+T](s: String) { def x() = println(s) }
 
diff --git a/tests/pending/run/t6380.scala b/tests/pending/run/t6380.scala
index c2b221f2d947..d7344c75248c 100644
--- a/tests/pending/run/t6380.scala
+++ b/tests/pending/run/t6380.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   classOf[Foo].getDeclaredMethods().sortBy(_.getName).map(_.getExceptionTypes.sortBy(_.getName).toList).toList.foreach(println)
 }
 
diff --git a/tests/pending/run/t6554.scala b/tests/pending/run/t6554.scala
index e89a3760ec5b..5d29d166665b 100644
--- a/tests/pending/run/t6554.scala
+++ b/tests/pending/run/t6554.scala
@@ -4,7 +4,7 @@ trait Foo[A] {
  
 class Bar extends Foo[Int]
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
    val sigs = classOf[Bar].getDeclaredMethods.map(m => s"${m.toString} / ${m.toGenericString}").sorted
    println(sigs.mkString("\n"))
 }
diff --git a/tests/pending/run/t657.scala b/tests/pending/run/t657.scala
index 00cae5d33949..ea2b008b3831 100644
--- a/tests/pending/run/t657.scala
+++ b/tests/pending/run/t657.scala
@@ -46,7 +46,7 @@ class Test1 extends OffsetList with Matcher {
   type Matchable = MatchableImpl;
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val test = new Test1;
   val m = new test.MatchableImpl;
   m.chop;
diff --git a/tests/pending/run/t6669.scala b/tests/pending/run/t6669.scala
index 2b48823a7b47..e18f2514a9fd 100644
--- a/tests/pending/run/t6669.scala
+++ b/tests/pending/run/t6669.scala
@@ -1,6 +1,6 @@
 import java.io.{ByteArrayOutputStream, PrintStream}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val baos = new ByteArrayOutputStream()
   val ps = new PrintStream(baos)
 
diff --git a/tests/pending/run/t6695.scala b/tests/pending/run/t6695.scala
index ce6181c06622..b527238a5193 100644
--- a/tests/pending/run/t6695.scala
+++ b/tests/pending/run/t6695.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	try {
 	  Array("a", "b", "c") match {
 	  	case Array("a", "x", "c") => println("x")
diff --git a/tests/pending/run/t6725-1.scala b/tests/pending/run/t6725-1.scala
index 862084402b9e..33a4ac1e1e60 100644
--- a/tests/pending/run/t6725-1.scala
+++ b/tests/pending/run/t6725-1.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a = 1
   val s = f"$a%s%n$a%s"
   println(s)
diff --git a/tests/pending/run/t6725-2.scala b/tests/pending/run/t6725-2.scala
index 3c1f0f854955..63d231ff05f8 100644
--- a/tests/pending/run/t6725-2.scala
+++ b/tests/pending/run/t6725-2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(f"%n")
   println(f"aaaa%n")
   println(f"%naaaa")
diff --git a/tests/pending/run/t6793b.scala b/tests/pending/run/t6793b.scala
index 8f7cc331c64a..cb3f2fb2fadf 100644
--- a/tests/pending/run/t6793b.scala
+++ b/tests/pending/run/t6793b.scala
@@ -3,7 +3,7 @@ package a {
   class C2(v1: String) extends a.C1(v1) { def foo = v1 }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new a.C2("x")
 
   val c2Fields = classOf[a.C2].getDeclaredFields
diff --git a/tests/pending/run/t6793c.scala b/tests/pending/run/t6793c.scala
index 1c01ca5393cd..e28c7c81a1f3 100644
--- a/tests/pending/run/t6793c.scala
+++ b/tests/pending/run/t6793c.scala
@@ -3,7 +3,7 @@ package a {
   class C2(v1: String) extends a.C1(v1) { def foo = v1 }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new a.C2("x").foo
 
   val c2Fields = classOf[a.C2].getDeclaredFields
diff --git a/tests/pending/run/t6900.scala b/tests/pending/run/t6900.scala
index 5e4d8a7f0f84..090c908f69ad 100644
--- a/tests/pending/run/t6900.scala
+++ b/tests/pending/run/t6900.scala
@@ -29,7 +29,7 @@ final class Bug {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert(new Bug().f(null, null) == null)
   assert(new Bug().g(null)(null) == null)
   assert(new Bug().h(null)(null) == Nil)
diff --git a/tests/pending/run/t6988.scala b/tests/pending/run/t6988.scala
index 810d2c40619f..45dfe33461d8 100644
--- a/tests/pending/run/t6988.scala
+++ b/tests/pending/run/t6988.scala
@@ -3,7 +3,7 @@ case class User()
 @SerialVersionUID(13l) case class IdentifyMessage1(userName: String, user: User, code: Int)
 @SerialVersionUID(10l + 3l) case class IdentifyMessage2(userName: String, user: User, code: Int)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println("#1 " + java.io.ObjectStreamClass.lookup(IdentifyMessage1("hei", User(), 8).getClass).getSerialVersionUID)
   println("#2 " + java.io.ObjectStreamClass.lookup(IdentifyMessage2("hei", User(), 8).getClass).getSerialVersionUID)
 }
diff --git a/tests/pending/run/t7039.scala b/tests/pending/run/t7039.scala
index 869d3f36994d..7ca4ac497b47 100644
--- a/tests/pending/run/t7039.scala
+++ b/tests/pending/run/t7039.scala
@@ -2,7 +2,7 @@ object UnapplySeqTest {
   def unapplySeq(any: Any): Option[(Int, Seq[Int])] = Some((5, List(1)))
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   null match {
     case UnapplySeqTest(5) => println("uh-oh")
     case UnapplySeqTest(5, 1) => println("Matched!") // compiles
diff --git a/tests/pending/run/t7198.scala b/tests/pending/run/t7198.scala
index 9390674cf583..26e1d8805a8b 100644
--- a/tests/pending/run/t7198.scala
+++ b/tests/pending/run/t7198.scala
@@ -1,7 +1,7 @@
 /* spew a few lines
  * filter: Over the moon
  */
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Console println "The quick brown fox jumped"
   Console println "Over the moon"
   Console println "And ran away with the vixen."
diff --git a/tests/pending/run/t7246/Test.scala b/tests/pending/run/t7246/Test.scala
index 619583234245..9f23ca8f3a13 100755
--- a/tests/pending/run/t7246/Test.scala
+++ b/tests/pending/run/t7246/Test.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val so = new SubOuter
   val si = new so.SubInner
diff --git a/tests/pending/run/t7246b/Test.scala b/tests/pending/run/t7246b/Test.scala
index 9c80403938f7..f0982ea8d0cd 100755
--- a/tests/pending/run/t7246b/Test.scala
+++ b/tests/pending/run/t7246b/Test.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val so = new SubOuter
   val si = new so.SubInner
diff --git a/tests/pending/run/t7290.scala b/tests/pending/run/t7290.scala
index 2fd9909e5b54..01f7e8f68e6f 100644
--- a/tests/pending/run/t7290.scala
+++ b/tests/pending/run/t7290.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val y = (0: Int) match {
     case 1 => 1
     case 0 | 0 => 0
diff --git a/tests/pending/run/t7325.scala b/tests/pending/run/t7325.scala
index 253e8b238660..0b02d53487ad 100644
--- a/tests/pending/run/t7325.scala
+++ b/tests/pending/run/t7325.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // println(f"%")
   println(f"%%")
   // println(f"%%%")
diff --git a/tests/pending/run/t7507.scala b/tests/pending/run/t7507.scala
index 51ee0518733c..a5eab6248f8e 100644
--- a/tests/pending/run/t7507.scala
+++ b/tests/pending/run/t7507.scala
@@ -29,7 +29,7 @@ object Outer {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val s1 = new Cake1 {}
   assert((s1.x, s1.y) == (1, 2), (s1.x, s1.y))
 }
diff --git a/tests/pending/run/t7700.scala b/tests/pending/run/t7700.scala
index ce4e00010eb5..76d16b808c52 100644
--- a/tests/pending/run/t7700.scala
+++ b/tests/pending/run/t7700.scala
@@ -7,7 +7,7 @@ trait C[@specialized U] {
   def bar[A](u: U) = u
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val declared = classOf[C[_]].getDeclaredMethods.sortBy(_.getName)
   println(declared.mkString("\n"))
   object CInt extends C[Int] { def foo(i: Int) = i }
diff --git a/tests/pending/run/t7715.scala b/tests/pending/run/t7715.scala
index 948014d758c4..0ad39130163e 100644
--- a/tests/pending/run/t7715.scala
+++ b/tests/pending/run/t7715.scala
@@ -2,7 +2,7 @@
 import PartialFunction.cond
 import util._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   object I { def unapply(x: String): Option[Int] = Try(x.toInt).toOption }
   implicit class RX(val sc: StringContext) {
diff --git a/tests/pending/run/t7843-jsr223-service.scala b/tests/pending/run/t7843-jsr223-service.scala
index 2874edb4c00d..31112212eaf4 100644
--- a/tests/pending/run/t7843-jsr223-service.scala
+++ b/tests/pending/run/t7843-jsr223-service.scala
@@ -1,6 +1,6 @@
 import scala.tools.nsc.interpreter.IMain
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val engine = new IMain.Factory getScriptEngine()
   engine.asInstanceOf[IMain].settings.usejavacp.value = true
   engine put ("n", 10)
diff --git a/tests/pending/run/t7933.scala b/tests/pending/run/t7933.scala
index c82f9002ffca..b06dffcd80a9 100644
--- a/tests/pending/run/t7933.scala
+++ b/tests/pending/run/t7933.scala
@@ -1,6 +1,6 @@
 import scala.tools.nsc.interpreter.IMain
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val engine = new IMain.Factory getScriptEngine()
   engine.asInstanceOf[IMain].settings.usejavacp.value = true
   val res2 = engine.asInstanceOf[javax.script.Compilable]
diff --git a/tests/pending/run/t8091.scala b/tests/pending/run/t8091.scala
index 35d0e50ba49e..56af4f7de977 100644
--- a/tests/pending/run/t8091.scala
+++ b/tests/pending/run/t8091.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val result = "börk börk" flatMap (ch ⇒ if (ch > 127) f"&#x${ch}%04x;" else "" + ch)
   println(result)
 }
diff --git a/tests/pending/run/t8199.scala b/tests/pending/run/t8199.scala
index c96be4287ea1..afd417ffd23f 100644
--- a/tests/pending/run/t8199.scala
+++ b/tests/pending/run/t8199.scala
@@ -34,7 +34,7 @@ trait trt0123456789 { def x = Test.checkCallerImplClassName() }
 trait trt01234567890 { def x = Test.checkCallerImplClassName() }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def check(c: Class[_]): Unit = {
     checkClassName(c.getName)
   }
diff --git a/tests/pending/run/t8266-octal-interp.scala b/tests/pending/run/t8266-octal-interp.scala
index 8163ad585f01..f85ae0367dbc 100644
--- a/tests/pending/run/t8266-octal-interp.scala
+++ b/tests/pending/run/t8266-octal-interp.scala
@@ -11,6 +11,6 @@ trait X {
   )
 }
 
-object Test extends dotty.runtime.LegacyApp with X {
+object Test extends App with X {
   f foreach println
 }
diff --git a/tests/pending/run/t8445.scala b/tests/pending/run/t8445.scala
index 72116d8e5f86..ed196b62a29b 100644
--- a/tests/pending/run/t8445.scala
+++ b/tests/pending/run/t8445.scala
@@ -6,6 +6,6 @@ object X {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert(X.y.z.getEnclosingClass.getName == "X$$anon$1")
 }
diff --git a/tests/pending/run/t8549b.scala b/tests/pending/run/t8549b.scala
index da0c16135a42..c9a086233514 100644
--- a/tests/pending/run/t8549b.scala
+++ b/tests/pending/run/t8549b.scala
@@ -6,7 +6,7 @@ class C
 class D
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def checkId(cls: Class[_]): Unit = {
     val id = cls.getDeclaredField("serialVersionUID").get(null)
     assert(id == 42, (cls, id))  
diff --git a/tests/pending/run/t8803.scala b/tests/pending/run/t8803.scala
index 8596408dea7c..2e56180502b6 100644
--- a/tests/pending/run/t8803.scala
+++ b/tests/pending/run/t8803.scala
@@ -33,7 +33,7 @@ class C extends A with B {
   val i4 = new runtime.AbstractFunction0[String] { def apply() = C.this.n }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = new C
   println(c.f1())
   println(c.f2())
diff --git a/tests/pending/run/t8960.scala b/tests/pending/run/t8960.scala
index adecd85139ea..a58ac53d3344 100644
--- a/tests/pending/run/t8960.scala
+++ b/tests/pending/run/t8960.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(o: AnyRef, sp: Boolean = false) = {
     val isSpecialized      = o.getClass.getSuperclass.getName contains "$sp"
     val isDelambdafyMethod = o.getClass.getName contains "$lambda$"
diff --git a/tests/pending/run/valueclasses-classmanifest-existential.scala b/tests/pending/run/valueclasses-classmanifest-existential.scala
index e8351557e98a..6bcd7cf9428a 100644
--- a/tests/pending/run/valueclasses-classmanifest-existential.scala
+++ b/tests/pending/run/valueclasses-classmanifest-existential.scala
@@ -1,6 +1,6 @@
 class Foo[T](val x: T) extends AnyVal
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classManifest[Foo[_]])
 }
diff --git a/tests/pending/run/valueclasses-classmanifest-generic.scala b/tests/pending/run/valueclasses-classmanifest-generic.scala
index d37155d3cdb0..5efcaed95942 100644
--- a/tests/pending/run/valueclasses-classmanifest-generic.scala
+++ b/tests/pending/run/valueclasses-classmanifest-generic.scala
@@ -1,6 +1,6 @@
 class Foo[T](val x: T) extends AnyVal
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classManifest[Foo[String]])
 }
diff --git a/tests/pending/run/valueclasses-manifest-basic.scala b/tests/pending/run/valueclasses-manifest-basic.scala
index 3ea2bffe36e4..663e6c89dbc9 100644
--- a/tests/pending/run/valueclasses-manifest-basic.scala
+++ b/tests/pending/run/valueclasses-manifest-basic.scala
@@ -1,5 +1,5 @@
 class Foo(val x: Int) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(manifest[Foo])
 }
diff --git a/tests/pending/run/valueclasses-manifest-existential.scala b/tests/pending/run/valueclasses-manifest-existential.scala
index c3fb044e1f3f..491bee7ce315 100644
--- a/tests/pending/run/valueclasses-manifest-existential.scala
+++ b/tests/pending/run/valueclasses-manifest-existential.scala
@@ -1,5 +1,5 @@
 class Foo[T](val x: T) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(manifest[Foo[_]])
 }
diff --git a/tests/pending/run/valueclasses-manifest-generic.scala b/tests/pending/run/valueclasses-manifest-generic.scala
index 349487870413..9d0bf4b59f3c 100644
--- a/tests/pending/run/valueclasses-manifest-generic.scala
+++ b/tests/pending/run/valueclasses-manifest-generic.scala
@@ -1,5 +1,5 @@
 class Foo[T](val x: T) extends AnyVal
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(manifest[Foo[String]])
 }
diff --git a/tests/pending/run/virtpatmat_extends_product.scala b/tests/pending/run/virtpatmat_extends_product.scala
index 7d290083e4b0..4b4bc634a72c 100644
--- a/tests/pending/run/virtpatmat_extends_product.scala
+++ b/tests/pending/run/virtpatmat_extends_product.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class AnnotationInfo(a: String, b: Int) extends Product2[String, Int] {
     def _1 = a
     def _2 = b
diff --git a/tests/pending/run/virtpatmat_nested_lists.scala b/tests/pending/run/virtpatmat_nested_lists.scala
index 17199ea86645..d1aa68ea935b 100644
--- a/tests/pending/run/virtpatmat_nested_lists.scala
+++ b/tests/pending/run/virtpatmat_nested_lists.scala
@@ -1,6 +1,6 @@
 /*
  * filter: It would fail on the following input
  */
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   List(List(1), List(2)) match { case x :: (y :: Nil) :: Nil => println(y) }
 }
diff --git a/tests/pending/run/virtpatmat_partial.scala b/tests/pending/run/virtpatmat_partial.scala
index b93a54cbc911..92e262a29623 100644
--- a/tests/pending/run/virtpatmat_partial.scala
+++ b/tests/pending/run/virtpatmat_partial.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a = Map("a" -> Some(1), "b" -> None)
   println(a)
 
diff --git a/tests/pending/run/virtpatmat_unapplyprod.scala b/tests/pending/run/virtpatmat_unapplyprod.scala
index 773c6230d61a..cd7f8a3dcdf3 100644
--- a/tests/pending/run/virtpatmat_unapplyprod.scala
+++ b/tests/pending/run/virtpatmat_unapplyprod.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class Foo(x: Int, y: String)
 
   Foo(2, "3") match {
diff --git a/tests/pos-scala2/t2030.scala b/tests/pos-scala2/t2030.scala
index cbd62babae03..2333c3981b99 100644
--- a/tests/pos-scala2/t2030.scala
+++ b/tests/pos-scala2/t2030.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val res0 = TreeSet(1, 2, 3, 4, 5, 6)
   val res1 = res0.map(x => x)
   println(res0.toList == res1.toList)
diff --git a/tests/pos/t2503.scala b/tests/pos/t2503.scala
index d0983f2ca20e..21801e2dbd28 100755
--- a/tests/pos/t2503.scala
+++ b/tests/pos/t2503.scala
@@ -13,7 +13,7 @@ trait SB[A] extends Buffer[A] {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new ArrayBuffer[Int] with SB[Int]
 }
 
diff --git a/tests/run-custom-args/fors.scala b/tests/run-custom-args/fors.scala
index 2baa78cbc369..d8f76473f773 100644
--- a/tests/run-custom-args/fors.scala
+++ b/tests/run-custom-args/fors.scala
@@ -4,7 +4,7 @@
 
 //############################################################################
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val xs = List(1, 2, 3)
   val ys = List(Symbol("a"), Symbol("b"), Symbol("c"))
 
diff --git a/tests/run/Meter.scala b/tests/run/Meter.scala
index d070b7668724..cbdec8f5908c 100644
--- a/tests/run/Meter.scala
+++ b/tests/run/Meter.scala
@@ -48,7 +48,7 @@ package b {
 }
 import a._
 import _root_.b._
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   {
   val x: Meter = new Meter(1)
diff --git a/tests/run/MeterCaseClass.scala b/tests/run/MeterCaseClass.scala
index 1dcd9f34463a..b71659492966 100644
--- a/tests/run/MeterCaseClass.scala
+++ b/tests/run/MeterCaseClass.scala
@@ -45,7 +45,7 @@ package b {
 }
 import a._
 import _root_.b._
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   {
   val x: Meter = new Meter(1)
diff --git a/tests/run/OrderingTest.scala b/tests/run/OrderingTest.scala
index 561a3daeb381..48c162f13975 100644
--- a/tests/run/OrderingTest.scala
+++ b/tests/run/OrderingTest.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test[T](t1 : T, t2 : T)(implicit ord : Ordering[T]) = {
     val cmp = ord.compare(t1, t2);
     val cmp2 = ord.compare(t2, t1);
diff --git a/tests/run/Predef.readLine.scala b/tests/run/Predef.readLine.scala
index f751949e84f1..ce8565864afb 100644
--- a/tests/run/Predef.readLine.scala
+++ b/tests/run/Predef.readLine.scala
@@ -1,7 +1,7 @@
 import java.io.StringReader
 import scala.io.StdIn.readLine
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Console.withIn(new StringReader("")) {
     readLine()
     readLine("prompt\n")
diff --git a/tests/run/ReverseSeqView.scala b/tests/run/ReverseSeqView.scala
index edb2e8c28b6c..2004791bffee 100644
--- a/tests/run/ReverseSeqView.scala
+++ b/tests/run/ReverseSeqView.scala
@@ -4,7 +4,7 @@
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val lstv = List(1, 2, 3).view
   val lstvr = lstv.reverse
diff --git a/tests/run/applydynamic_sip.scala b/tests/run/applydynamic_sip.scala
index 7f81a644a60a..49af333336ec 100644
--- a/tests/run/applydynamic_sip.scala
+++ b/tests/run/applydynamic_sip.scala
@@ -1,5 +1,5 @@
 import scala.language.dynamics
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object stubUpdate {
     def update(as: Any*) = println(".update"+as.toList.mkString("(",", ", ")"))
   }
diff --git a/tests/run/arrayclone-new.scala b/tests/run/arrayclone-new.scala
index 8f66d1b31243..ae91e2f3fe2a 100644
--- a/tests/run/arrayclone-new.scala
+++ b/tests/run/arrayclone-new.scala
@@ -1,6 +1,6 @@
 import scala.reflect.ClassTag
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   BooleanArrayClone;
   ByteArrayClone;
   ShortArrayClone;
diff --git a/tests/run/arybufgrow.scala b/tests/run/arybufgrow.scala
index b0e06166b919..fba859a45639 100644
--- a/tests/run/arybufgrow.scala
+++ b/tests/run/arybufgrow.scala
@@ -1,6 +1,6 @@
 import scala.collection.mutable._;
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val buf = new ArrayBuffer[String];
   for (i <- List.range(0,1000)) {
     buf += "hello";
diff --git a/tests/run/bitsets.scala b/tests/run/bitsets.scala
index 05c1625ed932..5d492207494a 100644
--- a/tests/run/bitsets.scala
+++ b/tests/run/bitsets.scala
@@ -206,7 +206,7 @@ object TestImmutable2 {
   println
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   TestMutable
   TestMutable2
   TestMutable3
diff --git a/tests/run/blame_eye_triple_eee-double.scala b/tests/run/blame_eye_triple_eee-double.scala
index 406fc960a70f..1640aead40c2 100644
--- a/tests/run/blame_eye_triple_eee-double.scala
+++ b/tests/run/blame_eye_triple_eee-double.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Double.NaN
 
   // NaN must not equal NaN no matter what optimizations are applied
diff --git a/tests/run/blame_eye_triple_eee-float.scala b/tests/run/blame_eye_triple_eee-float.scala
index e62461828799..4deb9f3d605e 100644
--- a/tests/run/blame_eye_triple_eee-float.scala
+++ b/tests/run/blame_eye_triple_eee-float.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import Float.NaN
 
   // NaN must not equal NaN no matter what optimizations are applied
diff --git a/tests/run/breakout.scala b/tests/run/breakout.scala
index a58191046aaf..8081405bd19b 100644
--- a/tests/run/breakout.scala
+++ b/tests/run/breakout.scala
@@ -2,7 +2,7 @@ import scala.collection.generic._
 import scala.collection._
 import scala.collection.mutable._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	val l = List(1, 2, 3)
 	val a: Array[Int] =  l.map(_ + 1)(breakOut)
 	println(a.mkString(", "))
diff --git a/tests/run/byNameVarargs/i499.scala b/tests/run/byNameVarargs/i499.scala
index e1550b6ec659..cd96a3df58fa 100644
--- a/tests/run/byNameVarargs/i499.scala
+++ b/tests/run/byNameVarargs/i499.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   def foo(a: => Any*) = ()
   def bar(a: => Any*) = foo(a : _*)
   def baz(a: => Seq[Any]) = foo(a : _*)
diff --git a/tests/run/case-class-23.scala b/tests/run/case-class-23.scala
index a6d78763c963..92b719574a34 100644
--- a/tests/run/case-class-23.scala
+++ b/tests/run/case-class-23.scala
@@ -24,7 +24,7 @@ case class TwentyThree(
   _23: Int
 )
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = new TwentyThree(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23)
   println(x._23)
   assert(x.copy(_1 = 1) == x)
diff --git a/tests/run/caseclasses.scala b/tests/run/caseclasses.scala
index f94bcab954ad..668c984f3de9 100644
--- a/tests/run/caseclasses.scala
+++ b/tests/run/caseclasses.scala
@@ -15,7 +15,7 @@ object M {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def Abs(x: Int) = new Abs(x * 2){}
   Abs(2) match {
diff --git a/tests/run/classmanifests_new_alias.scala b/tests/run/classmanifests_new_alias.scala
index 38af0ede3d22..777bd5dd6d45 100644
--- a/tests/run/classmanifests_new_alias.scala
+++ b/tests/run/classmanifests_new_alias.scala
@@ -1,6 +1,6 @@
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   type CM[T] = ClassManifest[T]
   println(implicitly[CM[Int]])
   println(implicitly[CM[Int]] eq Manifest.Int)
diff --git a/tests/run/classmanifests_new_core.scala b/tests/run/classmanifests_new_core.scala
index a916b750c7be..0a9c58e8e106 100644
--- a/tests/run/classmanifests_new_core.scala
+++ b/tests/run/classmanifests_new_core.scala
@@ -1,5 +1,5 @@
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classManifest[Int])
   println(classManifest[Int] eq Manifest.Int)
 }
diff --git a/tests/run/classtags_contextbound.scala b/tests/run/classtags_contextbound.scala
index 1edce82a2737..a3cfb2b9e9dd 100644
--- a/tests/run/classtags_contextbound.scala
+++ b/tests/run/classtags_contextbound.scala
@@ -1,6 +1,6 @@
 import scala.reflect.{ClassTag, classTag}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def mkArray[T: ClassTag] = Array[T]()
   def foo[T: ClassTag] = mkArray[T]
   println(foo[Int].getClass)
diff --git a/tests/run/collection-stacks.scala b/tests/run/collection-stacks.scala
index a41bef37ca8b..ed627640dde0 100644
--- a/tests/run/collection-stacks.scala
+++ b/tests/run/collection-stacks.scala
@@ -1,6 +1,6 @@
 import scala.collection.{ immutable, mutable }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def mutableStack[T](xs: T*): mutable.Stack[T] = {
     val s = new mutable.Stack[T]
     s.pushAll(xs)
diff --git a/tests/run/collections.scala b/tests/run/collections.scala
index acc2d93fff82..206a2b96bea1 100644
--- a/tests/run/collections.scala
+++ b/tests/run/collections.scala
@@ -2,7 +2,7 @@ import scala.collection._
 import scala.compat.Platform.currentTime
 import scala.language.postfixOps
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val printTime = false
 
diff --git a/tests/run/colltest.scala b/tests/run/colltest.scala
index 3f9ff3ba76b2..46e0c8478704 100644
--- a/tests/run/colltest.scala
+++ b/tests/run/colltest.scala
@@ -45,7 +45,7 @@ class TestSet(s0: Set[Int], s1: Set[Int]) {
   }
   Console.println("succeeded for "+Iterations+" iterations.")
 }
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def t3954: Unit = {
     import scala.collection.mutable
     import scala.collection.immutable
diff --git a/tests/run/colltest1.scala b/tests/run/colltest1.scala
index ab519067b6f7..c020253a60e4 100644
--- a/tests/run/colltest1.scala
+++ b/tests/run/colltest1.scala
@@ -4,7 +4,7 @@
 import scala.collection._
 import scala.language.postfixOps
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def orderedTraversableTest(empty: Traversable[Int]): Unit = {
     println("new test starting with "+empty)
diff --git a/tests/run/complicatedmatch.scala b/tests/run/complicatedmatch.scala
index 7a7438445553..681029aa1389 100644
--- a/tests/run/complicatedmatch.scala
+++ b/tests/run/complicatedmatch.scala
@@ -6,7 +6,7 @@ object Even{
   def unapply(x : Int) = if (x % 2 == 0) Some(x / 2) else None;
 }
 
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val LongWord = "supercalifragilisticexpialadocious";
 
   def foo(x : Int, y : String) : Int = (x, y) match {
diff --git a/tests/run/constant-optimization.scala b/tests/run/constant-optimization.scala
index a709cb5e4c96..56855fbc1c1c 100644
--- a/tests/run/constant-optimization.scala
+++ b/tests/run/constant-optimization.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def testBothReachable(): Unit = {
     val i = util.Random.nextInt()
     val x = if (i % 2 == 0) null else "good"
diff --git a/tests/run/contrib674.scala b/tests/run/contrib674.scala
index 090e0bf37c17..e19932eabb66 100644
--- a/tests/run/contrib674.scala
+++ b/tests/run/contrib674.scala
@@ -1,6 +1,6 @@
 // causes VerifyError with scala-2.5.1
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def bad(): Unit = {
     try {
       1
diff --git a/tests/run/correct-bind.scala b/tests/run/correct-bind.scala
index 9f45012bfa21..db625a544d18 100644
--- a/tests/run/correct-bind.scala
+++ b/tests/run/correct-bind.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val Array(who, what: _*) = "first second third" split (" ")
   println(what)
 }
diff --git a/tests/run/duration-coarsest.scala b/tests/run/duration-coarsest.scala
index 229b7960b2ba..21d35c9b2e3f 100644
--- a/tests/run/duration-coarsest.scala
+++ b/tests/run/duration-coarsest.scala
@@ -1,7 +1,7 @@
 import scala.concurrent.duration._
 import scala.language.postfixOps
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   List(
     (60 minutes,    1 hour),
     (2000 millis,   2 seconds),
diff --git a/tests/run/enrich-gentraversable.scala b/tests/run/enrich-gentraversable.scala
index 0a4ef9c5eae3..7d8b6bdb3b6d 100644
--- a/tests/run/enrich-gentraversable.scala
+++ b/tests/run/enrich-gentraversable.scala
@@ -1,7 +1,7 @@
 import scala.language.implicitConversions
 import scala.language.postfixOps
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.collection.{GenTraversableOnce,GenTraversableLike}
   import scala.collection.generic._
 
diff --git a/tests/run/exc.scala b/tests/run/exc.scala
index be999794a8eb..6457af1e141b 100644
--- a/tests/run/exc.scala
+++ b/tests/run/exc.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo() = {
     while (true) {
       try {
diff --git a/tests/run/exc1.scala b/tests/run/exc1.scala
index c48b4c156f17..9008f9d149ff 100644
--- a/tests/run/exc1.scala
+++ b/tests/run/exc1.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(): Unit = {
     while (true) {
       try {
diff --git a/tests/run/exc2.scala b/tests/run/exc2.scala
index 4075cb26fcbb..bb41f5286cf4 100644
--- a/tests/run/exc2.scala
+++ b/tests/run/exc2.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo() = {
     while (true) {
       try {
diff --git a/tests/run/exceptions-nest.scala b/tests/run/exceptions-nest.scala
index 87586485c0c9..4543faae6b35 100644
--- a/tests/run/exceptions-nest.scala
+++ b/tests/run/exceptions-nest.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   println(test1)
   println(test2)
diff --git a/tests/run/exoticnames.scala b/tests/run/exoticnames.scala
index beaea15b18af..98f9a8877649 100644
--- a/tests/run/exoticnames.scala
+++ b/tests/run/exoticnames.scala
@@ -1,5 +1,5 @@
 // this is a run-test because the compiler should emit bytecode that'll pass the JVM's verifier
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def `(` = sys.error("bla")
   def `.` = sys.error("bla")
   def `)` = sys.error("bla")
diff --git a/tests/run/finally.scala b/tests/run/finally.scala
index 64324abc4b61..92832165d82b 100644
--- a/tests/run/finally.scala
+++ b/tests/run/finally.scala
@@ -1,5 +1,5 @@
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
 
   // test that finally is not covered by any exception handlers.
diff --git a/tests/run/fors.scala b/tests/run/fors.scala
index 69455b55dc3a..188f60664bbb 100644
--- a/tests/run/fors.scala
+++ b/tests/run/fors.scala
@@ -4,7 +4,7 @@
 
 //############################################################################
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val xs = List(1, 2, 3)
   val ys = List(Symbol("a"), Symbol("b"), Symbol("c"))
 
diff --git a/tests/run/gadts.scala b/tests/run/gadts.scala
index 7413df1193db..57c7fc8af03a 100644
--- a/tests/run/gadts.scala
+++ b/tests/run/gadts.scala
@@ -6,7 +6,7 @@ case class If[T](c: Term[Boolean],
                  t1: Term[T],
                  t2: Term[T]) extends Term[T]
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def eval[T](t: Term[T]): T = t match {
     case Lit(n)        => n
     case Succ(u)       => eval(u) + 1
diff --git a/tests/run/genericValueClass.scala b/tests/run/genericValueClass.scala
index 689e0e251e2f..f7376e5a8def 100644
--- a/tests/run/genericValueClass.scala
+++ b/tests/run/genericValueClass.scala
@@ -1,7 +1,7 @@
 
 import scala.language.implicitConversions
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class ArrowAssocClass[A](val __leftOfArrow: A) extends AnyVal {
     inline def -> [B](y: B): Tuple2[A, B] = Tuple2(__leftOfArrow, y)
     def →[B](y: B): Tuple2[A, B] = ->(y)
diff --git a/tests/run/hashset.scala b/tests/run/hashset.scala
index a6deb704283e..2c18ade7b493 100644
--- a/tests/run/hashset.scala
+++ b/tests/run/hashset.scala
@@ -4,7 +4,7 @@ import scala.collection.mutable.FlatHashTable
 import scala.collection.mutable.HashSet
 import scala.collection.parallel.mutable.ParHashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   test(new Creator{
     def create[A] = new HashSet[A]
     def hashSetType = "HashSet"
diff --git a/tests/run/hashsetremove.scala b/tests/run/hashsetremove.scala
index e47269a96217..1cfb5ed63fbb 100644
--- a/tests/run/hashsetremove.scala
+++ b/tests/run/hashsetremove.scala
@@ -1,7 +1,7 @@
 import scala.collection.mutable.HashSet
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val h = new HashSet[Int]
   h += 1
   println(s"remove 0 should be false, was ${h remove 0}")
diff --git a/tests/run/i1543.scala b/tests/run/i1543.scala
index 268bc717bb59..4081a1053837 100644
--- a/tests/run/i1543.scala
+++ b/tests/run/i1543.scala
@@ -1,5 +1,5 @@
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Bar().foo(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31)
 }
 
diff --git a/tests/run/i659.scala b/tests/run/i659.scala
index d1229515d855..3e581f0723df 100644
--- a/tests/run/i659.scala
+++ b/tests/run/i659.scala
@@ -8,7 +8,7 @@ class VFoo(val a: Int) extends AnyVal {
   def foo = { {case x => x + a}: PartialFunction[Int, Int]}
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def Foo(a: Int) = {
     class Bar { def result(x: Int) = x + a }
diff --git a/tests/run/implicitclasses.scala b/tests/run/implicitclasses.scala
index fefb69591a12..886d4dede02d 100644
--- a/tests/run/implicitclasses.scala
+++ b/tests/run/implicitclasses.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   implicit class C(s: String) {
     def nElems = s.length
diff --git a/tests/run/implicits.scala b/tests/run/implicits.scala
index 60a361a44d08..fbc8536c041b 100644
--- a/tests/run/implicits.scala
+++ b/tests/run/implicits.scala
@@ -17,7 +17,7 @@ class C(x: String) {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import A.B._
   val c = new C("OK")
   val i = new c.Inner
diff --git a/tests/run/indexedSeq-apply.scala b/tests/run/indexedSeq-apply.scala
index 455218d2c93d..39d4db2ce923 100644
--- a/tests/run/indexedSeq-apply.scala
+++ b/tests/run/indexedSeq-apply.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val empty = IndexedSeq()
   assert(empty.isEmpty)
 
diff --git a/tests/run/infiniteloop.scala b/tests/run/infiniteloop.scala
index 2668d5b00297..57cfa8d37fc8 100644
--- a/tests/run/infiniteloop.scala
+++ b/tests/run/infiniteloop.scala
@@ -1,6 +1,6 @@
 /** Tests the optimiser (not to loop on 'reverse'). */
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo: Unit = {
     val s3 = Stream.range(1, 1000) //100000 (ticket #153: Stackoverflow)
 
diff --git a/tests/run/inliner-infer.scala b/tests/run/inliner-infer.scala
index 6a2e47194dc5..e41d6ae5c761 100644
--- a/tests/run/inliner-infer.scala
+++ b/tests/run/inliner-infer.scala
@@ -3,7 +3,7 @@
 /** Test that the inliner is not inferring that `xs' is
  *  always Nil, removing the call to isEmpty.
  */
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   @annotation.tailrec
   def walk(xs: MyList): Unit = {
diff --git a/tests/run/interop_classtags_are_classmanifests.scala b/tests/run/interop_classtags_are_classmanifests.scala
index 77b6bbbabe1b..62d85c3ce3b2 100644
--- a/tests/run/interop_classtags_are_classmanifests.scala
+++ b/tests/run/interop_classtags_are_classmanifests.scala
@@ -1,7 +1,7 @@
 import scala.reflect.ClassTag
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def classTagIsClassManifest[T: ClassTag] = {
     println(classManifest[T])
   }
diff --git a/tests/run/interpolationArgs.scala b/tests/run/interpolationArgs.scala
index f4e41557a68a..ffb254b63fd0 100644
--- a/tests/run/interpolationArgs.scala
+++ b/tests/run/interpolationArgs.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   try { scala.StringContext("p1", "p2", "p3").s("e1") } catch { case ex: Throwable => println(ex) }
   try { scala.StringContext("p1").s("e1") } catch { case ex: Throwable => println(ex) }
 }
diff --git a/tests/run/intmap.scala b/tests/run/intmap.scala
index 593714e2fd97..c5f8d7d3d1ba 100644
--- a/tests/run/intmap.scala
+++ b/tests/run/intmap.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   import scala.collection.immutable.IntMap;
 
   val it = IntMap(8 -> 2, 11 -> 3, 1 -> 2, 7 -> 13);
diff --git a/tests/run/isInstanceOf-eval.scala b/tests/run/isInstanceOf-eval.scala
index aa907b6972fa..9e161d05b7fe 100644
--- a/tests/run/isInstanceOf-eval.scala
+++ b/tests/run/isInstanceOf-eval.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   lazy val any = {
     println(1)
     1: Any
diff --git a/tests/run/iterables.scala b/tests/run/iterables.scala
index 251722982660..ad30f4731673 100644
--- a/tests/run/iterables.scala
+++ b/tests/run/iterables.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class Test(n: Int) extends Iterable[Int] {
     private var i = 0
     def iterator = new Iterator[Int] {
diff --git a/tests/run/iterator-from.scala b/tests/run/iterator-from.scala
index 1f73a7ffe8fb..63b68d3feb00 100644
--- a/tests/run/iterator-from.scala
+++ b/tests/run/iterator-from.scala
@@ -6,7 +6,7 @@ import scala.util.{Random => R}
 import scala.collection._
 import scala.math.Ordered
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val maxLength = 25
   val maxKey = 50
   val maxValue = 50
diff --git a/tests/run/lazy-exprs.scala b/tests/run/lazy-exprs.scala
index 3ba6b46ab216..c1800f2c673d 100644
--- a/tests/run/lazy-exprs.scala
+++ b/tests/run/lazy-exprs.scala
@@ -89,7 +89,7 @@ object TestExpressions {
 }
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   TestExpressions.test
 }
diff --git a/tests/run/lazy-override-run.scala b/tests/run/lazy-override-run.scala
index 3e00f31efc21..6016c3c8be19 100644
--- a/tests/run/lazy-override-run.scala
+++ b/tests/run/lazy-override-run.scala
@@ -13,7 +13,7 @@ class B extends A {
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
  val a = new A
  print("a.x=")
  println(a.x)
diff --git a/tests/run/lazy-traits.scala b/tests/run/lazy-traits.scala
index 89e262824a69..c7b6790db5e3 100644
--- a/tests/run/lazy-traits.scala
+++ b/tests/run/lazy-traits.scala
@@ -153,7 +153,7 @@ class MixedUnitLazy extends UnitLazy with UnitLazyT {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def test(name: String, v: A): Unit = {
     println(name + " test:")
diff --git a/tests/run/longmap.scala b/tests/run/longmap.scala
index b67fc75f1411..1f18eebd3111 100644
--- a/tests/run/longmap.scala
+++ b/tests/run/longmap.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   import scala.collection.immutable.LongMap;
 
   val it = LongMap(8L -> 2, 11L -> 3, 1L -> 2, 7L -> 13);
diff --git a/tests/run/map_test.scala b/tests/run/map_test.scala
index 947c846bdceb..b7036f51dd56 100644
--- a/tests/run/map_test.scala
+++ b/tests/run/map_test.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.{ListMap, Map, TreeMap}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   test1()
   test2()
   println("OK")
diff --git a/tests/run/matcharraytail.scala b/tests/run/matcharraytail.scala
index 3120769f41af..e82bcf6f02fe 100644
--- a/tests/run/matcharraytail.scala
+++ b/tests/run/matcharraytail.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   Array("foo", "bar", "baz") match {
     case x@Array("foo", bar :_*) => println(x.deep.toString); println(bar.toString);
     case Array(x, y, z) => println("shouldn't have fallen through");
diff --git a/tests/run/matchbytes.scala b/tests/run/matchbytes.scala
index b4455e8f4ddb..f2cea06eb362 100644
--- a/tests/run/matchbytes.scala
+++ b/tests/run/matchbytes.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val x = (1 : Byte) match {
     case 2 => println(2);
     case 1 => println(1);
diff --git a/tests/run/matchemptyarray.scala b/tests/run/matchemptyarray.scala
index fa56c0ed3a0c..1fa53b48297a 100644
--- a/tests/run/matchemptyarray.scala
+++ b/tests/run/matchemptyarray.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   Array[String]() match {
     case x@Array() => println(x.deep.toString());
   }
diff --git a/tests/run/matchintasany.scala b/tests/run/matchintasany.scala
index ab61e727a2b3..03f6ca2a8492 100644
--- a/tests/run/matchintasany.scala
+++ b/tests/run/matchintasany.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val x = (1 : Any) match {
     case 0xFFFFFFFF00000001L => println("Oops, overflow!");
     case 2L => println(2);
diff --git a/tests/run/matchonseq.scala b/tests/run/matchonseq.scala
index 99138706b800..f6f320245a91 100644
--- a/tests/run/matchonseq.scala
+++ b/tests/run/matchonseq.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Vector(1,2,3) match {
     case head +: tail => println("It worked! head=" + head)
   }
diff --git a/tests/run/matchonstream.scala b/tests/run/matchonstream.scala
index 6e5556519d58..0ccc7bc47b6d 100644
--- a/tests/run/matchonstream.scala
+++ b/tests/run/matchonstream.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   Stream.from(1) match { case Stream(1, 2, x :_*) => println("It worked!") }
 }
diff --git a/tests/run/missingparams.scala b/tests/run/missingparams.scala
index 21c9ae1701d8..fbc4d2a4f78f 100644
--- a/tests/run/missingparams.scala
+++ b/tests/run/missingparams.scala
@@ -13,7 +13,7 @@ final class Foo(val x: Int) {
     }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val foo1 = new Foo(42)
   val foo2 = new Foo(-42)
 
diff --git a/tests/run/multi-array.scala b/tests/run/multi-array.scala
index ff8b8ff2e661..36e21ae539de 100644
--- a/tests/run/multi-array.scala
+++ b/tests/run/multi-array.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a = Array(1, 2, 3)
   println(a.deep.toString)
 
diff --git a/tests/run/mutable-treeset.scala b/tests/run/mutable-treeset.scala
index 97dda65314e6..28b233836649 100644
--- a/tests/run/mutable-treeset.scala
+++ b/tests/run/mutable-treeset.scala
@@ -1,6 +1,6 @@
 import scala.collection.mutable.TreeSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val list = List(6,5,4,3,2,1,1,2,3,4,5,6,6,5,4,3,2,1)
   val distinct = list.distinct
   val sorted = distinct.sorted
diff --git a/tests/run/nothingTypeDce.scala b/tests/run/nothingTypeDce.scala
index b1acb7d51ac8..5f3692fd3366 100644
--- a/tests/run/nothingTypeDce.scala
+++ b/tests/run/nothingTypeDce.scala
@@ -56,7 +56,7 @@ class C {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // creating an instance is enough to trigger bytecode verification for all methods,
   // no need to invoke the methods.
   new C()
diff --git a/tests/run/nothingTypeNoFramesNoDce.scala b/tests/run/nothingTypeNoFramesNoDce.scala
index 4bfbfb3d79c7..7f63faeaa7b4 100644
--- a/tests/run/nothingTypeNoFramesNoDce.scala
+++ b/tests/run/nothingTypeNoFramesNoDce.scala
@@ -56,6 +56,6 @@ class C {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new C()
 }
diff --git a/tests/run/nothingTypeNoOpt.scala b/tests/run/nothingTypeNoOpt.scala
index 6a9587381baf..454539a4b108 100644
--- a/tests/run/nothingTypeNoOpt.scala
+++ b/tests/run/nothingTypeNoOpt.scala
@@ -56,6 +56,6 @@ class C {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new C()
 }
diff --git a/tests/run/patmat-finally.scala b/tests/run/patmat-finally.scala
index 895fb79f79de..e16945202e6b 100644
--- a/tests/run/patmat-finally.scala
+++ b/tests/run/patmat-finally.scala
@@ -1,5 +1,5 @@
 /** Test pattern matching and finally, see SI-5929. */
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def bar(s1: Object, s2: Object): Unit = {
     s1 match {
       case _ =>
diff --git a/tests/run/phantomValueClass.scala b/tests/run/phantomValueClass.scala
index fb4b8e2d0b49..f6509f21893a 100644
--- a/tests/run/phantomValueClass.scala
+++ b/tests/run/phantomValueClass.scala
@@ -2,7 +2,7 @@ final class Phantom[A](val s: String) extends AnyVal {
   def compose(p: Phantom[A]): Phantom[A] = new Phantom[A](s+p.s)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = new Phantom[Int]("foo")
   val y = new Phantom[Int]("bar")
   val z = x compose y
diff --git a/tests/run/proxy.scala b/tests/run/proxy.scala
index 8449b73298a9..8a6385dc8550 100644
--- a/tests/run/proxy.scala
+++ b/tests/run/proxy.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val p = new Proxy {
     def self = 2
   }
diff --git a/tests/run/rawstrings.scala b/tests/run/rawstrings.scala
index bf4c684f3bc5..b4d6e0c40a09 100644
--- a/tests/run/rawstrings.scala
+++ b/tests/run/rawstrings.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(raw"[\n\t'${'"'}$$\n]")
 }
diff --git a/tests/run/runtime-richChar.scala b/tests/run/runtime-richChar.scala
index 0368368bf6e5..72e25a3a833d 100644
--- a/tests/run/runtime-richChar.scala
+++ b/tests/run/runtime-richChar.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def testSeq(name: String, expected: Seq[Char], got: Seq[Char]): Unit = {
     if (expected.toList == got.toList)
       println(name + " ok")
diff --git a/tests/run/search.scala b/tests/run/search.scala
index 611245b7a365..ed7fed54a707 100644
--- a/tests/run/search.scala
+++ b/tests/run/search.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.collection.{LinearSeq, IndexedSeq}
   import scala.collection.Searching.search
 
diff --git a/tests/run/slices.scala b/tests/run/slices.scala
index 838fb46a9b64..9a02dbc2d4d0 100644
--- a/tests/run/slices.scala
+++ b/tests/run/slices.scala
@@ -1,7 +1,7 @@
 
 import scala.language.postfixOps
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   // lists
   println(List(1, 2, 3, 4).slice(1, 2))
diff --git a/tests/run/sort.scala b/tests/run/sort.scala
index c38b8fbde7c7..eea3a2d64564 100644
--- a/tests/run/sort.scala
+++ b/tests/run/sort.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println((1 to 100000).toList.sortWith(_<_).length)
   println(List(1, 5, 10, 3, 2).toList.sortWith(_<_))
   println(List(1, 5, 10, 3, 2).toList.sortWith(_>_))
diff --git a/tests/run/stream-stack-overflow-filter-map.scala b/tests/run/stream-stack-overflow-filter-map.scala
index 22db619a31ad..bde7aea61058 100644
--- a/tests/run/stream-stack-overflow-filter-map.scala
+++ b/tests/run/stream-stack-overflow-filter-map.scala
@@ -1,6 +1,6 @@
 import collection.generic.{FilterMonadic, CanBuildFrom}
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def mapSucc[Repr, That](s: FilterMonadic[Int, Repr])(implicit cbf: CanBuildFrom[Repr, Int, That]) = s map (_ + 1)
   def flatMapId[T, Repr, That](s: FilterMonadic[T, Repr])(implicit cbf: CanBuildFrom[Repr, T, That]) = s flatMap (Seq(_))
 
diff --git a/tests/run/stream_flatmap_odds.scala b/tests/run/stream_flatmap_odds.scala
index 9e12e6dfad77..1935253595c5 100644
--- a/tests/run/stream_flatmap_odds.scala
+++ b/tests/run/stream_flatmap_odds.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	lazy val odds: Stream[Int] = Stream(1) append ( odds flatMap {x => Stream(x + 2)} )
 	Console println (odds take 42).force
 }
diff --git a/tests/run/t0017.scala b/tests/run/t0017.scala
index 1c4fb2e6832c..245cbb7e42e4 100644
--- a/tests/run/t0017.scala
+++ b/tests/run/t0017.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
 def transpose[A](arr: Array[Array[A]]) = {
   for (i <- Array.range(0, arr(0).length)) yield
diff --git a/tests/run/t0042.scala b/tests/run/t0042.scala
index 57c8563f0fbf..aa4a74d2f8d5 100644
--- a/tests/run/t0042.scala
+++ b/tests/run/t0042.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def getClause[T](clauses: List[T]): Option[T] = {
     for (c <- clauses) {
       return Some(c)
diff --git a/tests/run/t0607.scala b/tests/run/t0607.scala
index 8f9e29533c83..b07fdcd49015 100644
--- a/tests/run/t0607.scala
+++ b/tests/run/t0607.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class A()
   class B extends A() { override def toString() = "B()" }
   println(A())
diff --git a/tests/run/t0631.scala b/tests/run/t0631.scala
index 2767b4bf06c2..c401ed31cb32 100644
--- a/tests/run/t0631.scala
+++ b/tests/run/t0631.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class Foo {
     override def equals(that: Any) = {
       println("Foo.equals called")
diff --git a/tests/run/t0668.scala b/tests/run/t0668.scala
index f97c360e59a3..98ecb554c739 100644
--- a/tests/run/t0668.scala
+++ b/tests/run/t0668.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val ints: Array[Int] = Array(1, 2, 3)
   ints.toArray
 }
diff --git a/tests/run/t0677-old.scala b/tests/run/t0677-old.scala
index fde0aac9fd73..8d4c3ee06056 100644
--- a/tests/run/t0677-old.scala
+++ b/tests/run/t0677-old.scala
@@ -1,7 +1,7 @@
 
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class X[T: ClassManifest] {
     val a = Array.ofDim[T](3, 4)
   }
diff --git a/tests/run/t0807.scala b/tests/run/t0807.scala
index 1b5bc91c51c7..1e2a26664a61 100644
--- a/tests/run/t0807.scala
+++ b/tests/run/t0807.scala
@@ -1,5 +1,5 @@
 trait A
 trait B extends A { val x = println("early") }
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new B {}
 }
diff --git a/tests/run/t0883.scala b/tests/run/t0883.scala
index fb46f423eaef..c8ed06dbfec0 100644
--- a/tests/run/t0883.scala
+++ b/tests/run/t0883.scala
@@ -2,7 +2,7 @@ object Foo { def apply(x: String) = new Foo(x) }
 class Foo(name: String)
 case object Bar extends Foo("Bar")
 case class Baz() extends Foo("Baz")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Foo("Bar") match {
     case Bar => println("What?")
     case _ => println("OK")
diff --git a/tests/run/t0936.scala b/tests/run/t0936.scala
index 7cb00b9499e6..e3470a248015 100644
--- a/tests/run/t0936.scala
+++ b/tests/run/t0936.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo = {
 
     abstract class MouseEventType { def x: String }
diff --git a/tests/run/t1044.scala b/tests/run/t1044.scala
index 227f6de2731b..4d37a40c81d9 100644
--- a/tests/run/t1044.scala
+++ b/tests/run/t1044.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val ducks = Array[AnyRef]("Huey", "Dewey", "Louie");
   ducks.iterator.asInstanceOf[Iterator[String]]
 }
diff --git a/tests/run/t1192.scala b/tests/run/t1192.scala
index 073d346859c1..cdff7ef72d0f 100644
--- a/tests/run/t1192.scala
+++ b/tests/run/t1192.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val v1: Array[Array[Int]] = Array(Array(1, 2), Array(3, 4))
   def f[T](w: Array[Array[T]]): Unit = {
     for (r <- w) println(r.deep.toString)
diff --git a/tests/run/t1220.scala b/tests/run/t1220.scala
index 3f70107ce4b3..75e0ea07e8b2 100644
--- a/tests/run/t1220.scala
+++ b/tests/run/t1220.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   class QSRichIterable[A](self: Iterable[A]) {
     def filterMap[R](f: PartialFunction[A,R]) =
diff --git a/tests/run/t1300.scala b/tests/run/t1300.scala
index 8ba13fae1446..aa3580e33ca1 100644
--- a/tests/run/t1300.scala
+++ b/tests/run/t1300.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp
+object Test extends App
 {
   val a1 = Array(0,1,2,3).toArray[Any]
 //  val a1 = x1.toArray[Any]
diff --git a/tests/run/t1323.scala b/tests/run/t1323.scala
index 68692d92a6d4..94b51bd2a4aa 100644
--- a/tests/run/t1323.scala
+++ b/tests/run/t1323.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(" 1:" + List(1,2,3,4).indexOfSlice(List(0,1)))        // -1
   println(" 2:" + List(1,2,3,4).indexOfSlice(List(1,2)))        //  0
   println(" 3:" + List(1,2,3,4).indexOfSlice(List(2,3)))        //  1
diff --git a/tests/run/t1373.scala b/tests/run/t1373.scala
index 9a873f0ed518..d6f9c1ee1cbe 100644
--- a/tests/run/t1373.scala
+++ b/tests/run/t1373.scala
@@ -1,5 +1,5 @@
 // Testing whether case class params come back in the right order.
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class Foo(private val a: String, b: String, private val c: String, d: String, private val e: String)
   val x = Foo("a", "b", "c", "d", "e")
   assert(x.toString == """Foo(a,b,c,d,e)""")
diff --git a/tests/run/t1423.scala b/tests/run/t1423.scala
index d8b0898273dc..073483aeee20 100644
--- a/tests/run/t1423.scala
+++ b/tests/run/t1423.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val x = 1 match {
     case 0xFFFFFFFF00000001L => println("Oops, overflow!");
     case 2L => println(2);
diff --git a/tests/run/t1466.scala b/tests/run/t1466.scala
index cacadd53e892..c59a3885908e 100644
--- a/tests/run/t1466.scala
+++ b/tests/run/t1466.scala
@@ -6,6 +6,6 @@ object IOvervalueMyPrivacy {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert(IOvervalueMyPrivacy.go == 6)
 }
diff --git a/tests/run/t1505.scala b/tests/run/t1505.scala
index 8131d03df6a5..4afbb99ef79b 100644
--- a/tests/run/t1505.scala
+++ b/tests/run/t1505.scala
@@ -8,7 +8,7 @@ object R extends Enumeration {
   val A, B, C = Value
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert(Q(0) == Q.withName("A"))
   assert(Q.C == Q.withName("C"))
 
diff --git a/tests/run/t1524.scala b/tests/run/t1524.scala
index d28d56efbdd1..8a1fb7d5c04f 100644
--- a/tests/run/t1524.scala
+++ b/tests/run/t1524.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val buf = new scala.collection.mutable.ArrayBuffer[String](0)
   buf += "initial"
diff --git a/tests/run/t153.scala b/tests/run/t153.scala
index 610a9d6df26e..3fdb4238650a 100644
--- a/tests/run/t153.scala
+++ b/tests/run/t153.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	def powers(x: Int) = if ((x&(x-1))==0) Some(x) else None
 	val res = (Stream.range(1, 500000) flatMap powers).reverse
 	println((res take 42).force)
diff --git a/tests/run/t1535.scala b/tests/run/t1535.scala
index 853a31cacb3e..b0163a9710d5 100644
--- a/tests/run/t1535.scala
+++ b/tests/run/t1535.scala
@@ -8,7 +8,7 @@ class ClassDecl extends BlockStmt {
     lazy val y = true
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
     val n = new ClassDecl ()
     println (n.x)
     println (n.y)
diff --git a/tests/run/t1591.scala b/tests/run/t1591.scala
index 78efb695acba..6dd960504230 100644
--- a/tests/run/t1591.scala
+++ b/tests/run/t1591.scala
@@ -8,7 +8,7 @@ abstract class A {
 
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
     val a = new A{}
     println(a.lazyBar.foo)
 }
diff --git a/tests/run/t1718.scala b/tests/run/t1718.scala
index e6f52025448a..d1b19c38cd5e 100644
--- a/tests/run/t1718.scala
+++ b/tests/run/t1718.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   def matchesNull[T](mightBeNull: Array[T]): Boolean = mightBeNull match {
     case null => true
     case x => false
diff --git a/tests/run/t1747.scala b/tests/run/t1747.scala
index f2b51a2537a8..4bf583c1842c 100644
--- a/tests/run/t1747.scala
+++ b/tests/run/t1747.scala
@@ -3,4 +3,4 @@ object Foo extends Foo {
 }
 class Foo
 
-object Test extends dotty.runtime.LegacyApp { Foo }
+object Test extends App { Foo }
diff --git a/tests/run/t1909b.scala b/tests/run/t1909b.scala
index 073c371d9ce1..5f662b234d84 100644
--- a/tests/run/t1909b.scala
+++ b/tests/run/t1909b.scala
@@ -4,6 +4,6 @@ class Ticket1909 (x: Int) {
     bar()
   })
 }
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Ticket1909()
 }
diff --git a/tests/run/t1909c.scala b/tests/run/t1909c.scala
index 50e06b39e1bc..87c0eb08b58a 100644
--- a/tests/run/t1909c.scala
+++ b/tests/run/t1909c.scala
@@ -4,6 +4,6 @@ class Base(a: Any)
 //  at Test$.<init>(t1909c.scala)
 class Sub() extends Base({ def bippy = 5; bippy })
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Sub()
 }
diff --git a/tests/run/t1939.scala b/tests/run/t1939.scala
index 620c5b76f733..7626e8bc1a97 100644
--- a/tests/run/t1939.scala
+++ b/tests/run/t1939.scala
@@ -15,7 +15,7 @@ final class T2(_module: Module) extends T {
   def module = _module
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   type mType = Module
 
diff --git a/tests/run/t2075.scala b/tests/run/t2075.scala
index e81fb201c640..e3a68e4a8359 100644
--- a/tests/run/t2075.scala
+++ b/tests/run/t2075.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   var tm = new scala.collection.immutable.TreeMap[Int,Int]
   for (i <- 0 to 100)
     tm = tm.insert(i, i)
diff --git a/tests/run/t2111.scala b/tests/run/t2111.scala
index 4482b36c11d5..98177c4e216f 100644
--- a/tests/run/t2111.scala
+++ b/tests/run/t2111.scala
@@ -1,5 +1,5 @@
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   object Color extends Enumeration {
     val Red, Green, Blue = Value
diff --git a/tests/run/t2147.scala b/tests/run/t2147.scala
index ff5b71feee98..1a1dfddc7155 100644
--- a/tests/run/t2147.scala
+++ b/tests/run/t2147.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val s: Seq[Int] = Stream.from(1)
   val res0 = s.map(a => 2).head
   val res1 = Stream.from(1).flatMap(a => List(1)).head
diff --git a/tests/run/t216.scala b/tests/run/t216.scala
index 56efb450283f..916a3c582b2a 100644
--- a/tests/run/t216.scala
+++ b/tests/run/t216.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   object m {
     val f = { x: Unit => () }
     Console.println("OK")
diff --git a/tests/run/t2176.scala b/tests/run/t2176.scala
index 8e2c583f1df2..2a46dcf2c422 100644
--- a/tests/run/t2176.scala
+++ b/tests/run/t2176.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val res0 = Stream.cons(1, Stream.cons( { println("ouch"); 2 }, Stream.empty))
   println(res0.take(1).force)
 }
diff --git a/tests/run/t2177.scala b/tests/run/t2177.scala
index 4485cfb8611f..5e344c654d0d 100644
--- a/tests/run/t2177.scala
+++ b/tests/run/t2177.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Stream.from(1).take(5).mkString)
 }
diff --git a/tests/run/t2255.scala b/tests/run/t2255.scala
index 64dec8cae8a5..0b34115ed231 100644
--- a/tests/run/t2255.scala
+++ b/tests/run/t2255.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Stream.continually(Stream(1, 2, 3)).flatten.take(6).toList)
 }
diff --git a/tests/run/t2488.scala b/tests/run/t2488.scala
index c4cd0f60c1d8..22abdf8af233 100644
--- a/tests/run/t2488.scala
+++ b/tests/run/t2488.scala
@@ -2,7 +2,7 @@ class C {
   def f(a:Int, b:Int) = 1
   def f() = 2
 }
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = new C()
   println(c.f(a = 1,2))
   println(c.f(a = 1, b = 2))
diff --git a/tests/run/t2552.scala b/tests/run/t2552.scala
index 2a68b64c0fbb..d93d7fa54c1e 100644
--- a/tests/run/t2552.scala
+++ b/tests/run/t2552.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	def testTakeWhile = {
 		val numbers = Iterator.range(0, 50)
 		val zeroTo9 = numbers.takeWhile(x => { println("p(" + x + ")"); x < 10 } )
diff --git a/tests/run/t2788.scala b/tests/run/t2788.scala
index 61344029dfe1..b1596d582330 100644
--- a/tests/run/t2788.scala
+++ b/tests/run/t2788.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Array(Some(1), None, Some(2)).flatten.toList)
 }
diff --git a/tests/run/t2813.2.scala b/tests/run/t2813.2.scala
index fa97c729110c..768653f1def3 100644
--- a/tests/run/t2813.2.scala
+++ b/tests/run/t2813.2.scala
@@ -1,7 +1,7 @@
 import java.util.LinkedList
 import collection.JavaConversions._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def assertListEquals[A](expected: List[A], actual: Seq[A]): Unit = {
     assert(expected.sameElements(actual),
            "Expected list to contain " + expected.mkString("[", ", ", "]") +
diff --git a/tests/run/t2818.scala b/tests/run/t2818.scala
index 7829b0251186..746cdfb04923 100644
--- a/tests/run/t2818.scala
+++ b/tests/run/t2818.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println((List.range(1L, 15L) :\ 0L) (_ + _))
   println((List.range(1L, 1000000L) :\ 0L) (_ + _))
   println((List.fill(5)(1) :\ 1) (_ - _))
diff --git a/tests/run/t2857.scala b/tests/run/t2857.scala
index 5df2d440eac5..c523227c4f6c 100644
--- a/tests/run/t2857.scala
+++ b/tests/run/t2857.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import collection.mutable._
   val m = new HashMap[Int, Set[String]] with MultiMap[Int, String]
   m.addBinding(6, "Foo")
diff --git a/tests/run/t298.scala b/tests/run/t298.scala
index 5728bb6c92f5..bfc219ec5a91 100644
--- a/tests/run/t298.scala
+++ b/tests/run/t298.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit def anyList[T]: List[T] = Nil
 
   implicit def intList: List[Int] = 42::24::Nil
diff --git a/tests/run/t3038.scala b/tests/run/t3038.scala
index 6c9888c781cb..7eb69f7fb581 100644
--- a/tests/run/t3038.scala
+++ b/tests/run/t3038.scala
@@ -62,7 +62,7 @@ class C extends A {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   (new C).run
 }
 
diff --git a/tests/run/t3038b.scala b/tests/run/t3038b.scala
index 559f754aa6de..1527d64ebc81 100644
--- a/tests/run/t3038b.scala
+++ b/tests/run/t3038b.scala
@@ -15,6 +15,6 @@ class A {
     }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
     new A().run
 }
diff --git a/tests/run/t3097.scala b/tests/run/t3097.scala
index c5bac528baaa..4aaf8056caa2 100644
--- a/tests/run/t3097.scala
+++ b/tests/run/t3097.scala
@@ -9,7 +9,7 @@ sealed trait IDoubleValue extends IAbstractDoubleValue[Double]
 case class ListValue(val items: List[IAtomicValue[_]]) extends IListValue
 class DoubleValue(val data: Double) extends IDoubleValue
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // match is exhaustive
   (new DoubleValue(1): ISimpleValue) match {
     case m: IListValue => println("list")
diff --git a/tests/run/t3186.scala b/tests/run/t3186.scala
index e170a4d503ee..09de1a5ce038 100644
--- a/tests/run/t3186.scala
+++ b/tests/run/t3186.scala
@@ -2,6 +2,6 @@ object Dist1 extends Enumeration { val Mile, Foot, Inch = Value }
 
 object Dist2 extends Enumeration { val Kilometer, Millimeter, Parsec = Value }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Dist1.Mile == Dist2.Kilometer)
 }
diff --git a/tests/run/t3346a.scala b/tests/run/t3346a.scala
index dce1267165c1..c3d9598cabb8 100644
--- a/tests/run/t3346a.scala
+++ b/tests/run/t3346a.scala
@@ -1,6 +1,6 @@
 import scala.language.implicitConversions
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class Rep[T](x : T)
 
   class SomeOps[T](x : Rep[T]) { def foo = 1 }
diff --git a/tests/run/t3346d.scala b/tests/run/t3346d.scala
index 6a4434a9d9e2..2d82a45ab505 100644
--- a/tests/run/t3346d.scala
+++ b/tests/run/t3346d.scala
@@ -1,6 +1,6 @@
 import scala.language.implicitConversions
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   trait TARInt
 
   trait Basket[A,B] {
diff --git a/tests/run/t3346g.scala b/tests/run/t3346g.scala
index a5b7d6bf8fbe..fd90322da762 100644
--- a/tests/run/t3346g.scala
+++ b/tests/run/t3346g.scala
@@ -2,7 +2,7 @@ import scala.language.implicitConversions
 
 case class A(b: Int, c: String)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit def s2i(s: String): Int = s.length
   implicit def toA[T](t: T)(implicit f: T => Int): A = A(f(t), t.toString)
   println("asdf".copy(b = 3))
diff --git a/tests/run/t3346h.scala b/tests/run/t3346h.scala
index 0dc4b9f2e787..49f672d34bca 100644
--- a/tests/run/t3346h.scala
+++ b/tests/run/t3346h.scala
@@ -1,6 +1,6 @@
 import scala.language.implicitConversions
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   trait Fundep[T, U] { def u(t: T): U }
   class C { def y = "x" }
   implicit val FundepStringC: Test.Fundep[String,Test.C] = new Fundep[String, C]{ def u(t: String) = new C }
diff --git a/tests/run/t3353.scala b/tests/run/t3353.scala
index 472723b3c485..eeb63c1b055a 100644
--- a/tests/run/t3353.scala
+++ b/tests/run/t3353.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   "foo" match {
     case Matcher(result) => println(result)
diff --git a/tests/run/t3361.scala b/tests/run/t3361.scala
index e1866cd7a178..25e095476f2c 100644
--- a/tests/run/t3361.scala
+++ b/tests/run/t3361.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.collection.mutable.DoubleLinkedList
 
   empty
diff --git a/tests/run/t3452e/Test.scala b/tests/run/t3452e/Test.scala
index 9525c3403acd..fc175bf94a3a 100644
--- a/tests/run/t3452e/Test.scala
+++ b/tests/run/t3452e/Test.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	new B
 }
diff --git a/tests/run/t3488.scala b/tests/run/t3488.scala
index cbb9e0919557..913752125549 100644
--- a/tests/run/t3488.scala
+++ b/tests/run/t3488.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(p: => Unit)(x:Int = 0) = x
 
   println(foo { val List(_: _*)=List(0); 1 } ())
diff --git a/tests/run/t3619.scala b/tests/run/t3619.scala
index 75b0d3cf7604..3f4c56ea53c8 100644
--- a/tests/run/t3619.scala
+++ b/tests/run/t3619.scala
@@ -1,6 +1,6 @@
 class Dep(x: Int)(implicit val nameClash: String)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit val nameClash: String = "meh"
 
   def meth(implicit w: String) = 1
diff --git a/tests/run/t3670.scala b/tests/run/t3670.scala
index b9cee847bcdf..4a26e34f365c 100644
--- a/tests/run/t3670.scala
+++ b/tests/run/t3670.scala
@@ -11,7 +11,7 @@ class C {
   }
 }
 
-class M extends dotty.runtime.LegacyApp {
+class M extends App {
   def foo: Unit = {
     lazy val a = {
         lazy val b = 1
@@ -25,7 +25,7 @@ class M extends dotty.runtime.LegacyApp {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
     new C()
     new M().foo
 }
diff --git a/tests/run/t3687.scala b/tests/run/t3687.scala
index cad30a244bdf..e26433beca24 100644
--- a/tests/run/t3687.scala
+++ b/tests/run/t3687.scala
@@ -1,6 +1,6 @@
 object t extends Enumeration { val a, b = Value }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(t.values)
   println(t.values)
 }
diff --git a/tests/run/t3719.scala b/tests/run/t3719.scala
index ce3cf5aa3f0d..01dc2055452d 100644
--- a/tests/run/t3719.scala
+++ b/tests/run/t3719.scala
@@ -12,7 +12,7 @@ object Days extends Enumeration {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def dayElementsShouldBeNamed(): List[String] =
     Days.values.toList.sorted.map(x => x.toString)
 
diff --git a/tests/run/t3726.scala b/tests/run/t3726.scala
index fefc29f11190..02b262fdacd3 100644
--- a/tests/run/t3726.scala
+++ b/tests/run/t3726.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(f: () => Int) = {
     val x = f()
     5
diff --git a/tests/run/t3763.scala b/tests/run/t3763.scala
index 2fa2992a821a..1ac3013c845d 100644
--- a/tests/run/t3763.scala
+++ b/tests/run/t3763.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = Array(Array(1), List(1))
 }
diff --git a/tests/run/t3832.scala b/tests/run/t3832.scala
index bc84dca227c1..ac44358bc751 100644
--- a/tests/run/t3832.scala
+++ b/tests/run/t3832.scala
@@ -11,7 +11,7 @@ class t3832 {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new t3832(0)
   new t3832(true)
 }
diff --git a/tests/run/t3835.scala b/tests/run/t3835.scala
index 7863916f42d3..766b6ddc2e4d 100644
--- a/tests/run/t3835.scala
+++ b/tests/run/t3835.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // work around optimizer bug SI-5672  -- generates wrong bytecode for switches in arguments
   // virtpatmat happily emits a switch for a one-case switch
   // this is not the focus of this test, hence the temporary workaround
diff --git a/tests/run/t3950.scala b/tests/run/t3950.scala
index 4634b3bf0bbd..58466e13fbc4 100644
--- a/tests/run/t3950.scala
+++ b/tests/run/t3950.scala
@@ -10,7 +10,7 @@ object NegativeId extends Enumeration {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(NegativeId.fromInt(-1))
   println(NegativeId.fromInt(0))
   println(NegativeId.fromInt(1))
diff --git a/tests/run/t3994.scala b/tests/run/t3994.scala
index e9fc39f8110a..0ee1d9d96670 100644
--- a/tests/run/t3994.scala
+++ b/tests/run/t3994.scala
@@ -14,7 +14,7 @@ class Crash { // if you change this to a `trait` it keeps failing, though if it
   implicit object ElementOrdering extends ElementOrdering
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   (new T {}).Default
   (new Crash).ElementOrdering
 }
diff --git a/tests/run/t4024.scala b/tests/run/t4024.scala
index 480934107839..f48410915d84 100644
--- a/tests/run/t4024.scala
+++ b/tests/run/t4024.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val x = "abc"
 
diff --git a/tests/run/t4027.scala b/tests/run/t4027.scala
index 6a858afd98b5..585c5c8b3775 100644
--- a/tests/run/t4027.scala
+++ b/tests/run/t4027.scala
@@ -6,7 +6,7 @@ import collection._
 /** Sorted maps should have `filterKeys` and `mapValues` which return sorted maps.
  *  Mapping, filtering, etc. on these views should return sorted maps again.
  */
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val sortedmap = SortedMap(1 -> false, 2 -> true, 3 -> false, 4 -> true)
   println(sortedmap.filterKeys(_ % 2 == 0): SortedMap[Int, Boolean])
diff --git a/tests/run/t405.scala b/tests/run/t405.scala
index a78203e3da6c..e736fc1e571a 100644
--- a/tests/run/t405.scala
+++ b/tests/run/t405.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = M;
   object M;
   assert(x eq M)
diff --git a/tests/run/t4190.scala b/tests/run/t4190.scala
index 0c91d62de4db..aa88b8708d7d 100644
--- a/tests/run/t4190.scala
+++ b/tests/run/t4190.scala
@@ -1,6 +1,6 @@
 import collection.mutable._
 
-object  Test extends dotty.runtime.LegacyApp {
+object  Test extends App {
   val x: ArrayBuffer[String] = ArrayBuffer("a", "b", "c")
   x.view map (_ + "0") foreach println
 }
diff --git a/tests/run/t4332b.scala b/tests/run/t4332b.scala
index a773da960d7a..8ee069ca2d1d 100644
--- a/tests/run/t4332b.scala
+++ b/tests/run/t4332b.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def check(expected: Any, actual: Any, msg: String = "") = {
     if (expected != actual)
       sys.error(s"($actual != $expected) $msg")
diff --git a/tests/run/t4537/d.scala b/tests/run/t4537/d.scala
index be02667107a2..dd1d2045ed76 100644
--- a/tests/run/t4537/d.scala
+++ b/tests/run/t4537/d.scala
@@ -1,6 +1,6 @@
 import a._
 import b._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Settings.Y)
 }
diff --git a/tests/run/t4742.scala b/tests/run/t4742.scala
index 47656049b941..3b42c0c12093 100644
--- a/tests/run/t4742.scala
+++ b/tests/run/t4742.scala
@@ -1,7 +1,7 @@
 trait T { val x: Int = 0 }
 object O extends T { override final val x = 1 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // was throwing an UnitializedFieldError as constant 1 is folded into the accessor
   assert((O: T).x == 1)
 }
diff --git a/tests/run/t4750.scala b/tests/run/t4750.scala
index 7b043236255a..96d2c4fec745 100644
--- a/tests/run/t4750.scala
+++ b/tests/run/t4750.scala
@@ -1,6 +1,6 @@
 import scala.util.matching.Regex
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val input = "CURRENCY 5.80"
   println("CURRENCY".r.replaceAllIn(input, Regex quoteReplacement "US$"))
 }
diff --git a/tests/run/t4777.scala b/tests/run/t4777.scala
index ef163c476677..6c7b856e390a 100644
--- a/tests/run/t4777.scala
+++ b/tests/run/t4777.scala
@@ -2,7 +2,7 @@ class A(val a: Int = 13)
 class DefaultsTest(x: Int = 25) extends A(28)
 object DefaultsTest extends DefaultsTest(12)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(new DefaultsTest().a)
   println(DefaultsTest.a)
 }
diff --git a/tests/run/t4813.scala b/tests/run/t4813.scala
index 1146bb16ec04..6d48ca87588e 100644
--- a/tests/run/t4813.scala
+++ b/tests/run/t4813.scala
@@ -2,7 +2,7 @@ import collection.mutable._
 import reflect._
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def runTest[T, U](col: T)(clone: T => U)(mod: T => Unit)(implicit ct: ClassTag[T]): Unit = {
      val cloned = clone(col)
      assert(cloned == col, s"cloned should be equal to original. $cloned != $col")
diff --git a/tests/run/t4935.scala b/tests/run/t4935.scala
index 88940be6bffe..5940355b9b9c 100644
--- a/tests/run/t4935.scala
+++ b/tests/run/t4935.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   for (i <- 0 to 1) {
     val a = Foo
   }
diff --git a/tests/run/t498.scala b/tests/run/t498.scala
index d50d8fd3f3cc..5c10e6630f76 100644
--- a/tests/run/t498.scala
+++ b/tests/run/t498.scala
@@ -1,7 +1,7 @@
 
 import scala.language.postfixOps
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 // the function passed to flatMap produces lots of empty streams, but this should not overflow the stack
 	val res = Stream.from(1).flatMap(i => if (i < 3000) Stream.empty else List(1))
 	println(res take 42 force)
diff --git a/tests/run/t5009.scala b/tests/run/t5009.scala
index 9e4700c07fd0..db12c0d6858b 100644
--- a/tests/run/t5009.scala
+++ b/tests/run/t5009.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   case class C[T, U <: String, O >: Object](x: Int, y: T)(z: U, b: Boolean)(s: O, val l: Int)
 
diff --git a/tests/run/t5040.scala b/tests/run/t5040.scala
index be6e95ae663c..bccb16de444b 100644
--- a/tests/run/t5040.scala
+++ b/tests/run/t5040.scala
@@ -4,7 +4,7 @@ abstract class Prova2 extends Dynamic {
   private def privateMethod() = println("private method")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val prova= new Prova2 {
     def applyDynamic(m: String)() = println("applyDynamic")
   }
diff --git a/tests/run/t5045.scala b/tests/run/t5045.scala
index 3778339aa4b1..b0c3a4ddc4f4 100644
--- a/tests/run/t5045.scala
+++ b/tests/run/t5045.scala
@@ -1,7 +1,7 @@
 
 import scala.language.postfixOps
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
  import scala.util.matching.{ Regex, UnanchoredRegex }
 
diff --git a/tests/run/t5053.scala b/tests/run/t5053.scala
index 797faaeaf7f5..50057ce66cab 100644
--- a/tests/run/t5053.scala
+++ b/tests/run/t5053.scala
@@ -1,7 +1,7 @@
 
 import scala.language.{ existentials }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val (left, right) = Seq((1, "a"), (1, "a"), (1, "a"), (3, "c")).view.unzip
     println(left.isInstanceOf[scala.collection.SeqViewLike[_,_,_]])
diff --git a/tests/run/t5171.scala b/tests/run/t5171.scala
index 3495082683ba..eb8029df8099 100644
--- a/tests/run/t5171.scala
+++ b/tests/run/t5171.scala
@@ -2,6 +2,6 @@ abstract sealed class ArgNumber
 case object IsList extends ArgNumber
 case object ArgNumber
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(IsList)
 }
diff --git a/tests/run/t5201.scala b/tests/run/t5201.scala
index 70ab6e9ae816..48aa7ba54cae 100644
--- a/tests/run/t5201.scala
+++ b/tests/run/t5201.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // First make sure specific types are preserved
   val tmp: Vector[Int] = Vector(Vector(1,2), Vector(3,4)).view.flatten.force
 
diff --git a/tests/run/t5328.scala b/tests/run/t5328.scala
index 74c8ace89c52..12adf45b84fc 100644
--- a/tests/run/t5328.scala
+++ b/tests/run/t5328.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(Vector(1).view.updated(0,2).toList mkString ",")
   println(Seq(1,2,3).view.updated(2,8).toList mkString ",")
   println(List(1,2,3).view.updated(1,8).toList mkString ",")
diff --git a/tests/run/t5375.scala b/tests/run/t5375.scala
index d8413c1a372d..1e75f4c071c5 100644
--- a/tests/run/t5375.scala
+++ b/tests/run/t5375.scala
@@ -9,7 +9,7 @@
     
     @DarkDimius  
 */  
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val foos = (1 to 1000).toSeq
   try
     foos.par.map(i => if (i % 37 == 0) sys.error("i div 37") else i)
diff --git a/tests/run/t5387.scala b/tests/run/t5387.scala
index dabf9e201ed5..5d62a005a9bb 100644
--- a/tests/run/t5387.scala
+++ b/tests/run/t5387.scala
@@ -2,7 +2,7 @@
  * This tests that the predicate of dropWhile is only evaluated as often as needed, see https://issues.scala-lang.org/browse/SI-5387
  */
 import scala.collection.immutable.ListMap
-object Test extends dotty.runtime.LegacyApp{
+object Test extends App{
   val subject = ListMap(1->1,2->2,3->3,4->4,5->5)
   val result  = ListMap(3->3,4->4,5->5)
   assert( result == subject.dropWhile{
diff --git a/tests/run/t5394.scala b/tests/run/t5394.scala
index 5f649ee0a53a..12bae597c4de 100644
--- a/tests/run/t5394.scala
+++ b/tests/run/t5394.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def f[T](l: List[T]): Int = l match { case x :: xs => f(xs) case Nil => 0 }
   f(List.fill(10000)(0))
 }
diff --git a/tests/run/t5407.scala b/tests/run/t5407.scala
index cc761e5c008c..f86e04e6f295 100644
--- a/tests/run/t5407.scala
+++ b/tests/run/t5407.scala
@@ -1,6 +1,6 @@
 case class Foo(private val x: Int, y: Option[Int], z: Boolean)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(x: Foo) = x match {
     case Foo(x, Some(y), z) => y
     case Foo(x, y, z) => 0
diff --git a/tests/run/t5530.scala b/tests/run/t5530.scala
index 7975abca1c66..5fc0df54f500 100644
--- a/tests/run/t5530.scala
+++ b/tests/run/t5530.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(s"""something like this
    ${3+4} now works!.""")
 }
diff --git a/tests/run/t5532.scala b/tests/run/t5532.scala
index 6304ec644101..ab51fb31957d 100644
--- a/tests/run/t5532.scala
+++ b/tests/run/t5532.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = s"1"
   val y = s"2"
 }
diff --git a/tests/run/t5610a.scala b/tests/run/t5610a.scala
index 3787c098455d..0917dba2d6da 100644
--- a/tests/run/t5610a.scala
+++ b/tests/run/t5610a.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class Result(_str: => String) {
     lazy val str = _str
   }
diff --git a/tests/run/t5614.scala b/tests/run/t5614.scala
index c3410f28b7bb..7c85c33f12df 100644
--- a/tests/run/t5614.scala
+++ b/tests/run/t5614.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val str = s"a\nb"
   println(str.length)
   println(str)
diff --git a/tests/run/t5629b.scala b/tests/run/t5629b.scala
index 9cee1889316e..5d402201aeea 100644
--- a/tests/run/t5629b.scala
+++ b/tests/run/t5629b.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   trait MyPF[@specialized(Int) -A] extends (A => Unit) {
     def isDefinedAt(x: A): Boolean
diff --git a/tests/run/t5680.scala b/tests/run/t5680.scala
index 7f4252839871..52449849c1c4 100644
--- a/tests/run/t5680.scala
+++ b/tests/run/t5680.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = Array[Unit]((), ())
   println(x.toString.substring(0, x.toString.indexOf(";")))
   println(x(0))
diff --git a/tests/run/t5688.scala b/tests/run/t5688.scala
index ebbba0d66957..266d364ae473 100644
--- a/tests/run/t5688.scala
+++ b/tests/run/t5688.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   trait T
 
   trait TA
diff --git a/tests/run/t5733.scala b/tests/run/t5733.scala
index a9e58d77e637..df691cbb6bd1 100644
--- a/tests/run/t5733.scala
+++ b/tests/run/t5733.scala
@@ -16,7 +16,7 @@ class B extends Dynamic {
   def updateDynamic(method:String)(v:String): Unit = { b = v }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert( A.foo == "a" )
   assert( A.bar == "a" )
   A.aaa = "aaa"
diff --git a/tests/run/t5830.scala b/tests/run/t5830.scala
index e0cf802aa753..356243481bbe 100644
--- a/tests/run/t5830.scala
+++ b/tests/run/t5830.scala
@@ -1,6 +1,6 @@
 import scala.annotation.switch
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def noSwitch(ch: Char, eof: Boolean) = ch match {
     case 'a' if eof => println("a with oef") // then branch
   }
diff --git a/tests/run/t5856.scala b/tests/run/t5856.scala
index e4e0e3f58f24..e300b8540664 100644
--- a/tests/run/t5856.scala
+++ b/tests/run/t5856.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   override def toString = "Test"
 
   assert(s"$this" == "Test")
diff --git a/tests/run/t5923c.scala b/tests/run/t5923c.scala
index 5f3384638a1a..f15602ae04d3 100644
--- a/tests/run/t5923c.scala
+++ b/tests/run/t5923c.scala
@@ -1,4 +1,4 @@
 // see neg/macro-blackbox-fundep-materialization and run/macro-whitebox-fundep-materialization
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // do nothing
 }
diff --git a/tests/run/t5937.scala b/tests/run/t5937.scala
index 8176d5438ea7..9ec4ff12d36c 100644
--- a/tests/run/t5937.scala
+++ b/tests/run/t5937.scala
@@ -5,7 +5,7 @@ import collection._
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val list: List[Int] = (immutable.Vector(1, 2, 3) :+ 4)(breakOut)
 
diff --git a/tests/run/t5974.scala b/tests/run/t5974.scala
index e4e64c51e3b4..5b99e9f72155 100644
--- a/tests/run/t5974.scala
+++ b/tests/run/t5974.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.collection.JavaConverters._
 
   def ser(a: AnyRef) =
diff --git a/tests/run/t6011b.scala b/tests/run/t6011b.scala
index d99bf46fcdd9..9d15bd664cfc 100644
--- a/tests/run/t6011b.scala
+++ b/tests/run/t6011b.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   var cond = true
 
   // should not generate a switch
diff --git a/tests/run/t6011c.scala b/tests/run/t6011c.scala
index 8050c27a48e2..96a685b9cfd4 100644
--- a/tests/run/t6011c.scala
+++ b/tests/run/t6011c.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // A variation of SI-6011, which eluded the fix
   // in 2.10.0.
   //
diff --git a/tests/run/t6052.scala b/tests/run/t6052.scala
index e740f00e16d0..fc70d396247e 100644
--- a/tests/run/t6052.scala
+++ b/tests/run/t6052.scala
@@ -5,7 +5,7 @@
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def seqarr(i: Int) = Array[Int]() ++ (0 until i)
   def pararr(i: Int) = seqarr(i).par
 
diff --git a/tests/run/t6064.scala b/tests/run/t6064.scala
index 319ad1ae2f5c..1835999708c8 100644
--- a/tests/run/t6064.scala
+++ b/tests/run/t6064.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert(Option(42) contains 42)
   assert(Some(42) contains 42)
   assert(Option(BigInt(42)) contains 42)
diff --git a/tests/run/t6070.scala b/tests/run/t6070.scala
index 828386d139c6..7acd2573d667 100644
--- a/tests/run/t6070.scala
+++ b/tests/run/t6070.scala
@@ -20,7 +20,7 @@ class IntBomb extends Bomb {
 
 case class Mean(var bomb: Bomb)
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(x: Mean) = x match {
     case Mean(b) =>
       // BUG: b is assumed to be a stable identifier, but it can actually be mutated
diff --git a/tests/run/t6077_patmat_cse_irrefutable.scala b/tests/run/t6077_patmat_cse_irrefutable.scala
index ef8c3dc59ddd..18db6c13ef20 100644
--- a/tests/run/t6077_patmat_cse_irrefutable.scala
+++ b/tests/run/t6077_patmat_cse_irrefutable.scala
@@ -5,7 +5,7 @@ object LiteralNode {
   def unapply(n: LiteralNode) = Some(n.value)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   ((new LiteralNode(false)): Any) match {
     case LiteralNode(true)  => println("uh-oh")
     case LiteralNode(false) => println("ok")
diff --git a/tests/run/t6111.scala b/tests/run/t6111.scala
index 2fa6c55a109b..18a97d927de3 100644
--- a/tests/run/t6111.scala
+++ b/tests/run/t6111.scala
@@ -17,7 +17,7 @@ object FooHasType {
 // resurrected from neg/t997
 object Foo997 { def unapply(x : String): Option[(String, String)] = Some((x, x)) }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = 8
   println(x match {
     case Foo(p) => p // p should be a pair of Int
diff --git a/tests/run/t6114.scala b/tests/run/t6114.scala
index f5725625009d..8ad02d5bb2e5 100644
--- a/tests/run/t6114.scala
+++ b/tests/run/t6114.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def testList = {
     val list = new java.util.ArrayList[Int]
     list.add(1)
diff --git a/tests/run/t6168/main.scala b/tests/run/t6168/main.scala
index ed0c91fd76dc..c7ad37830bb2 100644
--- a/tests/run/t6168/main.scala
+++ b/tests/run/t6168/main.scala
@@ -1,6 +1,6 @@
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   JavaTest.main(null)
 
   var a1 : SomeClass = new SomeClass
diff --git a/tests/run/t6168b/main.scala b/tests/run/t6168b/main.scala
index b8871ba1a83d..187e9fe85e39 100644
--- a/tests/run/t6168b/main.scala
+++ b/tests/run/t6168b/main.scala
@@ -1,6 +1,6 @@
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   JavaTest.main(null)
 
   var a1 : SomeClass = new SomeClass
diff --git a/tests/run/t6196.scala b/tests/run/t6196.scala
index 9ded3b9c0c48..19ac41193cb2 100644
--- a/tests/run/t6196.scala
+++ b/tests/run/t6196.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.HashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   case class Collision(value: Int) extends Ordered[Collision] {
     def compare(that:Collision) = value compare that.value
diff --git a/tests/run/t6197.scala b/tests/run/t6197.scala
index f4f77594e939..5ab4b002d7ab 100644
--- a/tests/run/t6197.scala
+++ b/tests/run/t6197.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   // test that a HashTrieSet with one leaf element is not created!
   val x = HashSet.empty + 1 + 2
diff --git a/tests/run/t6198.scala b/tests/run/t6198.scala
index d893b9568163..5aa8f1c1cfd1 100644
--- a/tests/run/t6198.scala
+++ b/tests/run/t6198.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // test that ListSet.tail does not use a builder
   // we can't test for O(1) behavior, so the best we can do is to
   // check that ls.tail always returns the same instance
diff --git a/tests/run/t6200.scala b/tests/run/t6200.scala
index af348f56326c..fd96b3ab5f14 100644
--- a/tests/run/t6200.scala
+++ b/tests/run/t6200.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.HashMap
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   case class Collision(value: Int) extends Ordered[Collision] {
     def compare(that: Collision) = value compare that.value
diff --git a/tests/run/t6220.scala b/tests/run/t6220.scala
index 31af61ddcc7f..85995e1ef213 100644
--- a/tests/run/t6220.scala
+++ b/tests/run/t6220.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   // finds an int x such that improved(x) differs in the first bit to improved(0),
   // which is the worst case for the HashTrieSet
diff --git a/tests/run/t6246.scala b/tests/run/t6246.scala
index 179ef8690e2f..ef49a517c43f 100644
--- a/tests/run/t6246.scala
+++ b/tests/run/t6246.scala
@@ -1,7 +1,7 @@
 import scala.reflect.{ClassTag, classTag}
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def testValueClass(tag: ClassTag[_]): Unit = {
     println(s"runtimeClass = ${tag.runtimeClass}, toString = ${tag.toString}")
     println(tag <:< tag)
diff --git a/tests/run/t6261.scala b/tests/run/t6261.scala
index 580f4009a850..92193b8798c5 100644
--- a/tests/run/t6261.scala
+++ b/tests/run/t6261.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def test1(): Unit = {
     // test that a HashTrieMap with one leaf element is not created!
diff --git a/tests/run/t6271.scala b/tests/run/t6271.scala
index e8047a9be7f2..8ebf7ad8b502 100644
--- a/tests/run/t6271.scala
+++ b/tests/run/t6271.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def filterIssue = {
     val viewed : Iterable[Iterable[Int]] = List(List(0).view).view
     val filtered = viewed flatMap { x => List( x filter (_ > 0) ) }
diff --git a/tests/run/t6333.scala b/tests/run/t6333.scala
index 0c8986c9e8e2..266d95ce69c4 100644
--- a/tests/run/t6333.scala
+++ b/tests/run/t6333.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import util.Try
 
   val a = "apple"
diff --git a/tests/run/t6353.scala b/tests/run/t6353.scala
index 7077eaedae59..112241a3c440 100644
--- a/tests/run/t6353.scala
+++ b/tests/run/t6353.scala
@@ -1,6 +1,6 @@
 import language.dynamics
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = new X(3)
   val y = x(9)
   class X(i: Int) extends Dynamic {
diff --git a/tests/run/t6406-regextract.scala b/tests/run/t6406-regextract.scala
index 26d0baedcd2b..83679a516749 100644
--- a/tests/run/t6406-regextract.scala
+++ b/tests/run/t6406-regextract.scala
@@ -1,5 +1,5 @@
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import util.matching._
   import Regex._
 
diff --git a/tests/run/t6410.scala b/tests/run/t6410.scala
index 0855ffecdb2e..7d25c248500d 100644
--- a/tests/run/t6410.scala
+++ b/tests/run/t6410.scala
@@ -1,7 +1,7 @@
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = collection.parallel.mutable.ParArray.range(1,10) groupBy { _ % 2 } mapValues { _.size }
   println(x)
   val y = collection.parallel.immutable.ParVector.range(1,10) groupBy { _ % 2 } mapValues { _.size }
diff --git a/tests/run/t6443b.scala b/tests/run/t6443b.scala
index 7633bedfc3fc..9320b1dcfe2f 100644
--- a/tests/run/t6443b.scala
+++ b/tests/run/t6443b.scala
@@ -11,6 +11,6 @@ object B extends A {
   def foo(d: D)(d2: d.type): Unit = () // Bridge method required here!
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new B.D().bar
 }
diff --git a/tests/run/t6467.scala b/tests/run/t6467.scala
index e02fb166993e..0ee8699d6475 100644
--- a/tests/run/t6467.scala
+++ b/tests/run/t6467.scala
@@ -6,7 +6,7 @@ import collection._
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def compare(s1: String, s2: String): Unit = {
     assert(s1 == s2, s1 + "\nvs.\n" + s2)
diff --git a/tests/run/t6500.scala b/tests/run/t6500.scala
index 8df00592b524..03a68a3a24b3 100644
--- a/tests/run/t6500.scala
+++ b/tests/run/t6500.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class Box(val value: Int) extends AnyVal
 
   trait Foo {
diff --git a/tests/run/t6541.scala b/tests/run/t6541.scala
index f03a752172cc..f1271436917d 100644
--- a/tests/run/t6541.scala
+++ b/tests/run/t6541.scala
@@ -6,7 +6,7 @@ case class D(a: A, b: B[_]*)
 
 case class E(c: Class[_])
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def f1(c: C) = c match {
     case C(a, b) => ()
   }
diff --git a/tests/run/t6574b.scala b/tests/run/t6574b.scala
index 56f952074f29..df329a31cac9 100644
--- a/tests/run/t6574b.scala
+++ b/tests/run/t6574b.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   implicit class AnyOps(val i: Int) extends AnyVal {
     private def parentsOf(x: Int): List[Int] = if (x == 0) Nil else x :: parentsOf(x - 1)
     def parents: List[Int] = parentsOf(i)
diff --git a/tests/run/t6611.scala b/tests/run/t6611.scala
index b8c1da8785d0..c295368aeae3 100644
--- a/tests/run/t6611.scala
+++ b/tests/run/t6611.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   locally {
     val a = Array("1")
     val a2 = Array(a: _*)
diff --git a/tests/run/t6614.scala b/tests/run/t6614.scala
index b3044c9f0d80..3ad9f36fc471 100644
--- a/tests/run/t6614.scala
+++ b/tests/run/t6614.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	import scala.collection.mutable.ArrayStack
 
 	println((for (i <- 0 to 10) yield {
diff --git a/tests/run/t6632.scala b/tests/run/t6632.scala
index a7a01094fe06..58c52ec42562 100644
--- a/tests/run/t6632.scala
+++ b/tests/run/t6632.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import collection.mutable.ListBuffer
 
   def newLB = ListBuffer(Symbol("a"), Symbol("b"), Symbol("c"), Symbol("d"), Symbol("e"))
diff --git a/tests/run/t6633.scala b/tests/run/t6633.scala
index d78bf9ac6aed..51ceeef7faa5 100644
--- a/tests/run/t6633.scala
+++ b/tests/run/t6633.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import collection.mutable.ListBuffer
 
   def newLB = ListBuffer(Symbol("a"), Symbol("b"), Symbol("c"), Symbol("d"), Symbol("e"))
diff --git a/tests/run/t6634.scala b/tests/run/t6634.scala
index 792f76ec2f54..38882e9e1852 100644
--- a/tests/run/t6634.scala
+++ b/tests/run/t6634.scala
@@ -1,6 +1,6 @@
 import collection.mutable.ListBuffer
 
-//object Test extends dotty.runtime.LegacyApp {
+//object Test extends App {
 object Test extends App {
   def newLB = ListBuffer(Symbol("a"), Symbol("b"), Symbol("c"), Symbol("d"), Symbol("e"))
 
diff --git a/tests/run/t6637.scala b/tests/run/t6637.scala
index 052e7f5d6405..e5cc370c15c9 100644
--- a/tests/run/t6637.scala
+++ b/tests/run/t6637.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   try {
     List().head
   } catch {
diff --git a/tests/run/t6644.scala b/tests/run/t6644.scala
index 5a9850290891..b8b36f957c43 100644
--- a/tests/run/t6644.scala
+++ b/tests/run/t6644.scala
@@ -2,7 +2,7 @@ class Testable(val c: String) extends AnyVal {
   def matching(cases: Boolean*) = cases contains true
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert(new Testable("").matching(true, false))
 }
 
diff --git a/tests/run/t6663.scala b/tests/run/t6663.scala
index bfe464ad6323..6818d286d9b1 100644
--- a/tests/run/t6663.scala
+++ b/tests/run/t6663.scala
@@ -5,7 +5,7 @@ class C(v: Any) extends Dynamic {
   def applyDynamic[T](n: String)(): Option[T] = Option(v.asInstanceOf[T])
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // this should be converted to
   // C(42).selectDynamic[Int]("foo").get
   // but, before fixing SI-6663, became
diff --git a/tests/run/t6673.scala b/tests/run/t6673.scala
index 9baaed4a6fd9..a4ae4e652288 100644
--- a/tests/run/t6673.scala
+++ b/tests/run/t6673.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(f: String => Array[String])(s: String) = f(s)
   val test = foo(Array(_)) _
   println(test("x").toList)
diff --git a/tests/run/t6793.scala b/tests/run/t6793.scala
index 3d8492c10469..0b1f1619af56 100644
--- a/tests/run/t6793.scala
+++ b/tests/run/t6793.scala
@@ -1,7 +1,7 @@
 package a { class C1(private[a] val v0: String) }
 package b { class C2(v1: String) extends a.C1(v1) { def foo = v1 } }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new b.C2("x")
 
   val c2Fields = classOf[b.C2].getDeclaredFields
diff --git a/tests/run/t6888.scala b/tests/run/t6888.scala
index af69c6063d29..d339f840c86f 100644
--- a/tests/run/t6888.scala
+++ b/tests/run/t6888.scala
@@ -11,7 +11,7 @@ class C {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = new C()
   println(c.`$`.y)
   println(c.`$`.abc$.xy)
diff --git a/tests/run/t7120b.scala b/tests/run/t7120b.scala
index e5b546a90e07..0be4eb70a779 100644
--- a/tests/run/t7120b.scala
+++ b/tests/run/t7120b.scala
@@ -17,7 +17,7 @@ class CHK extends BaseHK[BaseHK.Id, String] {
 }
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = new C
   val d = new c.D()
   val meth = d.getClass.getMethods.find(_.getName == "foo").get
diff --git a/tests/run/t7171.scala b/tests/run/t7171.scala
index e7b7a7f1b03b..e0a1192228c4 100644
--- a/tests/run/t7171.scala
+++ b/tests/run/t7171.scala
@@ -10,7 +10,7 @@ trait T {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val t1 = new T {}
   val t2 = new T {}
   val a1 = new t1.A()
diff --git a/tests/run/t7181.scala b/tests/run/t7181.scala
index a06f22bf4f5b..dc03d299a4d3 100644
--- a/tests/run/t7181.scala
+++ b/tests/run/t7181.scala
@@ -15,7 +15,7 @@ case object ExceptionUncaughtException extends Action
 case class UncaughtException(action: Action) extends RuntimeException
 case class CaughtException(action: Action) extends RuntimeException
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def test(action: Action, expectException: Boolean = false): Unit = {
     var gotException = false
     val result = try
diff --git a/tests/run/t7200.scala b/tests/run/t7200.scala
index 8f33d016fefd..ba342df14dff 100644
--- a/tests/run/t7200.scala
+++ b/tests/run/t7200.scala
@@ -1,6 +1,6 @@
 import language.higherKinds
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   // Slice of comonad is where this came up
   trait Foo[F[_]] {
diff --git a/tests/run/t7214.scala b/tests/run/t7214.scala
index d73fe6dd5f8f..15c2c24fa0b0 100644
--- a/tests/run/t7214.scala
+++ b/tests/run/t7214.scala
@@ -51,7 +51,7 @@ class C {
   class T
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new Crash
 }
 
diff --git a/tests/run/t7215.scala b/tests/run/t7215.scala
index 7bc48de1f968..c93e97f9c89d 100644
--- a/tests/run/t7215.scala
+++ b/tests/run/t7215.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   List[List[Any]]().transpose.isEmpty
   Array[Array[Any]]().transpose.isEmpty
   Vector[Vector[Any]]().transpose.isEmpty
diff --git a/tests/run/t7223.scala b/tests/run/t7223.scala
index 087667dc70a7..a707e957dffb 100644
--- a/tests/run/t7223.scala
+++ b/tests/run/t7223.scala
@@ -6,6 +6,6 @@ object Crash extends D(() => {
   (x: Int) => {() => { new { println(x.toString) } }}
 })
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Crash
 }
diff --git a/tests/run/t7231.scala b/tests/run/t7231.scala
index 63ed16097348..d8f9fdf6f15d 100644
--- a/tests/run/t7231.scala
+++ b/tests/run/t7231.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
    val bar: Null = null
 
    def foo(x: Array[Int]) = x
diff --git a/tests/run/t7242.scala b/tests/run/t7242.scala
index 318a3b0ed51e..1d655d81591d 100644
--- a/tests/run/t7242.scala
+++ b/tests/run/t7242.scala
@@ -48,7 +48,7 @@ class CrashTest3 {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   {
     val c = new CrashTest
     c.CrashTestTable
diff --git a/tests/run/t7249.scala b/tests/run/t7249.scala
index 6858fce1c043..375df5c3ad99 100644
--- a/tests/run/t7249.scala
+++ b/tests/run/t7249.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def bnToLambda(s: => String): () => String = () => s
   var x: () => String = () => sys.error("Nope")
   val y = bnToLambda { x() }
diff --git a/tests/run/t7269.scala b/tests/run/t7269.scala
index d6e11f4f7c1e..d22e57dfee86 100644
--- a/tests/run/t7269.scala
+++ b/tests/run/t7269.scala
@@ -1,7 +1,7 @@
 import scala.collection.JavaConversions._
 import scala.collection.mutable
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def testMap(): Unit = {
     val mapJ = new java.util.HashMap[Int, String]
diff --git a/tests/run/t7300.scala b/tests/run/t7300.scala
index 010eacc8867c..ec841690df3b 100644
--- a/tests/run/t7300.scala
+++ b/tests/run/t7300.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // single line comment in multi line comment
   /*//*/ val x = 1 */*/
   val x = 2
diff --git a/tests/run/t7326.scala b/tests/run/t7326.scala
index 3d6a711e510a..ce3fa122aaa4 100644
--- a/tests/run/t7326.scala
+++ b/tests/run/t7326.scala
@@ -1,7 +1,7 @@
 import scala.collection.immutable.ListSet
 import scala.collection.immutable.HashSet
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   def testCorrectness(): Unit = {
     // a key that has many hashCode collisions
diff --git a/tests/run/t7341.scala b/tests/run/t7341.scala
index 812b316f9c94..cd177d7f7a4a 100755
--- a/tests/run/t7341.scala
+++ b/tests/run/t7341.scala
@@ -10,6 +10,6 @@ object Obj {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Obj()
 }
diff --git a/tests/run/t7445.scala b/tests/run/t7445.scala
index 25fc5d3885ce..e4ffeb8e1a89 100644
--- a/tests/run/t7445.scala
+++ b/tests/run/t7445.scala
@@ -1,6 +1,6 @@
 import scala.collection.immutable.ListMap
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 	val a = ListMap(1 -> 1, 2 -> 2, 3 -> 3, 4 -> 4, 5 -> 5);
 	require(a.tail == ListMap(2 -> 2, 3 -> 3, 4 -> 4, 5 -> 5));
 }
diff --git a/tests/run/t7498.scala b/tests/run/t7498.scala
index cab598405766..1dbf0597e0b9 100644
--- a/tests/run/t7498.scala
+++ b/tests/run/t7498.scala
@@ -5,7 +5,7 @@
 
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import scala.collection.concurrent.TrieMap
 
   class Collision(val idx: Int) {
diff --git a/tests/run/t7571.scala b/tests/run/t7571.scala
index fd4babee34ef..00b9695168a3 100644
--- a/tests/run/t7571.scala
+++ b/tests/run/t7571.scala
@@ -4,7 +4,7 @@ class Foo(val a: Int) extends AnyVal {
   def bar = (new {}).toString
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x = new Foo(1).foo.apply(2)
   assert(x == 3, x)
   val s = new Foo(1).bar
diff --git a/tests/run/t7584.scala b/tests/run/t7584.scala
index f134b04a5ead..6d7f4f7ebbab 100644
--- a/tests/run/t7584.scala
+++ b/tests/run/t7584.scala
@@ -3,7 +3,7 @@
 //
 // We did flush out a spurious "pure expression does nothing in statement position"
 // warning, hence -Xfatal-warnings in the flags file.
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def foo(f: (=> Int, => Int) => Unit) = f({println("a"); 0}, {println("b"); 1})
   println("no calls")
   foo((a, b) => ())
diff --git a/tests/run/t7584b.scala b/tests/run/t7584b.scala
index bf7afdc0bbda..fd560f0418fc 100644
--- a/tests/run/t7584b.scala
+++ b/tests/run/t7584b.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def fold[A, B](f: (A, => B) => B) = (b: B) => f(null.asInstanceOf[A], b)
   def f[A, B](x: A, y: B): B = y
   def bip[A, B] = fold[A, B]((x, y) => f(x, y))
diff --git a/tests/run/t7880.scala b/tests/run/t7880.scala
index 7e57a34210df..c69663b13ea1 100644
--- a/tests/run/t7880.scala
+++ b/tests/run/t7880.scala
@@ -1,5 +1,5 @@
 // Do "git log" on this file to know why it's been moved to pending
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // This should terminate in one way or another, but it shouldn't loop forever.
   try {
     val buffer = collection.mutable.ArrayBuffer.fill(Int.MaxValue / 2 + 1)(0)
diff --git a/tests/run/t7899.scala b/tests/run/t7899.scala
index 2720cb89cef3..5879d4b9fef5 100644
--- a/tests/run/t7899.scala
+++ b/tests/run/t7899.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def id[A](a: => A): A = null.asInstanceOf[A]
   def foo(f: (=> Int) => Int) = () => f(???)
   foo(id)() // should be allowed and not throw ???
diff --git a/tests/run/t7985.scala b/tests/run/t7985.scala
index 3d8a9d51c5c3..5fe270f9c00e 100644
--- a/tests/run/t7985.scala
+++ b/tests/run/t7985.scala
@@ -1,3 +1,3 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Array(1) match { case _: Array[scala.Int] => }
 }
diff --git a/tests/run/t7985b.scala b/tests/run/t7985b.scala
index ea7a255db1c8..aaf649eb2862 100644
--- a/tests/run/t7985b.scala
+++ b/tests/run/t7985b.scala
@@ -1,5 +1,5 @@
 class a { type X = Int }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Array(1) match { case _: Array[a#X] => }
 }
diff --git a/tests/run/t8002.scala b/tests/run/t8002.scala
index c27e83a46010..f24a213dea52 100644
--- a/tests/run/t8002.scala
+++ b/tests/run/t8002.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val a: Any = {
     class A private () { private def x = 0; A.y };
     object A {
diff --git a/tests/run/t8010.scala b/tests/run/t8010.scala
index 5ec716373d5c..cc3a89a40d70 100644
--- a/tests/run/t8010.scala
+++ b/tests/run/t8010.scala
@@ -12,7 +12,7 @@ trait Derived extends Base {
   override def bt(n: Int) = 1 + super.bt(n)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val d = new Derived {}
   // not the focus of thie bug, but let's just check the runtime behaviour while we're here.
   assert(d.t == 2)
diff --git a/tests/run/t8015-ffc.scala b/tests/run/t8015-ffc.scala
index 6a4b53dee77e..449faa5bb0f0 100644
--- a/tests/run/t8015-ffc.scala
+++ b/tests/run/t8015-ffc.scala
@@ -1,5 +1,5 @@
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val ms = """This is a long multiline string
   with \u000d\u000a CRLF embedded."""
   assert(ms.linesIterator.size == 3, s"lines.size ${ms.linesIterator.size}")
diff --git a/tests/run/t8087.scala b/tests/run/t8087.scala
index 7306039c6509..6047211756ab 100644
--- a/tests/run/t8087.scala
+++ b/tests/run/t8087.scala
@@ -5,7 +5,7 @@ trait Foo {
 
 class Bar extends Foo
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   classOf[Bar].getDeclaredFields.foreach(f => {
     assert(java.lang.reflect.Modifier.isVolatile(f.getModifiers), f.getName)
   })
diff --git a/tests/run/t8177f.scala b/tests/run/t8177f.scala
index 6f9a68c11b75..f50a5d98d649 100644
--- a/tests/run/t8177f.scala
+++ b/tests/run/t8177f.scala
@@ -14,7 +14,7 @@ class B extends A[Int](null) {
 }
 
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val methods = classOf[B].getDeclaredMethods.sortBy(_.getName)
   assert(methods.forall(_.toGenericString.startsWith("public int")))
 }
diff --git a/tests/run/t8197.scala b/tests/run/t8197.scala
index b510f96f1b38..27212cbbd3c2 100644
--- a/tests/run/t8197.scala
+++ b/tests/run/t8197.scala
@@ -8,7 +8,7 @@ class Foo(val x: A = null) {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // both constructors of `Foo` are applicable. Overloading resolution
   // will eliminate the alternative that uses a default argument, therefore
   // the vararg constructor is chosen.
diff --git a/tests/run/t8197b.scala b/tests/run/t8197b.scala
index a9012ddf9de4..8b3e0af0dbe3 100644
--- a/tests/run/t8197b.scala
+++ b/tests/run/t8197b.scala
@@ -3,6 +3,6 @@ object O {
   def foo(s: String)(implicit i: DummyImplicit = null) = 1
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert(O.foo("") == 1)
 }
diff --git a/tests/run/t8346.scala b/tests/run/t8346.scala
index 1c34ab35f749..5f3df841749d 100644
--- a/tests/run/t8346.scala
+++ b/tests/run/t8346.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import reflect.ClassTag
 
   object SomeEnum extends Enumeration {
diff --git a/tests/run/t8428.scala b/tests/run/t8428.scala
index d79a698d4ca8..7da1207b7b6a 100644
--- a/tests/run/t8428.scala
+++ b/tests/run/t8428.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val xs = List.tabulate(4)(List(_))
   val i = xs.map(_.iterator).reduce { (a,b) =>
     a.hasNext
diff --git a/tests/run/t8601e/Test.scala b/tests/run/t8601e/Test.scala
index efeaafb15f4f..838114f6a7eb 100644
--- a/tests/run/t8601e/Test.scala
+++ b/tests/run/t8601e/Test.scala
@@ -2,7 +2,7 @@ class C {
   def foo: Unit = {StaticInit.fld}
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   try {
     new C().foo
     sys.error("StaticInit.<clinit> was not run!")
diff --git a/tests/run/t8610.scala b/tests/run/t8610.scala
index 978900d42d09..dd9e8e861e71 100644
--- a/tests/run/t8610.scala
+++ b/tests/run/t8610.scala
@@ -7,7 +7,7 @@ case class X(name: String) {
   def u: Unit = ()      // unitarian universalist
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // poignant demonstration
   Console println X("Bob").x
 }
diff --git a/tests/run/t8611a.scala b/tests/run/t8611a.scala
index 4a0d6fb57cb2..99304df762f9 100644
--- a/tests/run/t8611a.scala
+++ b/tests/run/t8611a.scala
@@ -7,7 +7,7 @@ object O {
   val B: LK = new K with L
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val scrut: O.LK = O.B
   scrut match {
     case O.A => ???
diff --git a/tests/run/t8611b.scala b/tests/run/t8611b.scala
index 75114c2ae39d..cb37f0e0751f 100644
--- a/tests/run/t8611b.scala
+++ b/tests/run/t8611b.scala
@@ -30,7 +30,7 @@ object WorkingTab extends WorkingEnum {
   val b = Enum("B")
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   testGris()
   testWorking()
 
diff --git a/tests/run/t8611c.scala b/tests/run/t8611c.scala
index 325070f4ca6a..2bd17f29a559 100644
--- a/tests/run/t8611c.scala
+++ b/tests/run/t8611c.scala
@@ -5,7 +5,7 @@ object O {
   type LK = K with L
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   local
 
   def local = {
diff --git a/tests/run/t8680.scala b/tests/run/t8680.scala
index 3c4bc8e7dc25..2bce09c507b9 100644
--- a/tests/run/t8680.scala
+++ b/tests/run/t8680.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def pre(n: Int) = (-n to -1).toStream
 
   def cyc(m: Int) = {
diff --git a/tests/run/t8690.scala b/tests/run/t8690.scala
index cfa47b0e48fa..ab8b45b2a76f 100644
--- a/tests/run/t8690.scala
+++ b/tests/run/t8690.scala
@@ -1,7 +1,7 @@
 import scala.io.Source
 import java.io.ByteArrayInputStream
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val txt = "abcdef"
 
   val in = new ByteArrayInputStream(txt.getBytes());
diff --git a/tests/run/t8823.scala b/tests/run/t8823.scala
index 06e3bff69dd1..0ac653566a41 100644
--- a/tests/run/t8823.scala
+++ b/tests/run/t8823.scala
@@ -4,7 +4,7 @@ class Tuple2Int(val encoding: Long) extends AnyVal with Product2[Int, Int] {
   def _2: Int = 2
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   assert(new Tuple2Int(0)._1 == 1)
   assert(new Tuple2Int(0)._2 == 2)
 }
diff --git a/tests/run/t8845.scala b/tests/run/t8845.scala
index bb68142e568d..8ccdbdadc75c 100644
--- a/tests/run/t8845.scala
+++ b/tests/run/t8845.scala
@@ -12,6 +12,6 @@ object Interpreter {
     finally { }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Interpreter.break(0)
 }
diff --git a/tests/run/t8888.scala b/tests/run/t8888.scala
index 0ddc2ae82578..36cc1ddf3ef9 100644
--- a/tests/run/t8888.scala
+++ b/tests/run/t8888.scala
@@ -7,6 +7,6 @@ class C {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   new C().resume
 }
diff --git a/tests/run/t889.scala b/tests/run/t889.scala
index 8e5d82412813..f32048819690 100644
--- a/tests/run/t889.scala
+++ b/tests/run/t889.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val a = List("a")
 
diff --git a/tests/run/t8931.scala b/tests/run/t8931.scala
index e5e12ae8a75a..11718471bc21 100644
--- a/tests/run/t8931.scala
+++ b/tests/run/t8931.scala
@@ -5,7 +5,7 @@ trait B extends A
 
 class C extends A with B
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val c = classOf[C]
 
   println(c.getGenericInterfaces.toList)
diff --git a/tests/run/t949.scala b/tests/run/t949.scala
index 9363f60c6d58..a9c5d08c505d 100644
--- a/tests/run/t949.scala
+++ b/tests/run/t949.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
     private def f = new T { val state = State.A }
 
diff --git a/tests/run/t978.scala b/tests/run/t978.scala
index e87e7054aefd..012d57fbe797 100644
--- a/tests/run/t978.scala
+++ b/tests/run/t978.scala
@@ -8,7 +8,7 @@ class Foo(val n: Int) {
   override def toString = "" + n
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val set = new collection.mutable.HashSet[Foo]
 //  val set = new collection.jcl.HashSet[Foo]
 
diff --git a/tests/run/tcpoly_overriding.scala b/tests/run/tcpoly_overriding.scala
index 01b9c29ac80f..32174ad8bfbe 100644
--- a/tests/run/tcpoly_overriding.scala
+++ b/tests/run/tcpoly_overriding.scala
@@ -14,6 +14,6 @@ class B extends A[List] {
   def b: List[Int] = List(1)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   Console.println((new B).b(0))
 }
diff --git a/tests/run/tuples.scala b/tests/run/tuples.scala
index e3fd85dc651c..4980f2fe6975 100644
--- a/tests/run/tuples.scala
+++ b/tests/run/tuples.scala
@@ -1,6 +1,6 @@
 import Function._
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   var xyz: (Int, String, Boolean) = _
   xyz = (1, "abc", true)
   Console.println(xyz)
diff --git a/tests/run/typealias_overriding.scala b/tests/run/typealias_overriding.scala
index e19ae0bed55f..4b6a0037ec9c 100644
--- a/tests/run/typealias_overriding.scala
+++ b/tests/run/typealias_overriding.scala
@@ -1,7 +1,7 @@
 // this bug (http://scala-webapps.epfl.ch/bugtracking/bugs/displayItem.do?id=1065)
 // was caused by Uncurry not normalizing all the types
 // (more specifically the argument/return types of an anonymous Function)
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   trait AddRemove {
     type TNode <: NodeImpl;
     trait NodeImpl;
diff --git a/tests/run/unboxingBug.scala b/tests/run/unboxingBug.scala
index e3cef18b3326..5f129b64b400 100644
--- a/tests/run/unboxingBug.scala
+++ b/tests/run/unboxingBug.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(identity('a').toInt)
   println('a'.toInt)
   println(identity('a').asInstanceOf[Int])
diff --git a/tests/run/unreachable.scala b/tests/run/unreachable.scala
index 651f619fa06f..1fc43e4b866c 100644
--- a/tests/run/unreachable.scala
+++ b/tests/run/unreachable.scala
@@ -1,7 +1,7 @@
 import scala.util.Random.nextInt
 import scala.sys.error
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def unreachableNormalExit: Int = {
     return 42
     0
diff --git a/tests/run/valueclasses-classmanifest-basic.scala b/tests/run/valueclasses-classmanifest-basic.scala
index 8eab07c30873..50addda359f7 100644
--- a/tests/run/valueclasses-classmanifest-basic.scala
+++ b/tests/run/valueclasses-classmanifest-basic.scala
@@ -1,6 +1,6 @@
 class Foo(val x: Int) extends AnyVal
 
 @deprecated("Suppress warnings", since="2.11")
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(classManifest[Foo])
 }
diff --git a/tests/run/valueclasses-constr.scala b/tests/run/valueclasses-constr.scala
index 73ac29435b09..652d8d8d2246 100644
--- a/tests/run/valueclasses-constr.scala
+++ b/tests/run/valueclasses-constr.scala
@@ -58,7 +58,7 @@ package test3 {
   }
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
 
   val y1: test1.TOD = new test1.TOD(1000)
   val y2: test2.TOD = test2.Client.newTOD(1000)
diff --git a/tests/run/viewtest.scala b/tests/run/viewtest.scala
index 398e0bd04572..581958e9a6c6 100755
--- a/tests/run/viewtest.scala
+++ b/tests/run/viewtest.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   import collection._
   val xs: SeqView[(String, Int), Seq[_]] = List("x").view.zip(Stream.from(0))
   println(xs)
diff --git a/tests/run/virtpatmat_alts.scala b/tests/run/virtpatmat_alts.scala
index d76b29307d5b..d1dfa8a4a1ab 100644
--- a/tests/run/virtpatmat_alts.scala
+++ b/tests/run/virtpatmat_alts.scala
@@ -1,7 +1,7 @@
 /*
  * filter: It would fail on the following input
  */
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   (true, true) match {
     case (true, true) | (false, false) => 1
   }
diff --git a/tests/run/virtpatmat_apply.scala b/tests/run/virtpatmat_apply.scala
index 838d456cb8d5..57259d0b3f7f 100644
--- a/tests/run/virtpatmat_apply.scala
+++ b/tests/run/virtpatmat_apply.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
  List(1, 2, 3) match {
    case Nil => println("FAIL")
    case x :: y :: xs if xs.length == 2 => println("FAIL")
diff --git a/tests/run/virtpatmat_casting.scala b/tests/run/virtpatmat_casting.scala
index 81b52ee1b7d4..a36daec6fb97 100644
--- a/tests/run/virtpatmat_casting.scala
+++ b/tests/run/virtpatmat_casting.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   println(List(1,2,3) match {
     case Nil => List(0)
 // since the :: extractor's argument must be a ::, there has to be a cast before its unapply is invoked
diff --git a/tests/run/virtpatmat_literal.scala b/tests/run/virtpatmat_literal.scala
index 682e6b76599e..e94f7d627c45 100644
--- a/tests/run/virtpatmat_literal.scala
+++ b/tests/run/virtpatmat_literal.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
  val a = 1
  1 match {
    case 2 => println("FAILED")
diff --git a/tests/run/virtpatmat_opt_sharing.scala b/tests/run/virtpatmat_opt_sharing.scala
index 0a66a753b6f0..d2c42cab4804 100644
--- a/tests/run/virtpatmat_opt_sharing.scala
+++ b/tests/run/virtpatmat_opt_sharing.scala
@@ -1,7 +1,7 @@
 /*
  * filter: It would fail on the following input
  */
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   virtMatch()
   def virtMatch() = {
     List(1, 3, 4, 7) match {
diff --git a/tests/run/virtpatmat_partial_backquoted.scala b/tests/run/virtpatmat_partial_backquoted.scala
index 21f686dcf831..ed89a605f457 100644
--- a/tests/run/virtpatmat_partial_backquoted.scala
+++ b/tests/run/virtpatmat_partial_backquoted.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   class Region { override def toString = "You got me!" }
   class SymbolType
   case class SymbolInfo(tp: SymbolType, regions: List[Region], x: Any)
diff --git a/tests/run/virtpatmat_stringinterp.scala b/tests/run/virtpatmat_stringinterp.scala
index 6ce1bf9c5093..c6c951e6e5f0 100644
--- a/tests/run/virtpatmat_stringinterp.scala
+++ b/tests/run/virtpatmat_stringinterp.scala
@@ -1,7 +1,7 @@
 
 import scala.language.{ implicitConversions }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class Node(x: Int)
 
   implicit def sc2xml(sc: StringContext): XMLContext = new XMLContext(sc)
diff --git a/tests/run/virtpatmat_switch.scala b/tests/run/virtpatmat_switch.scala
index 5cdf271d5665..2f2e210d9e32 100644
--- a/tests/run/virtpatmat_switch.scala
+++ b/tests/run/virtpatmat_switch.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   def intSwitch(x: Int) = x match {
     case 0 => "zero"
     case 1 => "one"
diff --git a/tests/run/virtpatmat_tailcalls_verifyerror.scala b/tests/run/virtpatmat_tailcalls_verifyerror.scala
index 46c75cf9c860..6d33883df0a9 100644
--- a/tests/run/virtpatmat_tailcalls_verifyerror.scala
+++ b/tests/run/virtpatmat_tailcalls_verifyerror.scala
@@ -1,5 +1,5 @@
 // shouldn't result in a verify error when run...
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   @annotation.tailrec
   final def test(meh: Boolean): Boolean = {
     Some("a") match {
diff --git a/tests/run/virtpatmat_try.scala b/tests/run/virtpatmat_try.scala
index 2cd05b79966b..f417488c687c 100644
--- a/tests/run/virtpatmat_try.scala
+++ b/tests/run/virtpatmat_try.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   case class A(val x: String) extends Throwable
   class B extends Exception { override def toString = "B" }
   def bla = 0
diff --git a/tests/run/virtpatmat_typed.scala b/tests/run/virtpatmat_typed.scala
index bf12fd7a5cc5..3693a81318e7 100644
--- a/tests/run/virtpatmat_typed.scala
+++ b/tests/run/virtpatmat_typed.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
  ("foo": Any) match {
    case x: Int => println("FAILED")
    case x: String => println("OK "+ x)
diff --git a/tests/run/virtpatmat_unapply.scala b/tests/run/virtpatmat_unapply.scala
index 9915b8d924e5..76e44938b403 100644
--- a/tests/run/virtpatmat_unapply.scala
+++ b/tests/run/virtpatmat_unapply.scala
@@ -5,7 +5,7 @@ object IntList {
   def apply(x: Int, xs: IntList) = new IntList(x, xs)
 }
 
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   IntList(1, IntList(2, NilIL)) match {
     case IntList(a1, IntList(a2, IntList(a3, y))) => println(a1 + a2 + a3)
     case IntList(x, y) => println(x)
diff --git a/tests/run/virtpatmat_unapplyseq.scala b/tests/run/virtpatmat_unapplyseq.scala
index e202c8d27205..1ebbce393d1f 100644
--- a/tests/run/virtpatmat_unapplyseq.scala
+++ b/tests/run/virtpatmat_unapplyseq.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   List(1,2,3) match {
     case Seq(x, y, z) => println(x * y * z)
   }
diff --git a/tests/run/virtpatmat_valdef.scala b/tests/run/virtpatmat_valdef.scala
index b3a89afc1971..77c6adacd360 100644
--- a/tests/run/virtpatmat_valdef.scala
+++ b/tests/run/virtpatmat_valdef.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   // patterns in valdefs...
   // TODO: irrefutability should indicate we don't actually need to test, just deconstruct
   val (modified, result) : (Boolean, String) =  (true, null)
diff --git a/tests/run/weakconform.scala b/tests/run/weakconform.scala
index e13390730d40..30a12b92985d 100755
--- a/tests/run/weakconform.scala
+++ b/tests/run/weakconform.scala
@@ -1,4 +1,4 @@
-object Test extends dotty.runtime.LegacyApp {
+object Test extends App {
   val x: Float = 10/3
   assert(x == 3.0)
 }