diff --git a/CHANGES.md b/CHANGES.md
index f1e28c8182f..b27ae78ee90 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 
 ### 1.6.1 (Unrelease)
  * pytest-server-fixtures: fix exception when attempting to access hostname while server is not started
+ * pytest-server-fixtures: suppress stacktrace if kill() is called
  * pytest-server-fixtures: fix random port logic in TestServerV2
 
 ### 1.6.0 (2019-02-12)
diff --git a/pytest-server-fixtures/pytest_server_fixtures/base2.py b/pytest-server-fixtures/pytest_server_fixtures/base2.py
index 62b29c70e90..93add0ceb22 100644
--- a/pytest-server-fixtures/pytest_server_fixtures/base2.py
+++ b/pytest-server-fixtures/pytest_server_fixtures/base2.py
@@ -85,6 +85,10 @@ def kill(self):
         if not self._server:
             log.debug("Server not started yet, skipping")
             return
+
+        # Prevent traceback printed when the server goes away as we kill it
+        self._server.exit = True
+
         self._server.teardown()
         self._server = None
         self._killed = True