diff --git a/sbt/src/sbt-test/project/isolated-build-definitions/build.sbt b/sbt/src/sbt-test/project/isolated-build-definitions/build.sbt
index 76d6c9554..5928ca7b5 100644
--- a/sbt/src/sbt-test/project/isolated-build-definitions/build.sbt
+++ b/sbt/src/sbt-test/project/isolated-build-definitions/build.sbt
@@ -1,5 +1,9 @@
-name := "project-runtime"
+lazy val `project-runtime` = (project in file(".")).
+  dependsOn(projectGenerator % "optional").
+  settings(
+    name := "project-runtime",
+    scalaVersion := "2.11.7",
+    crossPaths := false
+  )
 
-scalaVersion := "2.9.1"
-
-crossPaths := false
+lazy val projectGenerator = ProjectRef(uri("generator/"), "project")
diff --git a/sbt/src/sbt-test/project/isolated-build-definitions/generator/build.sbt b/sbt/src/sbt-test/project/isolated-build-definitions/generator/build.sbt
index 7a1a4ec44..cbc8c6c17 100644
--- a/sbt/src/sbt-test/project/isolated-build-definitions/generator/build.sbt
+++ b/sbt/src/sbt-test/project/isolated-build-definitions/generator/build.sbt
@@ -1,5 +1,6 @@
-name := "project"
-
-scalaVersion := "2.9.1"
-
-crossPaths := false
+lazy val project = (sbt.project in file(".")).
+  settings(
+    name := "project",
+    scalaVersion := "2.11.7",
+    crossPaths := false
+  )
diff --git a/sbt/src/sbt-test/project/isolated-build-definitions/generator/project/Build.scala b/sbt/src/sbt-test/project/isolated-build-definitions/generator/project/Build.scala
deleted file mode 100644
index 9b47bb2a7..000000000
--- a/sbt/src/sbt-test/project/isolated-build-definitions/generator/project/Build.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import sbt._
-import Keys._
-import Import._
-
-object B extends Build {
-lazy val project = Project(id = "project",
-                            base = file("."))
-}
diff --git a/sbt/src/sbt-test/project/isolated-build-definitions/project/Build.scala b/sbt/src/sbt-test/project/isolated-build-definitions/project/Build.scala
deleted file mode 100644
index 27856af2a..000000000
--- a/sbt/src/sbt-test/project/isolated-build-definitions/project/Build.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import sbt._
-import Keys._
-import Import._
-
-object B extends Build
-{
-  lazy val projectRuntime = Project(id = "project-runtime", base = file(".")).
-    dependsOn(projectGenerator % "optional")
-
-
-  lazy val projectGenerator = ProjectRef(uri("generator/"),"project")
-}