diff --git a/tests/queue-test.c b/tests/queue-test.c
index d1bf37f9..9eb913c0 100644
--- a/tests/queue-test.c
+++ b/tests/queue-test.c
@@ -207,7 +207,7 @@ dummy_bind(struct wl_client *client,
 {
 }
 
-TEST(queue)
+TEST(queue_proxy_destroy)
 {
 	struct display *d;
 	const struct wl_interface *dummy_interfaces[] = {
@@ -230,9 +230,27 @@ TEST(queue)
 	client_create(d, client_test_proxy_destroy);
 	display_run(d);
 
+	display_destroy(d);
+}
+
+TEST(queue_multiple_queues)
+{
+	struct display *d = display_create();
+
+	test_set_timeout(2);
+
 	client_create(d, client_test_multiple_queues);
 	display_run(d);
 
+	display_destroy(d);
+}
+
+TEST(queue_roundtrip)
+{
+	struct display *d = display_create();
+
+	test_set_timeout(2);
+
 	client_create(d, client_test_queue_roundtrip);
 	display_run(d);