diff --git a/tests/weston-test.c b/tests/weston-test.c
index af62676e..7744ad85 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -259,17 +259,17 @@ test_surface_committed(struct weston_surface *surface,
 	struct weston_test *test = test_surface->test;
 	struct weston_coord_global pos;
 
+	weston_surface_map(test_surface->surface);
+
 	if (wl_list_empty(&test_surface->view->layer_link.link))
 		weston_layer_entry_insert(&test->layer.view_list,
 					  &test_surface->view->layer_link);
+	test_surface->view->is_mapped = true;
 
 	pos.c = weston_coord(test_surface->x, test_surface->y);
 	weston_view_set_position(test_surface->view, pos);
 
 	weston_view_update_transform(test_surface->view);
-
-	weston_surface_map(test_surface->surface);
-	test_surface->view->is_mapped = true;
 }
 
 static int