diff --git a/stabbertests/test_connect.c b/stabbertests/test_connect.c
index 1176a71f..e8a4a3ce 100644
--- a/stabbertests/test_connect.c
+++ b/stabbertests/test_connect.c
@@ -37,7 +37,7 @@ connect_jid_requests_roster(void **state)
     prof_process_xmpp(20);
 
     assert_true(stbbr_verify(
-        "<iq id=\"roster\" type=\"get\"><query xmlns=\"jabber:iq:roster\"/></iq>"
+        "<iq id=\"*\" type=\"get\"><query xmlns=\"jabber:iq:roster\"/></iq>"
     ));
 }
 
@@ -60,8 +60,8 @@ connect_jid_sends_presence_after_receiving_roster(void **state)
     prof_process_xmpp(20);
 
     assert_true(stbbr_verify(
-        "<presence id=\"prof_presence_1\">"
-            "<c hash=\"sha-1\" xmlns=\"http://jabber.org/protocol/caps\" ver=\"EIpsmHyMRmfAoWbsX7Q2y9zibMM=\" node=\"http://www.profanity.im\"/>"
+        "<presence id=\"*\">"
+            "<c hash=\"sha-1\" xmlns=\"http://jabber.org/protocol/caps\" ver=\"*\" node=\"http://www.profanity.im\"/>"
         "</presence>"
     ));
 }
@@ -76,7 +76,7 @@ connect_jid_requests_bookmarks(void **state)
     prof_process_xmpp(20);
 
     assert_true(stbbr_verify(
-        "<iq id=\"bookmark_init_request\" type=\"get\">"
+        "<iq id=\"*\" type=\"get\">"
             "<query xmlns=\"jabber:iq:private\">"
                 "<storage xmlns=\"storage:bookmarks\"/>"
             "</query>"
@@ -99,26 +99,6 @@ connect_bad_password(void **state)
     assert_true(status == JABBER_DISCONNECTED);
 }
 
-//void
-//connect_loads_roster(void **state)
-//{
-//    will_return(ui_ask_password, strdup("password"));
-//
-//    expect_any_cons_show();
-//
-//    stbbr_for("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\"/>"
-//                "<item jid=\"buddy2@localhost\" subscription=\"both\" name=\"Buddy2\"/>"
-//            "</query>"
-//        "</iq>"
-//    );
-//
-//    cmd_process_input(strdup("/connect stabber@localhost port 5230"));
-//    prof_process_xmpp(20);
-//}
-
 void
 sends_rooms_iq(void **state)
 {