diff --git a/functionaltests/test_connect.c b/functionaltests/test_connect.c
index 8e0cabde..7a42397f 100644
--- a/functionaltests/test_connect.c
+++ b/functionaltests/test_connect.c
@@ -33,8 +33,8 @@ connect_jid_requests_roster(void **state)
 void
 connect_jid_sends_presence_after_receiving_roster(void **state)
 {
-    stbbr_for_id("roster",
-        "<iq id=\"roster\" type=\"result\" to=\"stabber@localhost/profanity\">"
+    stbbr_for_query("jabber:iq:roster",
+        "<iq type=\"result\" to=\"stabber@localhost/profanity\">"
             "<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
                 "<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
                 "<item jid=\"buddy2@localhost\" subscription=\"both\" name=\"Buddy2\"/>"
@@ -76,8 +76,8 @@ connect_bad_password(void **state)
 void
 connect_shows_presence_updates(void **state)
 {
-    stbbr_for_id("roster",
-        "<iq id=\"roster\" type=\"result\" to=\"stabber@localhost/profanity\">"
+    stbbr_for_query("jabber:iq:roster",
+        "<iq type=\"result\" to=\"stabber@localhost/profanity\">"
             "<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
                 "<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
                 "<item jid=\"buddy2@localhost\" subscription=\"both\" name=\"Buddy2\"/>"