diff --git a/server/tests/test-display-base.c b/server/tests/test-display-base.c
index 55e37a5c..636c505c 100644
--- a/server/tests/test-display-base.c
+++ b/server/tests/test-display-base.c
@@ -908,6 +908,13 @@ Test *test_new(SpiceCoreInterface *core)
     return test;
 }
 
+void test_destroy(Test *test)
+{
+    test->core->timer_remove(test->wakeup_timer);
+    spice_server_destroy(test->server);
+    free(test);
+}
+
 static void init_automated(void)
 {
     struct sigaction sa;
diff --git a/server/tests/test-display-base.h b/server/tests/test-display-base.h
index 7b5b509c..bdf7a11c 100644
--- a/server/tests/test-display-base.h
+++ b/server/tests/test-display-base.h
@@ -137,6 +137,7 @@ void test_set_command_list(Test *test, Command *command, int num_commands);
 void test_add_display_interface(Test *test);
 void test_add_agent_interface(SpiceServer *server); // TODO - Test *test
 Test* test_new(SpiceCoreInterface* core);
+void test_destroy(Test *test);
 
 uint32_t test_get_width(void);
 uint32_t test_get_height(void);