diff --git a/sbt/src/sbt-test/actions/external-doc/build.sbt b/sbt/src/sbt-test/actions/external-doc/build.sbt
index bc54fdac0..1d7e24672 100644
--- a/sbt/src/sbt-test/actions/external-doc/build.sbt
+++ b/sbt/src/sbt-test/actions/external-doc/build.sbt
@@ -21,6 +21,7 @@ val bResolver = Def.setting {
 
 val apiBaseSetting = apiURL := Some(apiBase(name.value))
 def apiBase(projectName: String) = url(s"http://example.org/${projectName}")
+def scalaLibraryBase(v: String) = url(s"http://www.scala-lang.org/api/$v/")
 def addDep(projectName: String) =
 	libraryDependencies += organization.value %% projectName % version.value
 
@@ -33,6 +34,7 @@ def expectedMappings = Def.task {
 			val n = a.name.stripSuffix("_" + scalaBinaryVersion.value)
 			n match {
 				case "a" | "b" | "c" => (f, apiBase(n)) :: Nil
+				case "scala-library" => (f, scalaLibraryBase(scalaVersion.value)) :: Nil
 				case _ => Nil
 			}
 		}
diff --git a/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt
index c07e5707e..41e371a5b 100644
--- a/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt
@@ -1,5 +1,3 @@
-resolvers += ScalaToolsReleases
-
 libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5"
 
 ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home")))
diff --git a/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala b/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala
index 62e77e7d1..961edec25 100644
--- a/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala
+++ b/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala
@@ -5,11 +5,10 @@
 object MakePomTest extends Build
 {
 	lazy val root = Project("root", file(".")) settings(
-		resolvers += ScalaToolsReleases,
 		readPom <<= makePom map XML.loadFile,
 		TaskKey[Unit]("check-pom") <<= checkPom,
 		TaskKey[Unit]("check-extra") <<= checkExtra,
-		resolvers ++= Seq(ScalaToolsReleases, ScalaToolsSnapshots),
+		resolvers += Resolver.sonatypeRepo("snapshots"),
 		makePomConfiguration ~= { _.copy(extra = <extra-tag/>) }
 	)
 
diff --git a/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala b/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala
index 7f70d4007..0d46d81d7 100644
--- a/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala
+++ b/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala
@@ -5,7 +5,7 @@
 object PomRepoTest extends Build
 {
 	lazy val root = Project("root", file(".")) settings(
-		resolvers ++= Seq(local, ScalaToolsReleases, ScalaToolsSnapshots),
+		resolvers ++= Seq(local, Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots")),
 		InputKey[Unit]("check-pom") <<= InputTask(_ => spaceDelimited("<args>")) { result => (makePom, result, streams) map checkPomRepositories },
 		makePomConfiguration <<= (makePomConfiguration, baseDirectory) { (conf, base) =>
 			conf.copy(filterRepositories = pomIncludeRepository(base, conf.filterRepositories) )
diff --git a/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala b/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala
index 065d6fef6..8fe88f86d 100644
--- a/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala
+++ b/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala
@@ -3,8 +3,7 @@ import Keys._
 object P extends Build
 {
 	override def settings = super.settings ++ Seq(
-		scalaBinaryVersion in update := "2.9.0",
-		resolvers += ScalaToolsReleases
+		scalaBinaryVersion in update := "2.9.0"
 	)
 
 	def configIvyScala =
diff --git a/sbt/src/sbt-test/project/delegates/project/Build.scala b/sbt/src/sbt-test/project/delegates/project/Build.scala
index 5abc9563d..d8f658557 100644
--- a/sbt/src/sbt-test/project/delegates/project/Build.scala
+++ b/sbt/src/sbt-test/project/delegates/project/Build.scala
@@ -7,7 +7,7 @@ object B extends Build
 	val check = InputKey[Unit]("check-max-errors")
 
 	lazy val root = Project("root", file("."))
-	lazy val sub = Project("sub", file(".")) delegateTo(root) settings(check <<= checkTask)
+	lazy val sub = Project("sub", file("sub")) delegateTo(root) settings(check <<= checkTask)
 
 	lazy val checkTask = InputTask(_ => Space ~> NatBasic) { result =>
 		(result, maxErrors) map { (i, max)  =>
diff --git a/sbt/src/sbt-test/tests/junit/build.sbt b/sbt/src/sbt-test/tests/junit/build.sbt
index 75cc99d4a..92bce8545 100644
--- a/sbt/src/sbt-test/tests/junit/build.sbt
+++ b/sbt/src/sbt-test/tests/junit/build.sbt
@@ -1,3 +1 @@
-resolvers += ScalaToolsReleases
-
 libraryDependencies += "com.novocode" % "junit-interface" % "0.8" % "test"
diff --git a/sbt/src/sbt-test/tests/resources/build.sbt b/sbt/src/sbt-test/tests/resources/build.sbt
index 9729bd66d..3e6a355f7 100644
--- a/sbt/src/sbt-test/tests/resources/build.sbt
+++ b/sbt/src/sbt-test/tests/resources/build.sbt
@@ -1,3 +1 @@
 libraryDependencies += "org.specs2" % "specs2_2.10" % "1.12.3" % "test"
-
-resolvers += ScalaToolsReleases
\ No newline at end of file
diff --git a/sbt/src/sbt-test/tests/specs-run/build.sbt b/sbt/src/sbt-test/tests/specs-run/build.sbt
index 03a93afc5..c6b41db8d 100644
--- a/sbt/src/sbt-test/tests/specs-run/build.sbt
+++ b/sbt/src/sbt-test/tests/specs-run/build.sbt
@@ -1,5 +1,3 @@
 scalaVersion := "2.9.1"
 
 libraryDependencies += "org.specs2" %% "specs2" % "1.7.1" % "test"
-
-resolvers += ScalaToolsReleases