diff --git a/test/org/jivesoftware/smack/PacketReaderTest.java b/test/org/jivesoftware/smack/PacketReaderTest.java
index 86b51b84b..cd3642cb1 100644
--- a/test/org/jivesoftware/smack/PacketReaderTest.java
+++ b/test/org/jivesoftware/smack/PacketReaderTest.java
@@ -80,7 +80,7 @@ public class PacketReaderTest extends SmackTestCase {
                 return "<query xmlns=\"my:ns:test\"/>";
             }
         };
-        iqPacket.setTo(getBareJID(1));
+        iqPacket.setTo(getFullJID(1));
         iqPacket.setType(IQ.Type.GET);
 
         // Send the IQ and wait for the answer
diff --git a/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java b/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
index 269aa02ea..9fcc81e12 100644
--- a/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
+++ b/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
@@ -110,8 +110,11 @@ public class ServiceDiscoveryManagerTest extends SmackTestCase {
         // By default the XHTML service support is enabled in all the connections
         assertTrue(XHTMLManager.isServiceEnabled(getConnection(0)));
         assertTrue(XHTMLManager.isServiceEnabled(getConnection(1)));
-        // Check for XHTML support in connection1 from connection2 
-        assertTrue(XHTMLManager.isServiceEnabled(getConnection(1), getBareJID(0)));
+        // Check for XHTML support in connection1 from connection2
+        // Must specify a full JID and not a bare JID. Ensure that the server is working ok. 
+        assertFalse(XHTMLManager.isServiceEnabled(getConnection(1), getBareJID(0)));
+        // Using a full JID check that the other client supports XHTML. 
+        assertTrue(XHTMLManager.isServiceEnabled(getConnection(1), getFullJID(0)));
         
         // Disable the XHTML Message support in connection1
         XHTMLManager.setServiceEnabled(getConnection(0), false);