diff --git a/ospd/server.py b/ospd/server.py
index 3cfc50f6..c78a3477 100644
--- a/ospd/server.py
+++ b/ospd/server.py
@@ -178,15 +178,13 @@ def handle_request(self, request, client_address):
 
 
 class ThreadedUnixSocketServer(
-    SocketServerMixin,
-    socketserver.ThreadingMixIn,
-    socketserver.UnixStreamServer,
+    SocketServerMixin, socketserver.ThreadingUnixStreamServer,
 ):
     pass
 
 
 class ThreadedTlsSocketServer(
-    SocketServerMixin, socketserver.ThreadingMixIn, socketserver.TCPServer
+    SocketServerMixin, socketserver.ThreadingTCPServer,
 ):
     pass