diff --git a/sbt/src/sbt-test/source-dependencies/binary/build.sbt b/sbt/src/sbt-test/source-dependencies/binary/build.sbt
index 08fb1e21d..293ebae2a 100644
--- a/sbt/src/sbt-test/source-dependencies/binary/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/binary/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion in ThisBuild := "2.11.8"
+ThisBuild / scalaVersion := "2.12.7"
 
 lazy val dep = project
 
diff --git a/sbt/src/sbt-test/source-dependencies/continuations/Foo.scala b/sbt/src/sbt-test/source-dependencies/continuations/Foo.scala
deleted file mode 100644
index 580f7175a..000000000
--- a/sbt/src/sbt-test/source-dependencies/continuations/Foo.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-trait Foo
-trait BarA
-trait BarB
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/continuations/Use.scala b/sbt/src/sbt-test/source-dependencies/continuations/Use.scala
deleted file mode 100644
index bdb848464..000000000
--- a/sbt/src/sbt-test/source-dependencies/continuations/Use.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-import scala.util.continuations._
-
-class Use {
-  val a = new Baz
-  def bar: (Foo with BarA) @cpsParam[Unit, Unit] = a.foo
-}
diff --git a/sbt/src/sbt-test/source-dependencies/continuations/build.sbt b/sbt/src/sbt-test/source-dependencies/continuations/build.sbt
deleted file mode 100644
index 34fff642b..000000000
--- a/sbt/src/sbt-test/source-dependencies/continuations/build.sbt
+++ /dev/null
@@ -1,4 +0,0 @@
-scalaVersion := "2.10.6"
-autoCompilerPlugins := true
-libraryDependencies += compilerPlugin("org.scala-lang.plugins" % "continuations" % scalaVersion.value)
-scalacOptions += "-P:continuations:enable"
diff --git a/sbt/src/sbt-test/source-dependencies/continuations/changes/Def1.scala b/sbt/src/sbt-test/source-dependencies/continuations/changes/Def1.scala
deleted file mode 100644
index 3cc76e193..000000000
--- a/sbt/src/sbt-test/source-dependencies/continuations/changes/Def1.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import scala.util.continuations._
-
-class Baz {
-  def foo = shiftUnit[Foo with BarA, Unit, Unit](null)
-}
diff --git a/sbt/src/sbt-test/source-dependencies/continuations/changes/Def2.scala b/sbt/src/sbt-test/source-dependencies/continuations/changes/Def2.scala
deleted file mode 100644
index 9a176dffb..000000000
--- a/sbt/src/sbt-test/source-dependencies/continuations/changes/Def2.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import scala.util.continuations._
-
-class Baz {
-  def foo = shiftUnit[Foo with BarB, Unit, Unit](null)
-}
diff --git a/sbt/src/sbt-test/source-dependencies/continuations/test b/sbt/src/sbt-test/source-dependencies/continuations/test
deleted file mode 100644
index 2aeb714be..000000000
--- a/sbt/src/sbt-test/source-dependencies/continuations/test
+++ /dev/null
@@ -1,10 +0,0 @@
-# Compile code with a type (Foo with BarA) @cpsParam...
-# The spec says only simple types can be annotated, but scalac allows any type.
-$ copy-file changes/Def1.scala Def.scala
-> compile
-
-# To ensure it was properly processed, change it to (Foo with BarB) @cpsParam...
-# This should invalidate Use.scala, which expects it to be BarA and so compilation should fail.
-$ delete Def.scala
-$ copy-file changes/Def2.scala Def.scala
--> compile
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/cross-source/src/main/scala-2.10/B.scala b/sbt/src/sbt-test/source-dependencies/cross-source/src/main/scala-2.12/B.scala
similarity index 100%
rename from sbt/src/sbt-test/source-dependencies/cross-source/src/main/scala-2.10/B.scala
rename to sbt/src/sbt-test/source-dependencies/cross-source/src/main/scala-2.12/B.scala
diff --git a/sbt/src/sbt-test/source-dependencies/cross-source/test b/sbt/src/sbt-test/source-dependencies/cross-source/test
index ddea251c9..63450f1a3 100644
--- a/sbt/src/sbt-test/source-dependencies/cross-source/test
+++ b/sbt/src/sbt-test/source-dependencies/cross-source/test
@@ -1,7 +1,3 @@
-# A.scala needs B.scala, it won't be in source list
-> ++2.11.4!
--> compile
-
 # A.scala needs B.scala, it would be in source list
-> ++2.10.4!
+> ++2.12.7!
 > compile
