diff --git a/src/tests/wayland-test-clients/idle-inhibit.c b/src/tests/wayland-test-clients/idle-inhibit.c
index 953db2b92..b3d2aa8ca 100644
--- a/src/tests/wayland-test-clients/idle-inhibit.c
+++ b/src/tests/wayland-test-clients/idle-inhibit.c
@@ -58,8 +58,8 @@ main (int    argc,
       char **argv)
 {
   struct wl_registry *registry;
-  g_autoptr (WaylandSurface) surface;
   g_autoptr (WaylandDisplay) display = NULL;
+  g_autoptr (WaylandSurface) surface = NULL;
   struct zwp_idle_inhibitor_v1 *inhibitor;
 
   display = wayland_display_new (WAYLAND_DISPLAY_CAPABILITY_TEST_DRIVER);
diff --git a/src/tests/wayland-test-clients/wayland-test-client-utils.h b/src/tests/wayland-test-clients/wayland-test-client-utils.h
index 87eb6894b..42a3fd802 100644
--- a/src/tests/wayland-test-clients/wayland-test-client-utils.h
+++ b/src/tests/wayland-test-clients/wayland-test-client-utils.h
@@ -62,6 +62,8 @@ G_DECLARE_FINAL_TYPE (WaylandDisplay, wayland_display,
 
 typedef struct _WaylandSurface
 {
+  GObject parent;
+
   WaylandDisplay *display;
 
   struct wl_surface *wl_surface;
diff --git a/src/tests/wayland-test-clients/xdg-foreign.c b/src/tests/wayland-test-clients/xdg-foreign.c
index fdc4f9f70..0a5dacf89 100644
--- a/src/tests/wayland-test-clients/xdg-foreign.c
+++ b/src/tests/wayland-test-clients/xdg-foreign.c
@@ -128,11 +128,11 @@ int
 main (int    argc,
       char **argv)
 {
+  g_autoptr (WaylandDisplay) display = NULL;
   g_autoptr (WaylandSurface) window1 = NULL;
   g_autoptr (WaylandSurface) window2 = NULL;
   g_autoptr (WaylandSurface) window3 = NULL;
   g_autoptr (WaylandSurface) window4 = NULL;
-  g_autoptr (WaylandDisplay) display = NULL;
   g_autofree char *handle1 = NULL;
   g_autofree char *handle3 = NULL;
   struct wl_registry *registry;