diff --git a/server-test/src/test/scala/testpkg/TestServer.scala b/server-test/src/test/scala/testpkg/TestServer.scala
index dc4170560..5d743c15d 100644
--- a/server-test/src/test/scala/testpkg/TestServer.scala
+++ b/server-test/src/test/scala/testpkg/TestServer.scala
@@ -205,6 +205,7 @@ case class TestServer(
   )
 
   def resetConnection() = {
+    Option(sk).foreach(_.close())
     sk = ClientSocket.socket(portfile)._1
     out = sk.getOutputStream
     in = sk.getInputStream