diff --git a/main/src/test/scala/sbt/internal/parser/SplitExpressionsBehavior.scala b/main/src/test/scala/sbt/internal/parser/SplitExpressionsBehavior.scala
index 17167e024..bda88bc0d 100644
--- a/main/src/test/scala/sbt/internal/parser/SplitExpressionsBehavior.scala
+++ b/main/src/test/scala/sbt/internal/parser/SplitExpressionsBehavior.scala
@@ -20,7 +20,7 @@ trait SplitExpression {
 
 trait SplitExpressionsBehavior extends SplitExpression { this: SpecificationLike =>
 
-  def newExpressionsSplitter(implicit splitter: SplitExpressions.SplitExpression): Unit = {
+  def newExpressionsSplitter(implicit splitter: SplitExpressions.SplitExpression) = {
 
     "parse a two settings without intervening blank line" in {
       val (imports, settings) = split("""version := "1.0"
diff --git a/main/src/test/scala/sbt/internal/server/SettingQueryTest.scala b/main/src/test/scala/sbt/internal/server/SettingQueryTest.scala
index 27c7e7238..7acf7955f 100644
--- a/main/src/test/scala/sbt/internal/server/SettingQueryTest.scala
+++ b/main/src/test/scala/sbt/internal/server/SettingQueryTest.scala
@@ -51,7 +51,7 @@ object SettingQueryTest extends org.specs2.mutable.Specification {
     def apply[T](lockFile: File, run: Callable[T]) = run.call()
   }
 
-  lazy val structure: BuildStructure = {
+  lazy val buildStructure: BuildStructure = {
     val projectSettings: Seq[Setting[_]] = Seq(scalaVersion := "2.12.1")
 
     val appConfig: AppConfiguration = new AppConfiguration {
@@ -180,7 +180,7 @@ object SettingQueryTest extends org.specs2.mutable.Specification {
   def query(setting: String): String = {
     import sbt.protocol._
     val req: SettingQuery = sbt.protocol.SettingQuery(setting)
-    val rsp: SettingQueryResponse = server.SettingQuery.handleSettingQuery(req, structure)
+    val rsp: SettingQueryResponse = server.SettingQuery.handleSettingQuery(req, buildStructure)
     val bytes: Array[Byte] = Serialization serializeEventMessage rsp
     val payload: String = new String(bytes, java.nio.charset.StandardCharsets.UTF_8)
     payload
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index f714cbc82..61bc30342 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -103,7 +103,7 @@ object Dependencies {
   val jline = "jline" % "jline" % "2.14.4"
   val scalatest = "org.scalatest" %% "scalatest" % "3.0.1"
   val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4"
-  val specs2 = "org.specs2" %% "specs2" % "2.4.17"
+  val specs2 = "org.specs2" %% "specs2-junit" % "4.0.1"
   val junit = "junit" % "junit" % "4.11"
   val templateResolverApi = "org.scala-sbt" % "template-resolver" % "0.1"