diff --git a/tests/weston-test.c b/tests/weston-test.c
index dd83eac29..092f3e500 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -822,8 +822,7 @@ handle_compositor_destroy(struct wl_listener *listener,
 
 	data->wl_client = NULL;
 
-	wl_list_remove(&test->layer.view_list.link);
-	wl_list_remove(&test->layer.link);
+	weston_layer_fini(&test->layer);
 
 	weston_log_scope_destroy(test->log);
 	free(test);
@@ -888,6 +887,8 @@ out_free:
 		free(to);
 	}
 
+	weston_layer_fini(&test->layer);
+
 	wl_list_remove(&test->output_destroyed_listener.link);
 	wl_list_remove(&test->destroy_listener.link);
 	free(test);