diff --git a/Makefile.am b/Makefile.am
index 5d5e3fba..802340e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,7 @@ test_sources = \
 	tests/test_roster_list.c \
 	tests/test_preferences.c \
 	tests/test_server_events.c \
+	tests/test_muc.c \
     tests/testsuite.c
 
 main_source = src/main.c
diff --git a/tests/test_muc.c b/tests/test_muc.c
new file mode 100644
index 00000000..42a27931
--- /dev/null
+++ b/tests/test_muc.c
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include <stdlib.h>
+
+#include "muc.h"
+
+void test_muc_add_invite(void **state)
+{
+    char *room = "room@conf.server";
+    muc_init();
+    muc_add_invite(room);
+    
+    gboolean invite_exists = muc_invites_include(room);
+
+    assert_true(invite_exists);
+}
diff --git a/tests/test_muc.h b/tests/test_muc.h
new file mode 100644
index 00000000..8efff108
--- /dev/null
+++ b/tests/test_muc.h
@@ -0,0 +1 @@
+void test_muc_add_invite(void **state);
diff --git a/tests/testsuite.c b/tests/testsuite.c
index 2f940af1..5120bcf2 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -23,6 +23,7 @@
 #include "test_preferences.h"
 #include "test_server_events.h"
 #include "test_cmd_alias.h"
+#include "test_muc.h"
 
 #define PROF_RUN_TESTS(name) fprintf(stderr, "\n-> Running %s\n", #name); \
     fflush(stderr); \
@@ -427,6 +428,10 @@ int main(int argc, char* argv[]) {
             close_preferences),
     };
 
+    const UnitTest muc_tests[] = {
+        unit_test(test_muc_add_invite),
+    };
+
     int bak, bak2, new;
     fflush(stdout);
     fflush(stderr);
@@ -456,6 +461,7 @@ int main(int argc, char* argv[]) {
     PROF_RUN_TESTS(preferences_tests);
     PROF_RUN_TESTS(cmd_alias_tests);
     PROF_RUN_TESTS(server_events_tests);
+    PROF_RUN_TESTS(muc_tests);
 
     fflush(stdout);
     dup2(bak, 1);