diff --git a/Makefile.am b/Makefile.am
index 1f7e0350..2452451c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,6 +114,7 @@ functionaltest_sources = \
 	tests/functionaltests/test_receipts.c tests/functionaltests/test_receipts.h \
 	tests/functionaltests/test_roster.c tests/functionaltests/test_roster.h \
 	tests/functionaltests/test_software.c tests/functionaltests/test_software.h \
+	tests/functionaltests/test_muc.c tests/functionaltests/test_muc.h \
 	tests/functionaltests/functionaltests.c
 
 main_source = src/main.c
diff --git a/tests/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c
index 6226af7f..39f43b49 100644
--- a/tests/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
@@ -20,6 +20,7 @@
 #include "test_receipts.h"
 #include "test_roster.h"
 #include "test_software.h"
+#include "test_muc.h"
 
 #define PROF_FUNC_TEST(test) unit_test_setup_teardown(test, init_prof_test, close_prof_test)
 
@@ -82,6 +83,15 @@ int main(int argc, char* argv[]) {
         PROF_FUNC_TEST(display_software_version_result_when_from_domainpart),
         PROF_FUNC_TEST(show_message_in_chat_window_when_no_resource),
         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),
+        PROF_FUNC_TEST(show_role_and_affiliation_on_join),
+        PROF_FUNC_TEST(show_subject_on_join),
+
     };
 
     return run_tests(all_tests);
diff --git a/tests/functionaltests/test_muc.c b/tests/functionaltests/test_muc.c
new file mode 100644
index 00000000..83e383be
--- /dev/null
+++ b/tests/functionaltests/test_muc.c
@@ -0,0 +1,139 @@
+#include <glib.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <stabber.h>
+#include <expect.h>
+
+#include "proftest.h"
+
+void
+sends_room_join(void **state)
+{
+    prof_connect();
+
+    prof_input("/join testroom@conference.localhost");
+
+    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_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();
+
+    prof_input("/join testroom@conference.localhost nick testnick");
+
+    assert_true(stbbr_last_received(
+        "<presence id=\"*\" to=\"testroom@conference.localhost/testnick\">"
+            "<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_password(void **state)
+{
+    prof_connect();
+
+    prof_input("/join testroom@conference.localhost password testpassword");
+
+    assert_true(stbbr_last_received(
+        "<presence id=\"*\" to=\"testroom@conference.localhost/stabber\">"
+            "<x xmlns=\"http://jabber.org/protocol/muc\">"
+                "<password>testpassword</password>"
+            "</x>"
+            "<c hash=\"sha-1\" xmlns=\"http://jabber.org/protocol/caps\" ver=\"*\" node=\"http://www.profanity.im\"/>"
+        "</presence>"
+    ));
+}
+
+void
+sends_room_join_with_nick_and_password(void **state)
+{
+    prof_connect();
+
+    prof_input("/join testroom@conference.localhost nick testnick password testpassword");
+
+    assert_true(stbbr_last_received(
+        "<presence id=\"*\" to=\"testroom@conference.localhost/testnick\">"
+            "<x xmlns=\"http://jabber.org/protocol/muc\">"
+                "<password>testpassword</password>"
+            "</x>"
+            "<c hash=\"sha-1\" xmlns=\"http://jabber.org/protocol/caps\" ver=\"*\" node=\"http://www.profanity.im\"/>"
+        "</presence>"
+    ));
+}
+
+void
+show_role_and_affiliation_on_join(void **state)
+{
+    prof_connect();
+
+    stbbr_for_id("prof_join_2",
+        "<presence id=\"prof_join_2\" lang=\"en\" to=\"stabber@localhost/profanity\" from=\"testroom@conference.localhost/stabber\">"
+            "<c hash=\"sha-1\" xmlns=\"http://jabber.org/protocol/caps\" node=\"http://www.profanity.im\" ver=\"*\"/>"
+            "<x xmlns=\"http://jabber.org/protocol/muc#user\">"
+                "<item role=\"participant\" jid=\"stabber@localhost/profanity\" affiliation=\"none\"/>"
+            "</x>"
+            "<status code=\"110\"/>"
+        "</presence>"
+    );
+
+    prof_input("/join testroom@conference.localhost");
+
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));
+}
+
+void
+show_subject_on_join(void **state)
+{
+    prof_connect();
+
+    stbbr_for_id("prof_join_2",
+        "<presence id=\"prof_join_2\" lang=\"en\" to=\"stabber@localhost/profanity\" from=\"testroom@conference.localhost/stabber\">"
+            "<c hash=\"sha-1\" xmlns=\"http://jabber.org/protocol/caps\" node=\"http://www.profanity.im\" ver=\"*\"/>"
+            "<x xmlns=\"http://jabber.org/protocol/muc#user\">"
+                "<item role=\"participant\" jid=\"stabber@localhost/profanity\" affiliation=\"none\"/>"
+            "</x>"
+            "<status code=\"110\"/>"
+        "</presence>"
+    );
+
+    prof_input("/join testroom@conference.localhost");
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));
+
+    stbbr_send(
+        "<message type=\"groupchat\" to=\"stabber@localhost/profanity\" from=\"testroom@conference.localhost\">"
+            "<subject>Test room subject</subject>"
+            "<body>anothernick has set the subject to: Test room subject</body>"
+        "</message>"
+    );
+
+    assert_true(prof_output_regex("Room subject: .+Test room subject"));
+}
diff --git a/tests/functionaltests/test_muc.h b/tests/functionaltests/test_muc.h
new file mode 100644
index 00000000..49329a36
--- /dev/null
+++ b/tests/functionaltests/test_muc.h
@@ -0,0 +1,12 @@
+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);
+void show_role_and_affiliation_on_join(void **state);
+void show_subject_on_join(void **state);
+
+
+
+
+