diff --git a/sbt-app/src/sbt-test/tests/test-quick/build.sbt b/sbt-app/src/sbt-test/tests/incremental-object-sources/build.sbt
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/build.sbt
rename to sbt-app/src/sbt-test/tests/incremental-object-sources/build.sbt
diff --git a/sbt-app/src/sbt-test/tests/test-quick/changed/MathFunction.scala b/sbt-app/src/sbt-test/tests/incremental-object-sources/changed/MathFunction.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/changed/MathFunction.scala
rename to sbt-app/src/sbt-test/tests/incremental-object-sources/changed/MathFunction.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/src/main/scala/MathFunction.scala b/sbt-app/src/sbt-test/tests/incremental-object-sources/src/main/scala/MathFunction.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/src/main/scala/MathFunction.scala
rename to sbt-app/src/sbt-test/tests/incremental-object-sources/src/main/scala/MathFunction.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/src/test/scala/MathFunctionSpec.scala b/sbt-app/src/sbt-test/tests/incremental-object-sources/src/test/scala/MathFunctionSpec.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/src/test/scala/MathFunctionSpec.scala
rename to sbt-app/src/sbt-test/tests/incremental-object-sources/src/test/scala/MathFunctionSpec.scala
diff --git a/sbt-app/src/sbt-test/tests/incremental-object-sources/test b/sbt-app/src/sbt-test/tests/incremental-object-sources/test
new file mode 100644
index 000000000..bd92c5fc8
--- /dev/null
+++ b/sbt-app/src/sbt-test/tests/incremental-object-sources/test
@@ -0,0 +1,7 @@
+> testQuick
+
+# https://github.com/sbt/sbt/issues/5504
+$ copy-file changed/MathFunction.scala src/test/scala/MathFunction.scala
+> compile
+> debug
+-> testQuick MathFunctionTest
diff --git a/sbt-app/src/sbt-test/tests/incremental/build.sbt b/sbt-app/src/sbt-test/tests/incremental/build.sbt
new file mode 100644
index 000000000..2e17a434c
--- /dev/null
+++ b/sbt-app/src/sbt-test/tests/incremental/build.sbt
@@ -0,0 +1,10 @@
+Global / cacheStores := Seq.empty
+
+val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
+scalaVersion := "2.12.20"
+
+lazy val root = (project in file("."))
+  .settings(
+    libraryDependencies += scalatest % Test,
+    Test / parallelExecution := false
+  )
diff --git a/sbt-app/src/sbt-test/tests/test-quick/changed/A.scala b/sbt-app/src/sbt-test/tests/incremental/changed/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/changed/A.scala
rename to sbt-app/src/sbt-test/tests/incremental/changed/A.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/changed/B.scala b/sbt-app/src/sbt-test/tests/incremental/changed/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/changed/B.scala
rename to sbt-app/src/sbt-test/tests/incremental/changed/B.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/changed/Base.scala b/sbt-app/src/sbt-test/tests/incremental/changed/Base.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/changed/Base.scala
rename to sbt-app/src/sbt-test/tests/incremental/changed/Base.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/src/main/scala/A.scala b/sbt-app/src/sbt-test/tests/incremental/src/main/scala/A.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/src/main/scala/A.scala
rename to sbt-app/src/sbt-test/tests/incremental/src/main/scala/A.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/src/main/scala/B.scala b/sbt-app/src/sbt-test/tests/incremental/src/main/scala/B.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/src/main/scala/B.scala
rename to sbt-app/src/sbt-test/tests/incremental/src/main/scala/B.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/src/test/scala/Base.scala b/sbt-app/src/sbt-test/tests/incremental/src/test/scala/Base.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/src/test/scala/Base.scala
rename to sbt-app/src/sbt-test/tests/incremental/src/test/scala/Base.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/src/test/scala/Create.scala b/sbt-app/src/sbt-test/tests/incremental/src/test/scala/Create.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/src/test/scala/Create.scala
rename to sbt-app/src/sbt-test/tests/incremental/src/test/scala/Create.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/src/test/scala/Delete.scala b/sbt-app/src/sbt-test/tests/incremental/src/test/scala/Delete.scala
similarity index 100%
rename from sbt-app/src/sbt-test/tests/test-quick/src/test/scala/Delete.scala
rename to sbt-app/src/sbt-test/tests/incremental/src/test/scala/Delete.scala
diff --git a/sbt-app/src/sbt-test/tests/test-quick/test b/sbt-app/src/sbt-test/tests/incremental/test
similarity index 77%
rename from sbt-app/src/sbt-test/tests/test-quick/test
rename to sbt-app/src/sbt-test/tests/incremental/test
index 4db0b2828..56c9d3d4f 100644
--- a/sbt-app/src/sbt-test/tests/test-quick/test
+++ b/sbt-app/src/sbt-test/tests/incremental/test
@@ -7,7 +7,6 @@
 # Non-API change
 $ copy-file changed/A.scala src/main/scala/A.scala
 > compile
-$ sleep 2000
 # Create is run. Delete is not since it doesn't have src/main dependency.
 -> testQuick
 > testOnly Delete
@@ -19,7 +18,6 @@ $ sleep 2000
 
 $ copy-file changed/B.scala src/main/scala/B.scala
 > compile
-$ sleep 2000
 -> testQuick Create
 > testOnly Delete
 # Previous run of Create failed, re-run.
@@ -28,13 +26,6 @@ $ sleep 2000
 
 $ copy-file changed/Base.scala src/test/scala/Base.scala
 > Test/compile
-$ sleep 2000
 -> testQuick Create
 > testQuick Delete
 > testQuick Create
-
-# https://github.com/sbt/sbt/issues/5504
-$ copy-file changed/MathFunction.scala src/test/scala/MathFunction.scala
-> compile
-$ sleep 2000
--> testQuick MathFunctionTest