diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c
index 1019ba57..b58795b5 100644
--- a/tests/weston-test-client-helper.c
+++ b/tests/weston-test-client-helper.c
@@ -545,7 +545,7 @@ test_handle_capture_screenshot_done(void *data, struct weston_test *weston_test)
 	struct test *test = data;
 
 	testlog("Screenshot has been captured\n");
-	test->buffer_copy_done = 1;
+	test->buffer_copy_done = true;
 }
 
 static const struct weston_test_listener test_listener = {
@@ -1618,11 +1618,11 @@ capture_screenshot_of_output(struct client *client)
 					    client->output->width,
 					    client->output->height);
 
-	client->test->buffer_copy_done = 0;
+	client->test->buffer_copy_done = false;
 	weston_test_capture_screenshot(client->test->weston_test,
 				       client->output->wl_output,
 				       buffer->proxy);
-	while (client->test->buffer_copy_done == 0)
+	while (client->test->buffer_copy_done == false)
 		if (wl_display_dispatch(client->wl_display) < 0)
 			break;
 
diff --git a/tests/weston-test-client-helper.h b/tests/weston-test-client-helper.h
index 5ce79154..e615964b 100644
--- a/tests/weston-test-client-helper.h
+++ b/tests/weston-test-client-helper.h
@@ -72,7 +72,7 @@ struct test {
 	int pointer_x;
 	int pointer_y;
 	uint32_t n_egl_buffers;
-	int buffer_copy_done;
+	bool buffer_copy_done;
 };
 
 struct input {