diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 73ab8075..7d000bfa 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -174,8 +174,7 @@ class ClientXMPP(BaseXMPP):
 
         if not address:
             # If all else fails, use the server from the JID.
-            address = (self.server, 5222)
-        logging.debug("The server is %s" % self.server)
+            address = (self.boundjid.host, 5222)
 
         return XMLStream.connect(self, address[0], address[1], use_tls=True)
 
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py
index 89e3712f..efe81212 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/sleekxmpp/test/sleektest.py
@@ -638,8 +638,8 @@ class SleekTest(unittest.TestCase):
         that the XMPP client is disconnected after an error.
         """
         if hasattr(self, 'xmpp') and self.xmpp is not None:
-            self.xmpp.disconnect()
             self.xmpp.socket.recv_data(self.xmpp.stream_footer)
+            self.xmpp.disconnect()
 
     # ------------------------------------------------------------------
     # XML Comparison and Cleanup