diff --git a/src/wayland-client.c b/src/wayland-client.c
index 5ab000c6..4d0637b5 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -502,7 +502,7 @@ wl_display_connect_to_fd(int fd)
 	const char *debug;
 
 	debug = getenv("WAYLAND_DEBUG");
-	if (debug)
+	if (debug && (strstr(debug, "client") || strstr(debug, "1")))
 		wl_debug = 1;
 
 	display = malloc(sizeof *display);
diff --git a/src/wayland-server.c b/src/wayland-server.c
index acbab9a3..f7f4c149 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -1078,7 +1078,7 @@ wl_display_create(void)
 	const char *debug;
 
 	debug = getenv("WAYLAND_DEBUG");
-	if (debug)
+	if (debug && (strstr(debug, "server") || strstr(debug, "1")))
 		wl_debug = 1;
 
 	display = malloc(sizeof *display);