diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c
index c7ab4e55..1a1b4f13 100644
--- a/tests/weston-test-client-helper.c
+++ b/tests/weston-test-client-helper.c
@@ -442,12 +442,21 @@ static const struct wl_registry_listener registry_listener = {
 	handle_global
 };
 
+static void
+log_handler(const char *fmt, va_list args)
+{
+	fprintf(stderr, "libwayland: ");
+	vfprintf(stderr, fmt, args);
+}
+
 struct client *
 client_create(int x, int y, int width, int height)
 {
 	struct client *client;
 	struct surface *surface;
 
+	wl_log_set_handler_client(log_handler);
+
 	/* connect to display */
 	client = calloc(1, sizeof *client);
 	client->wl_display = wl_display_connect(NULL);