diff --git a/tobiko/shell/ssh/_forward.py b/tobiko/shell/ssh/_forward.py
index 064e37f02..0b060949d 100644
--- a/tobiko/shell/ssh/_forward.py
+++ b/tobiko/shell/ssh/_forward.py
@@ -127,7 +127,7 @@ class SSHTunnelForwarderFixture(tobiko.SharedFixture):
                 remote_bind_addresses=remote_bind_addresses)
             self.addCleanup(self.cleanup_forwarder)
             forwarder.start()
-            self.ssh_client.addCleanup(self)
+            self.ssh_client.addCleanup(self.cleanup_forwarder)
         return forwarder
 
     def cleanup_forwarder(self):