diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/A.java b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/A.java
deleted file mode 100644
index 2bce1ee78..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/A.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class A {
-	public Integer x() { return 3; }
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/B.java b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/B.java
deleted file mode 100644
index 7e9bb5574..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/B.java
+++ /dev/null
@@ -1 +0,0 @@
-public class B extends A {}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/C.java b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/C.java
deleted file mode 100644
index 042c2b2a3..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/C.java
+++ /dev/null
@@ -1 +0,0 @@
-public class C extends B {}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/D.java b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/D.java
deleted file mode 100644
index 03e6ad740..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/D.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class D {
-	public static final C c = new C();
-	public static String x() { return c.x().toString(); }
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/E.java b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/E.java
deleted file mode 100644
index d28336ed5..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/E.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class E {
-	public static void main(String[] args) {
-		assert(D.x() == "3");
-	}
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt
deleted file mode 100644
index 1036709cc..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/build.sbt
+++ /dev/null
@@ -1,25 +0,0 @@
-import sbt.internal.inc.Analysis
-import complete.DefaultParsers._
-
-// Reset compiler iterations, necessary because tests run in batch mode
-val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
-recordPreviousIterations := {
-  val log = streams.value.log
-  CompileState.previousIterations = {
-    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
-    previousAnalysis match {
-      case None =>
-        log.info("No previous analysis detected")
-        0
-      case Some(a: Analysis) => a.compilations.allCompilations.size
-    }
-  }
-}
-
-val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
-
-checkIterations := {
-  val expected: Int = (Space ~> NatBasic).parsed
-  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
-  assert(expected == actual, s"Expected $expected compilations, got $actual")
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java
deleted file mode 100644
index 610c20407..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/changes/A2.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class A {
-	public String x() { return "3"; }
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/project/CompileState.scala b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/project/CompileState.scala
deleted file mode 100644
index 078db9c7b..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/project/CompileState.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-// This is necessary because tests are run in batch mode
-object CompileState {
-  @volatile var previousIterations: Int = -1
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/test b/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/test
deleted file mode 100644
index b8a6167c7..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv-java/test
+++ /dev/null
@@ -1,10 +0,0 @@
-# 1 iteration from initial full compile
-> recordPreviousIterations
-> run
-$ copy-file changes/A2.java A.java
-
-# 1 iteration for the initial changes
-# 1 iteration to recompile all descendents and direct dependencies
-# no further iteration, because APIs of directs don't change
-> run
-> checkIterations 3
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/A.scala b/sbt/src/sbt-test/source-dependencies/less-inter-inv/A.scala
deleted file mode 100644
index a4f92f4fa..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
-	def x = 3
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/B.scala b/sbt/src/sbt-test/source-dependencies/less-inter-inv/B.scala
deleted file mode 100644
index a18aec3db..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/B.scala
+++ /dev/null
@@ -1 +0,0 @@
-class B extends A
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/C.scala b/sbt/src/sbt-test/source-dependencies/less-inter-inv/C.scala
deleted file mode 100644
index f6f5bb28f..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/C.scala
+++ /dev/null
@@ -1 +0,0 @@
-class C extends B
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/D.scala b/sbt/src/sbt-test/source-dependencies/less-inter-inv/D.scala
deleted file mode 100644
index 55959c2a9..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/D.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object D {
-  val c = new C
-  def x: String = c.x.toString
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/E.scala b/sbt/src/sbt-test/source-dependencies/less-inter-inv/E.scala
deleted file mode 100644
index f393ca20d..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/E.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object E extends App {
-	assert(D.x == "3")
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/build.sbt b/sbt/src/sbt-test/source-dependencies/less-inter-inv/build.sbt
deleted file mode 100644
index 1036709cc..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/build.sbt
+++ /dev/null
@@ -1,25 +0,0 @@
-import sbt.internal.inc.Analysis
-import complete.DefaultParsers._
-
-// Reset compiler iterations, necessary because tests run in batch mode
-val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
-recordPreviousIterations := {
-  val log = streams.value.log
-  CompileState.previousIterations = {
-    val previousAnalysis = (previousCompile in Compile).value.analysis.asScala
-    previousAnalysis match {
-      case None =>
-        log.info("No previous analysis detected")
-        0
-      case Some(a: Analysis) => a.compilations.allCompilations.size
-    }
-  }
-}
-
-val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
-
-checkIterations := {
-  val expected: Int = (Space ~> NatBasic).parsed
-  val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations
-  assert(expected == actual, s"Expected $expected compilations, got $actual")
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala
deleted file mode 100644
index acab4a1ae..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/changes/A2.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
-	def x = "3"
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/project/CompileState.scala b/sbt/src/sbt-test/source-dependencies/less-inter-inv/project/CompileState.scala
deleted file mode 100644
index 078db9c7b..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/project/CompileState.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-// This is necessary because tests are run in batch mode
-object CompileState {
-  @volatile var previousIterations: Int = -1
-}
diff --git a/sbt/src/sbt-test/source-dependencies/less-inter-inv/test b/sbt/src/sbt-test/source-dependencies/less-inter-inv/test
deleted file mode 100644
index fe8596e4c..000000000
--- a/sbt/src/sbt-test/source-dependencies/less-inter-inv/test
+++ /dev/null
@@ -1,10 +0,0 @@
-# 1 iteration from initial full compile
-> recordPreviousIterations
-> run
-$ copy-file changes/A2.scala A.scala
-
-# 1 iteration for the initial changes
-# 1 iteration to recompile all descendents and direct dependencies
-# no further iteration, because APIs of directs don't change
-> run
-> checkIterations 3