5 files changed, 2 insertions, 18 deletions
diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c
index 617ab838..ef9f0e39 100644
--- a/tests/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
@@ -89,7 +89,6 @@ int main(int argc, char* argv[]) {
         PROF_FUNC_TEST(display_software_version_result_in_chat),
 
         PROF_FUNC_TEST(sends_room_join),
-        PROF_FUNC_TEST(sends_room_join_with_default_muc_service),
         PROF_FUNC_TEST(sends_room_join_with_nick),
         PROF_FUNC_TEST(sends_room_join_with_password),
         PROF_FUNC_TEST(sends_room_join_with_nick_and_password),
diff --git a/tests/functionaltests/test_muc.c b/tests/functionaltests/test_muc.c
index 5a117045..e7fc8dcb 100644
--- a/tests/functionaltests/test_muc.c
+++ b/tests/functionaltests/test_muc.c
@@ -27,21 +27,6 @@ sends_room_join(void **state)
 }
 
 void
-sends_room_join_with_default_muc_service(void **state)
-{
-    prof_connect();
-
-    prof_input("/join testroom");
-
-    assert_true(stbbr_last_received(
-        "<presence id='*' to='testroom@conference.localhost/stabber'>"
-            "<x xmlns='http://jabber.org/protocol/muc'/>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://www.profanity.im'/>"
-        "</presence>"
-    ));
-}
-
-void
 sends_room_join_with_nick(void **state)
 {
     prof_connect();
diff --git a/tests/functionaltests/test_muc.h b/tests/functionaltests/test_muc.h
index 30a6c2c8..4f3c4f5d 100644
--- a/tests/functionaltests/test_muc.h
+++ b/tests/functionaltests/test_muc.h
@@ -1,5 +1,4 @@
 void sends_room_join(void **state);
-void sends_room_join_with_default_muc_service(void **state);
 void sends_room_join_with_nick(void **state);
 void sends_room_join_with_password(void **state);
 void sends_room_join_with_nick_and_password(void **state);
diff --git a/tests/functionaltests/test_rooms.c b/tests/functionaltests/test_rooms.c
index 9bff2e19..c0103279 100644
--- a/tests/functionaltests/test_rooms.c
+++ b/tests/functionaltests/test_rooms.c
@@ -25,7 +25,7 @@ rooms_query(void **state)
 
     prof_connect();
 
-    prof_input("/rooms");
+    prof_input("/rooms conference.localhost");
 
     assert_true(prof_output_exact("chatroom@conference.localhost, (A chat room)"));
     assert_true(prof_output_exact("hangout@conference.localhost, (Another chat room)"));
diff --git a/tests/unittests/config/stub_accounts.c b/tests/unittests/config/stub_accounts.c
index 4c0449d6..669ceb33 100644
--- a/tests/unittests/config/stub_accounts.c
+++ b/tests/unittests/config/stub_accounts.c
@@ -196,6 +196,7 @@ void accounts_clear_otr(const char * const account_name) {}
 void accounts_clear_pgp_keyid(const char * const account_name) {}
 void accounts_clear_script_start(const char * const account_name) {}
 void accounts_clear_theme(const char * const account_name) {}
+void accounts_clear_muc(const char * const account_name) {}
 void accounts_add_otr_policy(const char * const account_name, const char * const contact_jid, const char * const policy) {}
 char* accounts_get_last_activity(const char *const account_name)
 {