diff --git a/functionaltests/test_connect.c b/functionaltests/test_connect.c
index 957d2798..8e0cabde 100644
--- a/functionaltests/test_connect.c
+++ b/functionaltests/test_connect.c
@@ -33,7 +33,7 @@ connect_jid_requests_roster(void **state)
 void
 connect_jid_sends_presence_after_receiving_roster(void **state)
 {
-    stbbr_for("roster",
+    stbbr_for_id("roster",
         "<iq id=\"roster\" type=\"result\" to=\"stabber@localhost/profanity\">"
             "<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
                 "<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
@@ -76,7 +76,7 @@ connect_bad_password(void **state)
 void
 connect_shows_presence_updates(void **state)
 {
-    stbbr_for("roster",
+    stbbr_for_id("roster",
         "<iq id=\"roster\" type=\"result\" to=\"stabber@localhost/profanity\">"
             "<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
                 "<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
@@ -85,7 +85,7 @@ connect_shows_presence_updates(void **state)
         "</iq>"
     );
 
-    stbbr_for("prof_presence_1",
+    stbbr_for_id("prof_presence_1",
         "<presence to=\"stabber@localhost\" from=\"buddy1@localhost/mobile\">"
             "<show>dnd</show>"
             "<status>busy!</status>"
diff --git a/functionaltests/test_message.c b/functionaltests/test_message.c
index c09e75fd..5cdad520 100644
--- a/functionaltests/test_message.c
+++ b/functionaltests/test_message.c
@@ -30,7 +30,7 @@ message_send(void **state)
 void
 message_receive(void **state)
 {
-    stbbr_for("roster",
+    stbbr_for_id("roster",
         "<iq id=\"roster\" type=\"result\" to=\"stabber@localhost/profanity\">"
             "<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
                 "<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
diff --git a/functionaltests/test_ping.c b/functionaltests/test_ping.c
index c1b398d8..e2ca79ca 100644
--- a/functionaltests/test_ping.c
+++ b/functionaltests/test_ping.c
@@ -14,10 +14,10 @@
 void
 ping_multiple(void **state)
 {
-    stbbr_for("prof_ping_1",
+    stbbr_for_id("prof_ping_1",
         "<iq id=\"prof_ping_1\" type=\"result\" to=\"stabber@localhost/profanity\"/>"
     );
-    stbbr_for("prof_ping_2",
+    stbbr_for_id("prof_ping_2",
         "<iq id=\"prof_ping_2\" type=\"result\" to=\"stabber@localhost/profanity\"/>"
     );
 
diff --git a/functionaltests/test_presence.c b/functionaltests/test_presence.c
index 6129339d..b26bdccb 100644
--- a/functionaltests/test_presence.c
+++ b/functionaltests/test_presence.c
@@ -230,7 +230,7 @@ presence_includes_priority(void **state)
 void
 presence_received(void **state)
 {
-    stbbr_for("roster",
+    stbbr_for_id("roster",
         "<iq id=\"roster\" type=\"result\" to=\"stabber@localhost/profanity\">"
             "<query xmlns=\"jabber:iq:roster\" ver=\"362\">"
                 "<item jid=\"buddy1@localhost\" subscription=\"both\" name=\"Buddy1\"/>"
diff --git a/functionaltests/test_rooms.c b/functionaltests/test_rooms.c
index 313d7a72..20ed7342 100644
--- a/functionaltests/test_rooms.c
+++ b/functionaltests/test_rooms.c
@@ -14,7 +14,7 @@
 void
 rooms_query(void **state)
 {
-    stbbr_for("confreq",
+    stbbr_for_id("confreq",
         "<iq id=\"confreq\" type=\"result\" to=\"stabber@localhost/profanity\" from=\"conference.localhost\">"
             "<query xmlns=\"http://jabber.org/protocol/disco#items\">"
                 "<item jid=\"chatroom@conference.localhost\" name=\"A chat room\"/>"