diff --git a/sbt/src/test/scala/testpkg/ServerSpec.scala b/sbt/src/test/scala/testpkg/ServerSpec.scala
index 7b5abacbe..c937cb552 100644
--- a/sbt/src/test/scala/testpkg/ServerSpec.scala
+++ b/sbt/src/test/scala/testpkg/ServerSpec.scala
@@ -166,7 +166,7 @@ object TestServer {
     val init =
       Try {
         testServer.waitForString(30.seconds) { s =>
-          println(s)
+          if (s.nonEmpty) println(s)
           s contains """"message":"Done""""
         }
       }
@@ -292,7 +292,7 @@ case class TestServer(baseDirectory: File) {
     val deadline = duration.fromNow
     @tailrec
     def impl(): Boolean = {
-      if (deadline.isOverdue) false
+      if (deadline.isOverdue || !process.isAlive) false
       else readFrame.fold(false)(f) || impl
     }
     impl()