diff --git a/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/build.sbt b/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/build.sbt
index 936beb53b..8ee086d79 100644
--- a/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/build.sbt
+++ b/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/build.sbt
@@ -20,7 +20,9 @@ def source = Def.task((Compile / sources).value.find(_.getName == "A.scala").get
 def checkBreakpointTask = Def.inputTask {
   val uri = (Compile / startMainClassDebugSession).evaluated
   implicit val context: TestingContext = TestingContext(source.value, scalaV)
-  DebugState.state = DebugTest.checkWithoutShutdown(uri)(Outputed("A"), Breakpoint(6))
+
+  def runChecks = DebugTest.init(uri) _
+  DebugState.state = runChecks(Seq(Outputed("A"), Breakpoint(6)))
 }
 
 def checkHotCodeReplaceTask = Def.task {
diff --git a/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/project/plugins.sbt b/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/project/plugins.sbt
index 93f8c4d22..1d687de18 100644
--- a/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/project/plugins.sbt
+++ b/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/project/plugins.sbt
@@ -10,4 +10,3 @@ val pluginVersion = sys.props
 
 addSbtPlugin("ch.epfl.scala" % "sbt-debug-adapter" % pluginVersion)
 libraryDependencies += "ch.epfl.scala" %% "scala-debug-adapter-test" % pluginVersion
-addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
diff --git a/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/project/project/plugins.sbt b/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/project/project/plugins.sbt
new file mode 100644
index 000000000..e63856da0
--- /dev/null
+++ b/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/project/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
diff --git a/modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/DebugTestSuite.scala b/modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/DebugTestSuite.scala
index fc4383268..a257bfead 100644
--- a/modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/DebugTestSuite.scala
+++ b/modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/DebugTestSuite.scala
@@ -68,7 +68,7 @@ trait DebugTest {
     finally client.close()
   }
 
-  def checkWithoutShutdown(uri: URI)(steps: DebugStepAssert*): DebugCheckState = {
+  def init(uri: URI)(steps: DebugStepAssert*): DebugCheckState = {
     val client = TestingDebugClient.connect(uri)
     check(client, None)(steps*)
   }