diff --git a/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs b/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
index 89c26fae..d446408e 100644
--- a/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
+++ b/src/Renci.SshNet.Tests/Common/AsyncSocketListener.cs
@@ -127,6 +127,8 @@ namespace Renci.SshNet.Tests.Common
             else
             {
                 SignalDisconnected(handler);
+                handler.Shutdown(SocketShutdown.Both);
+                handler.Close();
             }
         }