diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c
index 1234c629..264dc0d5 100644
--- a/tests/weston-test-client-helper.c
+++ b/tests/weston-test-client-helper.c
@@ -84,6 +84,10 @@ move_client(struct client *client, int x, int y)
 	client->surface->y = y;
 	wl_test_move_surface(client->test->wl_test, surface->wl_surface,
 			     surface->x, surface->y);
+	/* The attach here is necessary because commit() will call congfigure
+	 * only on surfaces newly attached, and the one that sets the surface
+	 * position is the configure. */
+	wl_surface_attach(surface->wl_surface, surface->wl_buffer, 0, 0);
 	wl_surface_damage(surface->wl_surface, 0, 0, surface->width,
 			  surface->height);
 
@@ -516,7 +520,6 @@ client_create(int x, int y, int width, int height)
 					       &surface->data);
 
 	memset(surface->data, 64, width * height * 4);
-	wl_surface_attach(surface->wl_surface, surface->wl_buffer, 0, 0);
 
 	move_client(client, x, y);