diff --git a/test/org/jivesoftware/smackx/XHTMLManagerTest.java b/test/org/jivesoftware/smackx/XHTMLManagerTest.java
index ddf5a51e1..ab3381558 100644
--- a/test/org/jivesoftware/smackx/XHTMLManagerTest.java
+++ b/test/org/jivesoftware/smackx/XHTMLManagerTest.java
@@ -131,7 +131,7 @@ public class XHTMLManagerTest extends TestCase {
     public void testSendSimpleXHTMLMessageAndDisplayReceivedXHTMLMessage() {
         // Create a chat for each connection
         Chat chat1 = conn1.createChat(user2);
-        final Chat chat2 = new Chat(conn2, user1, chat1.getChatID());
+        final Chat chat2 = new Chat(conn2, user1, chat1.getThreadID());
 
         // Create a listener for the chat that will check if the received message includes 
         // an XHTML extension. Answer an ACK if everything is ok
@@ -202,7 +202,7 @@ public class XHTMLManagerTest extends TestCase {
     public void testSendComplexXHTMLMessageAndDisplayReceivedXHTMLMessage() {
         // Create a chat for each connection
         Chat chat1 = conn1.createChat(user2);
-        final Chat chat2 = new Chat(conn2, user1, chat1.getChatID());
+        final Chat chat2 = new Chat(conn2, user1, chat1.getThreadID());
 
         // Create a listener for the chat that will check if the received message includes 
         // an XHTML extension. Answer an ACK if everything is ok
diff --git a/test/org/jivesoftware/smackx/packet/RosterExchangeTest.java b/test/org/jivesoftware/smackx/packet/RosterExchangeTest.java
index 69a73a0b5..fc1ba75e2 100644
--- a/test/org/jivesoftware/smackx/packet/RosterExchangeTest.java
+++ b/test/org/jivesoftware/smackx/packet/RosterExchangeTest.java
@@ -74,7 +74,7 @@ public class RosterExchangeTest extends TestCase {
     public void testSendAndReceiveRosterEntries() {
         // Create a chat for each connection
         Chat chat1 = conn1.createChat(user2);
-        final Chat chat2 = new Chat(conn2, user1, chat1.getChatID());
+        final Chat chat2 = new Chat(conn2, user1, chat1.getThreadID());
 
         // Create a Listener that listens for Messages with the extension "jabber:x:roster"
         // This listener will listen on the conn2 and answer an ACK if everything is ok
@@ -134,7 +134,7 @@ public class RosterExchangeTest extends TestCase {
     public void testSendAndAcceptRosterEntries() {
         // Create a chat for each connection
         Chat chat1 = conn1.createChat(user2);
-        final Chat chat2 = new Chat(conn2, user1, chat1.getChatID());
+        final Chat chat2 = new Chat(conn2, user1, chat1.getThreadID());
 
         // Create a Listener that listens for Messages with the extension "jabber:x:roster"
         // This listener will listen on the conn2, save the roster entries and answer an ACK if everything is ok
diff --git a/test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java b/test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java
index 9de6eab42..03760d40f 100644
--- a/test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java
+++ b/test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java
@@ -123,7 +123,7 @@ public class XHTMLExtensionTest extends TestCase {
     public void testSendSimpleXHTMLMessageAndDisplayReceivedXHTMLMessage() {
         // Create a chat for each connection
         Chat chat1 = conn1.createChat(user2);
-        final Chat chat2 = new Chat(conn2, user1, chat1.getChatID());
+        final Chat chat2 = new Chat(conn2, user1, chat1.getThreadID());
 
         // Create a Listener that listens for Messages with the extension 
         //"http://jabber.org/protocol/xhtml-im"
@@ -191,7 +191,7 @@ public class XHTMLExtensionTest extends TestCase {
     public void testSendComplexXHTMLMessageAndDisplayReceivedXHTMLMessage() {
         // Create a chat for each connection
         Chat chat1 = conn1.createChat(user2);
-        final Chat chat2 = new Chat(conn2, user1, chat1.getChatID());
+        final Chat chat2 = new Chat(conn2, user1, chat1.getThreadID());
 
         // Create a Listener that listens for Messages with the extension 
         //"http://jabber.org/protocol/xhtml-im"