diff --git a/src/Test/TestSiteDownload.py b/src/Test/TestSiteDownload.py
index 85ad9d7d..465b6b7d 100644
--- a/src/Test/TestSiteDownload.py
+++ b/src/Test/TestSiteDownload.py
@@ -115,7 +115,7 @@ class TestSiteDownload:
         file_server_full = FileServer("127.0.0.1", 1546)
         site_full.connection_server = file_server_full
         gevent.spawn(lambda: ConnectionServer.start(file_server_full))
-        time.sleep(0)  # Port opening
+        time.sleep(0.001)  # Port opening
         file_server_full.sites[site_full.address] = site_full  # Add site
         site_full.storage.verifyFiles(quick_check=True)  # Check optional files
         site_full_peer = site.addPeer("127.0.0.1", 1546)  # Add it to source server
diff --git a/src/Test/conftest.py b/src/Test/conftest.py
index 8a92a408..926d5824 100644
--- a/src/Test/conftest.py
+++ b/src/Test/conftest.py
@@ -137,7 +137,7 @@ def file_server(request):
     request.addfinalizer(CryptConnection.manager.removeCerts)  # Remove cert files after end
     file_server = FileServer("127.0.0.1", 1544)
     gevent.spawn(lambda: ConnectionServer.start(file_server))
-    time.sleep(0)  # Port opening
+    time.sleep(0.1)  # Port opening
     assert file_server.running
 
     def stop():
diff --git a/src/main.py b/src/main.py
index 24e8eb7c..1d206101 100644
--- a/src/main.py
+++ b/src/main.py
@@ -266,7 +266,7 @@ class Actions(object):
         file_server = FileServer()
         site.connection_server = file_server
         file_server_thread = gevent.spawn(file_server.start, check_sites=False)  # Dont check every site integrity
-        time.sleep(0)
+        time.sleep(0.001)
 
         if not file_server_thread.ready():
             # Started fileserver