diff --git a/tests/roles-test.c b/tests/roles-test.c
index c7d175b..09cc155 100644
--- a/tests/roles-test.c
+++ b/tests/roles-test.c
@@ -91,7 +91,7 @@
 	struct wl_shell *shell;
 	struct wl_shell_surface *shsurf;
 
-	client = client_create(100, 50, 123, 77);
+	client = create_client_and_test_surface(100, 50, 123, 77);
 	assert(client);
 
 	subco = get_subcompositor(client);
@@ -119,7 +119,7 @@
 	struct wl_shell *shell;
 	struct wl_shell_surface *shsurf;
 
-	client = client_create(100, 50, 123, 77);
+	client = create_client_and_test_surface(100, 50, 123, 77);
 	assert(client);
 
 	subco = get_subcompositor(client);