diff --git a/scripted/sbt/src/main/scala/sbt/scriptedtest/BatchScriptRunner.scala b/scripted/sbt/src/main/scala/sbt/scriptedtest/BatchScriptRunner.scala
index fe9d35712..2d23a0604 100644
--- a/scripted/sbt/src/main/scala/sbt/scriptedtest/BatchScriptRunner.scala
+++ b/scripted/sbt/src/main/scala/sbt/scriptedtest/BatchScriptRunner.scala
@@ -8,11 +8,17 @@
 package sbt
 package scriptedtest
 
+import scala.collection.mutable
+
 import sbt.internal.scripted._
-import sbt.scriptedtest.BatchScriptRunner.States
+
+private[sbt] object BatchScriptRunner {
+  type States = mutable.HashMap[StatementHandler, StatementHandler#State]
+}
 
 /** Defines an alternative script runner that allows batch execution. */
 private[sbt] class BatchScriptRunner extends ScriptRunner {
+  import BatchScriptRunner.States
 
   /** Defines a method to run batched execution.
    *
@@ -58,8 +64,3 @@ private[sbt] class BatchScriptRunner extends ScriptRunner {
     }
   }
 }
-
-private[sbt] object BatchScriptRunner {
-  import scala.collection.mutable
-  type States = mutable.HashMap[StatementHandler, Any]
-}
diff --git a/scripted/sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala b/scripted/sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
index 88c28d01c..e9c26281b 100644
--- a/scripted/sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
+++ b/scripted/sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
@@ -60,7 +60,7 @@ final class ScriptedTests(resourceBaseDirectory: File,
               val handlers =
                 createScriptedHandlers(testDirectory, buffer, RemoteSbtCreatorKind.LauncherBased)
               val runner = new BatchScriptRunner
-              val states = new mutable.HashMap[StatementHandler, Any]()
+              val states = new mutable.HashMap[StatementHandler, StatementHandler#State]()
               commonRunTest(label, testDirectory, prescripted, handlers, runner, states, buffer)
             }
             runOrHandleDisabled(label, testDirectory, singleTestRunner, buffer)