diff --git a/test/Renci.SshNet.Tests/Classes/SessionTest_Connected_Disconnect.cs b/test/Renci.SshNet.Tests/Classes/SessionTest_Connected_Disconnect.cs
index 462055e37..5710a9985 100644
--- a/test/Renci.SshNet.Tests/Classes/SessionTest_Connected_Disconnect.cs
+++ b/test/Renci.SshNet.Tests/Classes/SessionTest_Connected_Disconnect.cs
@@ -15,7 +15,10 @@ public class SessionTest_Connected_Disconnect : SessionTest_ConnectedBase
     {
         protected override void Act()
         {
+            using ManualResetEventSlim clientDisconnected = new ManualResetEventSlim(false);
+            ServerListener.Disconnected += (socket) => clientDisconnected.Set();
             Session.Disconnect();
+            clientDisconnected.Wait(10000);
         }
 
         [TestMethod]