diff --git a/pytest_sftpserver/sftp/server.py b/pytest_sftpserver/sftp/server.py
index cb22328..a017942 100644
--- a/pytest_sftpserver/sftp/server.py
+++ b/pytest_sftpserver/sftp/server.py
@@ -43,7 +43,10 @@ def host_key(self):
         return RSAKey.from_private_key_file(SERVER_KEY_PRIVATE)
 
 
-class SFTPServer(Thread, ThreadingMixIn, TCPServer):
+class SFTPServer(Thread, ThreadingMixIn, TCPServer):   
+    daemon_threads = True
+    block_on_close = False
+    
     def __init__(self, content_object=None, content_provider_class=ContentProvider):
         self.content_provider = content_provider_class(content_object)
         TCPServer.__init__(self, ("127.0.0.1", 0), SFTPRequestHandler, False)