diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalIncomingServerSessionTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalIncomingServerSessionTest.java
index ed054a23d5..31cdf2004c 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalIncomingServerSessionTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalIncomingServerSessionTest.java
@@ -158,7 +158,7 @@ public void tearDown() throws Exception
         DNSUtil.setDnsOverride(null);
 
         if (remoteInitiatingServerDummy != null) {
-            //remoteInitiatingServerDummy.close();
+            remoteInitiatingServerDummy.disconnect();
             remoteInitiatingServerDummy = null;
         }
 
@@ -294,7 +294,6 @@ public void incomingTest(final ServerSettings localServerSettings, final ServerS
         } finally {
             // Teardown test fixture.
             trustStore.delete("unit-test");
-            remoteInitiatingServerDummy.disconnect();
         }
     }