diff --git a/test/get-xrender-format.c b/test/get-xrender-format.c
index 0c9ce9a3d..6678249e6 100644
--- a/test/get-xrender-format.c
+++ b/test/get-xrender-format.c
@@ -106,9 +106,12 @@ main (void)
 	return CAIRO_TEST_FAILURE;
     }
 
+    cairo_surface_destroy (surface);
 
     XCloseDisplay (dpy);
 
+    cairo_debug_reset_static_data ();
+
     cairo_test_fini ();
 
     return CAIRO_TEST_SUCCESS;