diff --git a/tests/test_cmd_account.c b/tests/test_cmd_account.c
index c924c6ee..5de766e2 100644
--- a/tests/test_cmd_account.c
+++ b/tests/test_cmd_account.c
@@ -1057,3 +1057,85 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese
 
     free(help);
 }
+
+void cmd_account_clear_shows_usage_when_no_args(void **state)
+{
+    mock_cons_show();
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    help->usage = "some usage";
+    gchar *args[] = { "clear", NULL };
+
+    expect_cons_show("Usage: some usage");
+
+    gboolean result = cmd_account(args, *help);
+    assert_true(result);
+
+    free(help);
+}
+
+void cmd_account_clear_shows_usage_when_one_arg(void **state)
+{
+    mock_cons_show();
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    help->usage = "some usage";
+    gchar *args[] = { "clear", "a_account", NULL };
+
+    expect_cons_show("Usage: some usage");
+
+    gboolean result = cmd_account(args, *help);
+    assert_true(result);
+
+    free(help);
+}
+
+void cmd_account_clear_checks_account_exists(void **state)
+{
+    stub_cons_show();
+    mock_accounts_account_exists();
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    gchar *args[] = { "clear", "a_account", "a_property", NULL };
+
+    accounts_account_exists_expect("a_account");
+
+    gboolean result = cmd_account(args, *help);
+    assert_true(result);
+
+    free(help);
+}
+
+void cmd_account_clear_shows_message_when_account_doesnt_exist(void **state)
+{
+    mock_cons_show();
+    mock_accounts_account_exists();
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    gchar *args[] = { "clear", "a_account", "a_property", NULL };
+
+    accounts_account_exists_return(FALSE);
+
+    expect_cons_show("Account a_account doesn't exist");
+    expect_cons_show("");
+
+    gboolean result = cmd_account(args, *help);
+    assert_true(result);
+
+    free(help);
+}
+
+void cmd_account_clear_shows_message_when_invalid_property(void **state)
+{
+    mock_cons_show();
+    mock_accounts_account_exists();
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    gchar *args[] = { "clear", "a_account", "badproperty", NULL };
+
+    accounts_account_exists_return(TRUE);
+
+    expect_cons_show("Invalid property: badproperty");
+    expect_cons_show("");
+
+    gboolean result = cmd_account(args, *help);
+    assert_true(result);
+
+    free(help);
+    
+}
diff --git a/tests/test_cmd_account.h b/tests/test_cmd_account.h
index d4730652..dcf1b8ee 100644
--- a/tests/test_cmd_account.h
+++ b/tests/test_cmd_account.h
@@ -56,3 +56,8 @@ void cmd_account_set_priority_too_high_shows_message(void **state);
 void cmd_account_set_priority_when_not_number_shows_message(void **state);
 void cmd_account_set_priority_when_empty_shows_message(void **state);
 void cmd_account_set_priority_updates_presence_when_account_connected_with_presence(void **state);
+void cmd_account_clear_shows_usage_when_no_args(void **state);
+void cmd_account_clear_shows_usage_when_one_arg(void **state);
+void cmd_account_clear_checks_account_exists(void **state);
+void cmd_account_clear_shows_message_when_account_doesnt_exist(void **state);
+void cmd_account_clear_shows_message_when_invalid_property(void **state);
diff --git a/tests/testsuite.c b/tests/testsuite.c
index 62bbfc63..e906c358 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -247,6 +247,11 @@ int main(int argc, char* argv[]) {
         unit_test(cmd_account_set_priority_when_not_number_shows_message),
         unit_test(cmd_account_set_priority_when_empty_shows_message),
         unit_test(cmd_account_set_priority_updates_presence_when_account_connected_with_presence),
+        unit_test(cmd_account_clear_shows_usage_when_no_args),
+        unit_test(cmd_account_clear_shows_usage_when_one_arg),
+        unit_test(cmd_account_clear_checks_account_exists),
+        unit_test(cmd_account_clear_shows_message_when_account_doesnt_exist),
+        unit_test(cmd_account_clear_shows_message_when_invalid_property),
     };
     return run_tests(tests);
 }