diff --git a/netlib/tcp.py b/netlib/tcp.py
index bad166d0b..729e513e9 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -297,9 +297,11 @@ class BaseHandler(SocketCloseMixin):
     """
     rbufsize = -1
     wbufsize = -1
-    def __init__(self, connection, address):
+
+    def __init__(self, connection, address, server):
         self.connection = connection
         self.address = Address.wrap(address)
+        self.server = server
         self.rfile = Reader(self.connection.makefile('rb', self.rbufsize))
         self.wfile = Writer(self.connection.makefile('wb', self.wbufsize))
 
diff --git a/netlib/test.py b/netlib/test.py
index 565b97cd4..2f6a71073 100644
--- a/netlib/test.py
+++ b/netlib/test.py
@@ -50,7 +50,7 @@ class TServer(tcp.TCPServer):
         self.last_handler = None
 
     def handle_client_connection(self, request, client_address):
-        h = self.handler_klass(request, client_address)
+        h = self.handler_klass(request, client_address, self)
         self.last_handler = h
         if self.ssl:
             cert = certutils.SSLCert.from_pem(