diff --git a/sbt/src/sbt-test/source-dependencies/ext/test b/sbt/src/sbt-test/source-dependencies/ext/disabled
similarity index 100%
rename from sbt/src/sbt-test/source-dependencies/ext/test
rename to sbt/src/sbt-test/source-dependencies/ext/disabled
diff --git a/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt
index 12a8459cc..b56711b96 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt
@@ -1,8 +1,9 @@
-val paradiseVersion = "2.0.1"
+ThisBuild / scalaVersion := "2.12.7"
+
+val paradiseVersion = "2.1.1"
 val commonSettings = Seq(
   version := "1.0.0",
   scalacOptions ++= Seq(""),
-  scalaVersion := "2.11.4",
   resolvers += Resolver.sonatypeRepo("snapshots"),
   resolvers += Resolver.sonatypeRepo("releases"),
   addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full)
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/test b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/disabled
similarity index 100%
rename from sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/test
rename to sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/disabled
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested-2-11/test b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested-2-11/disabled
similarity index 100%
rename from sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested-2-11/test
rename to sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested-2-11/disabled
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
index 264dd3d57..a27e93eab 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
@@ -1,5 +1,6 @@
+ThisBuild / scalaVersion := "2.12.7"
+
 val defaultSettings = Seq(
-  scalaVersion := "2.10.6",
   libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
 )
 
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/Client.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/Client.scala
index d80fd559e..76c16af24 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/Client.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/Client.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 
 object Client {
 	Provider.printTree(Provider.printTree(Foo.str))
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/Foo.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/Foo.scala
index 1908f0673..6f410fca2 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/Foo.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/Foo.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 
 object Foo {
   def str: String = "abc"
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/changes/Foo.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/changes/Foo.scala
index e3deb0f43..4f2a62b39 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/changes/Foo.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-client/changes/Foo.scala
@@ -1,3 +1,3 @@
-package macro
+package macros
 object Foo {
 }
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-provider/Provider.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-provider/Provider.scala
index facc4a468..b39b4c282 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-provider/Provider.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/macro-provider/Provider.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 import scala.language.experimental.macros
 import scala.reflect.macros._
 
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt
index 218d378cb..a27e93eab 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / scalaVersion := "2.12.7"
+
 val defaultSettings = Seq(
   libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
 )
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt
index 264dd3d57..a27e93eab 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt
@@ -1,5 +1,6 @@
+ThisBuild / scalaVersion := "2.12.7"
+
 val defaultSettings = Seq(
-  scalaVersion := "2.10.6",
   libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
 )
 
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/Client.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/Client.scala
index 94ad4bcc8..0ecbe6fce 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/Client.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/Client.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 
 object Client {
 	Provider.printTree(Foo.str)
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/Foo.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/Foo.scala
index 1908f0673..6f410fca2 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/Foo.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/Foo.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 
 object Foo {
   def str: String = "abc"
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/changes/Foo.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/changes/Foo.scala
index e3deb0f43..4f2a62b39 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/changes/Foo.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-client/changes/Foo.scala
@@ -1,3 +1,3 @@
-package macro
+package macros
 object Foo {
 }
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-provider/Provider.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-provider/Provider.scala
index facc4a468..b39b4c282 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-provider/Provider.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/macro-provider/Provider.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 import scala.language.experimental.macros
 import scala.reflect.macros._
 
diff --git a/sbt/src/sbt-test/source-dependencies/macro/build.sbt b/sbt/src/sbt-test/source-dependencies/macro/build.sbt
index 264dd3d57..a27e93eab 100644
--- a/sbt/src/sbt-test/source-dependencies/macro/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro/build.sbt
@@ -1,5 +1,6 @@
+ThisBuild / scalaVersion := "2.12.7"
+
 val defaultSettings = Seq(
-  scalaVersion := "2.10.6",
   libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
 )
 
diff --git a/sbt/src/sbt-test/source-dependencies/macro/macro-client/Client.scala b/sbt/src/sbt-test/source-dependencies/macro/macro-client/Client.scala
index 90932d136..a8ed0d193 100644
--- a/sbt/src/sbt-test/source-dependencies/macro/macro-client/Client.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro/macro-client/Client.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 
 object Client {
 	Provider.tree(0)
diff --git a/sbt/src/sbt-test/source-dependencies/macro/macro-provider/Provider.scala b/sbt/src/sbt-test/source-dependencies/macro/macro-provider/Provider.scala
index 9b6d27676..e9320d32f 100644
--- a/sbt/src/sbt-test/source-dependencies/macro/macro-provider/Provider.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro/macro-provider/Provider.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 import scala.language.experimental.macros
 import scala.reflect.macros._
 
diff --git a/sbt/src/sbt-test/source-dependencies/macro/macro-provider/changes/Provider.scala b/sbt/src/sbt-test/source-dependencies/macro/macro-provider/changes/Provider.scala
index 711989b32..4b909e42c 100644
--- a/sbt/src/sbt-test/source-dependencies/macro/macro-provider/changes/Provider.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro/macro-provider/changes/Provider.scala
@@ -1,4 +1,4 @@
-package macro
+package macros
 import scala.language.experimental.macros
 import scala.reflect.macros._