diff --git a/tests/testsuite.c b/tests/testsuite.c
index 67279311..fb439331 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -204,31 +204,81 @@ int main(int argc, char* argv[]) {
         unit_test(find_five_times_finds_fifth),
         unit_test(find_twice_returns_first_when_two_match_and_reset),
 
-        unit_test(cmd_connect_shows_message_when_disconnecting),
-        unit_test(cmd_connect_shows_message_when_connecting),
-        unit_test(cmd_connect_shows_message_when_connected),
-        unit_test(cmd_connect_shows_message_when_undefined),
-        unit_test(cmd_connect_when_no_account),
-        unit_test(cmd_connect_fail_message),
-        unit_test(cmd_connect_lowercases_argument),
-        unit_test(cmd_connect_asks_password_when_not_in_account),
-        unit_test(cmd_connect_shows_message_when_connecting_with_account),
-        unit_test(cmd_connect_connects_with_account),
-        unit_test(cmd_connect_shows_usage_when_no_server_value),
-        unit_test(cmd_connect_shows_usage_when_server_no_port_value),
-        unit_test(cmd_connect_shows_usage_when_no_port_value),
-        unit_test(cmd_connect_shows_usage_when_port_no_server_value),
-        unit_test(cmd_connect_shows_message_when_port_0),
-        unit_test(cmd_connect_shows_message_when_port_minus1),
-        unit_test(cmd_connect_shows_message_when_port_65536),
-        unit_test(cmd_connect_shows_message_when_port_contains_chars),
-        unit_test(cmd_connect_with_server_when_provided),
-        unit_test(cmd_connect_with_port_when_provided),
-        unit_test(cmd_connect_with_server_and_port_when_provided),
-        unit_test(cmd_connect_shows_usage_when_server_provided_twice),
-        unit_test(cmd_connect_shows_usage_when_port_provided_twice),
-        unit_test(cmd_connect_shows_usage_when_invalid_first_property),
-        unit_test(cmd_connect_shows_usage_when_invalid_second_property),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_disconnecting,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_connecting,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_connected,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_undefined,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_when_no_account,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_fail_message,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_lowercases_argument,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_asks_password_when_not_in_account,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_connecting_with_account,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_connects_with_account,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_usage_when_no_server_value,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_usage_when_server_no_port_value,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_usage_when_no_port_value,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_usage_when_port_no_server_value,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_port_0,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_port_minus1,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_port_65536,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_message_when_port_contains_chars,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_with_server_when_provided,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_with_port_when_provided,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_with_server_and_port_when_provided,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_usage_when_server_provided_twice,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_usage_when_port_provided_twice,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_usage_when_invalid_first_property,
+            load_preferences,
+            close_preferences),
+        unit_test_setup_teardown(cmd_connect_shows_usage_when_invalid_second_property,
+            load_preferences,
+            close_preferences),
 
         unit_test(cmd_rooms_shows_message_when_disconnected),
         unit_test(cmd_rooms_shows_message_when_disconnecting),
@@ -485,7 +535,9 @@ int main(int argc, char* argv[]) {
         unit_test(cmd_otr_start_shows_message_when_in_private),
         unit_test(cmd_otr_start_shows_message_when_already_started),
         unit_test(cmd_otr_start_shows_message_when_no_key),
-        unit_test(cmd_otr_start_sends_otr_query_message_to_current_recipeint),
+        unit_test_setup_teardown(cmd_otr_start_sends_otr_query_message_to_current_recipeint,
+            load_preferences,
+            close_preferences),
 #else
         unit_test(cmd_otr_shows_message_when_otr_unsupported),
 #endif