3 files changed, 25 insertions, 19 deletions
diff --git a/test/files/run/bug4291.scala b/test/files/run/bug4291.scala
index a6dd357296..0213bb2c20 100644
--- a/test/files/run/bug4291.scala
+++ b/test/files/run/bug4291.scala
@@ -1,17 +1,19 @@
 import scala.tools.partest._
 
-object Test extends App with SigTest {
-  show[List[_]]("apply")
-  show[Option[_]]("get")
-  show[Function1[_, _]]("apply")
+object Test extends SigTest {
+  def main(args: Array[String]): Unit = {
+    show[List[_]]("apply")
+    show[Option[_]]("get")
+    show[Function1[_, _]]("apply")
 
-  for (name <- List("map", "flatMap", "filter", "head", "groupBy")) {
-    show[Traversable[_]](name)
-    show[Iterable[_]](name)
-    show[Seq[_]](name)
-    show[Set[_]](name)
-    show[Map[_,_]](name)
-    show[Vector[_]](name)
-    show[Range](name)
+    for (name <- List("map", "flatMap", "filter", "head", "groupBy")) {
+      show[Traversable[_]](name)
+      show[Iterable[_]](name)
+      show[Seq[_]](name)
+      show[Set[_]](name)
+      show[Map[_,_]](name)
+      show[Vector[_]](name)
+      show[Range](name)
+    }
   }
 }
diff --git a/test/files/run/sigtp.scala b/test/files/run/sigtp.scala
index cd38184109..3e162cfdba 100644
--- a/test/files/run/sigtp.scala
+++ b/test/files/run/sigtp.scala
@@ -9,7 +9,9 @@ final class Bug[A, B](val key: A) extends BugBase[A, Bug[A, B]] {
   def foo = next
 }
 
-object Test extends App with SigTest {
-  show[BugBase[_, _]]()
-  show[Bug[_, _]]()
+object Test extends SigTest {
+  def main(args: Array[String]): Unit = {
+    show[BugBase[_, _]]()
+    show[Bug[_, _]]()
+  }
 }
diff --git a/test/files/run/t3857.scala b/test/files/run/t3857.scala
index b33685d4f2..94f52f72fe 100644
--- a/test/files/run/t3857.scala
+++ b/test/files/run/t3857.scala
@@ -4,8 +4,10 @@ class ScalaGeneric { var s: java.util.Set[String] = _ }
 trait ScalaGeneric2Trait { var s: java.util.Set[String] = _ }
 class ScalaGeneric2 extends ScalaGeneric2Trait { }
 
-object Test extends App with SigTest {
-  show[ScalaGeneric]()
-  show[ScalaGeneric2Trait]()
-  show[ScalaGeneric2]()
+object Test extends SigTest {
+  def main(args: Array[String]): Unit = {
+    show[ScalaGeneric]()
+    show[ScalaGeneric2Trait]()
+    show[ScalaGeneric2]()
+  }
 }