diff --git a/sbt/src/sbt-test/compiler-project/inc-ant-style/build.sbt b/sbt/src/sbt-test/compiler-project/inc-ant-style/build.sbt
index b25805b13..65647557e 100644
--- a/sbt/src/sbt-test/compiler-project/inc-ant-style/build.sbt
+++ b/sbt/src/sbt-test/compiler-project/inc-ant-style/build.sbt
@@ -6,11 +6,13 @@ incOptions := incOptions.value.withAntStyle(true)
  *  a) checks in which compilation given set of files was recompiled
  *  b) checks overall number of compilations performed
  */
-TaskKey[Unit]("check-compilations") <<= (compile in Compile, scalaSource in Compile) map { (a: sbt.inc.Analysis, src: java.io.File) =>
-  def relative(f: java.io.File): java.io.File =  f.relativeTo(src) getOrElse f
-  val allCompilations = a.compilations.allCompilations
+TaskKey[Unit]("check-compilations") := {
+  val analysis = (compile in Compile).value
+  val srcDir = (scalaSource in Compile).value
+  def relative(f: java.io.File): java.io.File =  f.relativeTo(srcDir) getOrElse f
+  val allCompilations = analysis.compilations.allCompilations
   val recompiledFiles: Seq[Set[java.io.File]] = allCompilations map { c =>
-    val recompiledFiles = a.apis.internal.collect {
+    val recompiledFiles = analysis.apis.internal.collect {
       case (file, api) if api.compilation.startTime == c.startTime => relative(file)
     }
     recompiledFiles.toSet
diff --git a/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt
index de908146c..d24e304b1 100644
--- a/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt
@@ -12,11 +12,13 @@ incOptions := incOptions.value.copy(recompileAllFraction = 1.0)
  *  a) checks in which compilation given set of files was recompiled
  *  b) checks overall number of compilations performed
  */
-TaskKey[Unit]("check-compilations") <<= (compile in Compile, scalaSource in Compile) map { (a: sbt.inc.Analysis, src: java.io.File) =>
-  def relative(f: java.io.File): java.io.File =  f.relativeTo(src) getOrElse f
-  val allCompilations = a.compilations.allCompilations
+TaskKey[Unit]("check-compilations") := {
+  val analysis = (compile in Compile).value
+  val srcDir = (scalaSource in Compile).value
+  def relative(f: java.io.File): java.io.File =  f.relativeTo(srcDir) getOrElse f
+  val allCompilations = analysis.compilations.allCompilations
   val recompiledFiles: Seq[Set[java.io.File]] = allCompilations map { c =>
-    val recompiledFiles = a.apis.internal.collect {
+    val recompiledFiles = analysis.apis.internal.collect {
       case (file, api) if api.compilation.startTime == c.startTime => relative(file)
     }
     recompiledFiles.toSet