diff --git a/tests/test_muc.c b/tests/test_muc.c
index 2af13516..94acd21c 100644
--- a/tests/test_muc.c
+++ b/tests/test_muc.c
@@ -6,29 +6,33 @@
 
 #include "muc.h"
 
+void muc_before_test(void **state)
+{
+    muc_init();
+}
+
+void muc_after_test(void **state)
+{
+    muc_close();
+}
+
 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);
-
-    muc_close();
 }
 
 void test_muc_remove_invite(void **state)
 {
     char *room = "room@conf.server";
-    muc_init();
     muc_add_invite(room);
     muc_remove_invite(room);
 
     gboolean invite_exists = muc_invites_include(room);
 
     assert_false(invite_exists);
-
-    muc_close();
 }
diff --git a/tests/test_muc.h b/tests/test_muc.h
index 8f0a879b..4a3b5315 100644
--- a/tests/test_muc.h
+++ b/tests/test_muc.h
@@ -1,2 +1,5 @@
+void muc_before_test(void **state);
+void muc_after_test(void **state);
+
 void test_muc_add_invite(void **state);
 void test_muc_remove_invite(void **state);
diff --git a/tests/testsuite.c b/tests/testsuite.c
index e823acd3..b8769efe 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -429,8 +429,8 @@ int main(int argc, char* argv[]) {
     };
 
     const UnitTest muc_tests[] = {
-        unit_test(test_muc_add_invite),
-        unit_test(test_muc_remove_invite),
+        unit_test_setup_teardown(test_muc_add_invite, muc_before_test, muc_after_test),
+        unit_test_setup_teardown(test_muc_remove_invite, muc_before_test, muc_after_test),
     };
 
     int bak, bak2, new;