diff --git a/tests/devices-test.c b/tests/devices-test.c
index 6b154194..719f4595 100644
--- a/tests/devices-test.c
+++ b/tests/devices-test.c
@@ -106,6 +106,8 @@ TEST(seat_capabilities_test)
 	assert(cl->input->pointer);
 	assert(cl->input->keyboard);
 	assert(cl->input->touch);
+
+	client_destroy(cl);
 }
 
 #define COUNT 15
@@ -144,6 +146,8 @@ TEST(multiple_device_add_and_remove)
 	assert(cl->input->pointer);
 	assert(cl->input->keyboard);
 	assert(cl->input->touch);
+
+	client_destroy(cl);
 }
 
 TEST(device_release_before_destroy)
@@ -181,6 +185,8 @@ TEST(device_release_before_destroy)
 	client_roundtrip(cl);
 
 	assert(cl->input->caps == WL_SEAT_CAPABILITY_ALL);
+
+	client_destroy(cl);
 }
 
 TEST(device_release_before_destroy_multiple)
@@ -190,12 +196,6 @@ TEST(device_release_before_destroy_multiple)
 	/* if weston crashed during this test, then there is
 	 * some inconsistency */
 	for (i = 0; i < 30; ++i) {
-		/* Fifty times run the previous test. This will create
-		 * fifty clients, because we don't have any
-		 * way how to destroy them (worth of adding!). Only one
-		 * client will run at a time though and so should have no
-		 * effect on the result of the test (after the client
-		 * finishes its body, it just 'is' and does nothing). */
 		device_release_before_destroy();
 	}
 }
@@ -237,6 +237,8 @@ TEST(device_release_after_destroy)
 	client_roundtrip(cl);
 
 	assert(cl->input->caps == WL_SEAT_CAPABILITY_ALL);
+
+	client_destroy(cl);
 }
 
 TEST(device_release_after_destroy_multiple)
@@ -310,6 +312,8 @@ TEST(get_device_after_destroy)
 	client_roundtrip(cl);
 
 	assert(cl->input->caps == WL_SEAT_CAPABILITY_ALL);
+
+	client_destroy(cl);
 }
 
 TEST(get_device_after_destroy_multiple)
@@ -331,6 +335,8 @@ TEST(seats_have_names)
 	wl_list_for_each(input, &cl->inputs, link) {
 		assert(input->seat_name);
 	}
+
+	client_destroy(cl);
 }
 
 TEST(seat_destroy_and_recreate)
@@ -353,4 +359,6 @@ TEST(seat_destroy_and_recreate)
 	assert(cl->input->pointer);
 	assert(cl->input->keyboard);
 	assert(cl->input->touch);
+
+	client_destroy(cl);
 }