diff --git a/test/test-touchpad-tap.c b/test/test-touchpad-tap.c
index 98e72efb..6471d9c0 100644
--- a/test/test-touchpad-tap.c
+++ b/test/test-touchpad-tap.c
@@ -3403,6 +3403,8 @@ START_TEST(touchpad_tap_palm_dwt_tap)
 	libinput_dispatch(li);
 
 	litest_assert_empty_queue(li);
+
+	litest_delete_device(keyboard);
 }
 END_TEST
 
diff --git a/test/test-touchpad.c b/test/test-touchpad.c
index b4b28f08..eb21b96b 100644
--- a/test/test-touchpad.c
+++ b/test/test-touchpad.c
@@ -6068,7 +6068,7 @@ START_TEST(touchpad_suspend_abba)
 			continue;
 
 		if (other == SUSPEND_EXT_MOUSE && litest_touchpad_is_external(tp))
-			return;
+			goto out;
 
 		/* That transition is tested elsewhere and has a different
 		 * behavior */
@@ -6167,6 +6167,7 @@ START_TEST(touchpad_suspend_abba)
 		assert_touchpad_moves(tp);
 	}
 
+out:
 	litest_delete_device(lid);
 	litest_delete_device(tabletmode);
 	litest_delete_device(extmouse);
@@ -6201,7 +6202,7 @@ START_TEST(touchpad_suspend_abab)
 			continue;
 
 		if (other == SUSPEND_EXT_MOUSE && litest_touchpad_is_external(tp))
-			return;
+			goto out;
 
 		/* That transition is tested elsewhere and has a different
 		 * behavior */
@@ -6317,6 +6318,7 @@ START_TEST(touchpad_suspend_abab)
 		assert_touchpad_moves(tp);
 	}
 
+out:
 	litest_delete_device(lid);
 	litest_delete_device(tabletmode);
 	litest_delete_device(extmouse);