diff --git a/src/Test/TestConnectionServer.py b/src/Test/TestConnectionServer.py
index b17d3f76..f7f62831 100644
--- a/src/Test/TestConnectionServer.py
+++ b/src/Test/TestConnectionServer.py
@@ -45,10 +45,11 @@ class TestConnection:
 
 
         # Close connection
-        connection.close()
+        connection.close("Test ended")
         client.stop()
         time.sleep(0.01)
         assert len(file_server.connections) == 0
+        assert file_server.num_incoming == 2  # One for file_server fixture, one for the test
 
     def testRawConnection(self, file_server):
         client = ConnectionServer(file_server.ip, 1545)
diff --git a/src/Test/TestSiteDownload.py b/src/Test/TestSiteDownload.py
index ef75f5c5..972ddd3c 100644
--- a/src/Test/TestSiteDownload.py
+++ b/src/Test/TestSiteDownload.py
@@ -52,9 +52,12 @@ class TestSiteDownload:
         assert len(site_temp.content_manager.contents) == len(site.content_manager.contents) - 1
         assert not bad_files
 
+        assert file_server.num_incoming == 2  # One for file_server fixture, one for the test
+
         assert site_temp.storage.deleteFiles()
         [connection.close() for connection in file_server.connections]
 
+
     def testArchivedDownload(self, file_server, site, site_temp):
         # Init source server
         site.connection_server = file_server