diff --git a/sbt/src/sbt-test/project/transitive-plugins/a/build.sbt b/sbt/src/sbt-test/project/transitive-plugins/a/build.sbt
index 499e140e5..8d7cbb57b 100644
--- a/sbt/src/sbt-test/project/transitive-plugins/a/build.sbt
+++ b/sbt/src/sbt-test/project/transitive-plugins/a/build.sbt
@@ -1,9 +1,9 @@
-publishTo <<= baseDirectory(x =>
-	Some(Resolver.file("test-publish", x / "../repo/"))
+publishTo <<= (baseDirectory in ThisBuild)(x =>
+	Some(Resolver.file("test-publish", x / "repo/"))
 )
 
-resolvers <+= baseDirectory(x =>
-	"test" at (x / "../repo/").asURL.toString
+resolvers <+= (baseDirectory in ThisBuild)(x =>
+	"test" at (x / "repo/").asURL.toString
 )
 
 name := "demo1"
diff --git a/sbt/src/sbt-test/project/transitive-plugins/b/build.sbt b/sbt/src/sbt-test/project/transitive-plugins/b/build.sbt
index 70aa6ffbf..916ad0935 100644
--- a/sbt/src/sbt-test/project/transitive-plugins/b/build.sbt
+++ b/sbt/src/sbt-test/project/transitive-plugins/b/build.sbt
@@ -1,9 +1,9 @@
-publishTo <<= baseDirectory(x =>
-	Some(Resolver.file("test-publish", x / "../repo/"))
+publishTo <<= (baseDirectory in ThisBuild)(x =>
+	Some(Resolver.file("test-publish", x / "repo"))
 )
 
-resolvers <+= baseDirectory(x =>
-	"test" at (x / "../repo/").asURL.toString
+resolvers <+= (baseDirectory in ThisBuild)(x =>
+	"test" at (x / "repo").asURL.toString
 )
 
 name := "demo2"
diff --git a/sbt/src/sbt-test/project/transitive-plugins/c/build.sbt b/sbt/src/sbt-test/project/transitive-plugins/c/build.sbt
index c2e030dc5..3672a1c05 100644
--- a/sbt/src/sbt-test/project/transitive-plugins/c/build.sbt
+++ b/sbt/src/sbt-test/project/transitive-plugins/c/build.sbt
@@ -1,9 +1,9 @@
-publishTo <<= baseDirectory(x =>
-	Some(Resolver.file("test-publish", x / "../repo/"))
+publishTo <<= (baseDirectory in ThisBuild)(x =>
+	Some(Resolver.file("test-publish", x / "repo"))
 )
 
-resolvers <+= baseDirectory(x =>
-	"test" at (x / "../repo/").asURL.toString
+resolvers <+= (baseDirectory in ThisBuild)(x =>
+	"test" at (x / "repo").asURL.toString
 )
 
 name := "demo3"
diff --git a/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala b/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala
index 21f373fd4..a24786a6b 100644
--- a/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala
+++ b/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala
@@ -3,19 +3,16 @@ import Keys._
 
 object Build extends Build
 {
-	override def settings = super.settings ++ Seq(
-		sbtBinaryVersion <<= sbtVersion
-	)
-
 	lazy val root = Project("root", file(".")) 
 	lazy val a = project("a")
 	lazy val b = project("b")
 	lazy val c = project("c")
 	def project(s: String) = Project(s, file(s)) settings(
-		ivyPaths <<= (baseDirectory, target in root)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))),
-		resolvers <+= appConfiguration { app =>
-			val ivyHome = Classpaths.bootIvyHome(app) getOrElse (file(System.getProperty("user.home")) / ".ivy2")
+		ivyPaths <<= (baseDirectory in root, target in root)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))),
+		resolvers <+= appConfiguration { app => // need this to resolve sbt
+			val ivyHome = Classpaths.bootIvyHome(app) getOrElse error("Launcher did not provide the Ivy home directory.")
 			Resolver.file("real-local",  ivyHome / "local")(Resolver.ivyStylePatterns)
-		}
+		},
+		resolvers += Resolver.typesafeIvyRepo("releases") // not sure why this isn't included by default
 	)
 }
\ No newline at end of file