diff --git a/sbt/src/sbt-test/dependency-management/cache-classifiers/a/build.sbt b/sbt/src/sbt-test/dependency-management/cache-classifiers/a/build.sbt
index 66e3e8487..cc76c13df 100644
--- a/sbt/src/sbt-test/dependency-management/cache-classifiers/a/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/cache-classifiers/a/build.sbt
@@ -6,4 +6,4 @@ version := "1.0.0-SNAPSHOT"
 
 publishArtifact in (Test,packageBin) := true
 
-publishTo := Some(Resolver.file("demo", (baseDirectory in ThisBuild).value / "demo-repo"))
+publishTo <<= (baseDirectory in ThisBuild) { base => Some(Resolver.file("demo", base / "demo-repo")) }
diff --git a/sbt/src/sbt-test/dependency-management/cache-classifiers/b/build.sbt b/sbt/src/sbt-test/dependency-management/cache-classifiers/b/build.sbt
index 4e94e4922..93a62856f 100644
--- a/sbt/src/sbt-test/dependency-management/cache-classifiers/b/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/cache-classifiers/b/build.sbt
@@ -1,4 +1,4 @@
 libraryDependencies += "org.example" %% "artifacta" % "1.0.0-SNAPSHOT" withSources() classifier("test") classifier("")
 
-externalResolvers := Seq( "demo" at ( (baseDirectory in ThisBuild).value / "demo-repo").toURI.toString )
+externalResolvers <<= baseDirectory in ThisBuild map { base => Seq( "demo" at (base  / "demo-repo").toURI.toString ) }
 
diff --git a/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt b/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
deleted file mode 100644
index 167a22186..000000000
--- a/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
+++ /dev/null
@@ -1,3 +0,0 @@
-val b = project
-
-val a = project
diff --git a/sbt/src/sbt-test/dependency-management/cache-classifiers/project/Build.scala b/sbt/src/sbt-test/dependency-management/cache-classifiers/project/Build.scala
new file mode 100644
index 000000000..d5f426325
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/cache-classifiers/project/Build.scala
@@ -0,0 +1,7 @@
+import sbt._
+import Keys._
+
+object B extends Build {
+	lazy val b = Project("b", file("b"))
+	lazy val a = Project("a", file("a"))
+}
diff --git a/sbt/src/sbt-test/dependency-management/cache-classifiers/test b/sbt/src/sbt-test/dependency-management/cache-classifiers/test
index f3e1d1300..25ac3f608 100644
--- a/sbt/src/sbt-test/dependency-management/cache-classifiers/test
+++ b/sbt/src/sbt-test/dependency-management/cache-classifiers/test
@@ -4,6 +4,9 @@ $ copy-file changes/B.scala b/B.scala
 > b/update
 -> b/test:compile
 
+# Need to sleep 3s because the check depends on last modified time and typical resolution is 1s.
+$ sleep 3000
+
 $ copy-file changes/A.scala a/src/test/scala/A.scala
 > a/publish