diff --git a/test/test-udev.c b/test/test-udev.c
index 8cc0bb14..89dca79d 100644
--- a/test/test-udev.c
+++ b/test/test-udev.c
@@ -262,20 +262,15 @@ START_TEST(udev_change_seat)
 	litest_assert_int_eq(rc, 0);
 
 	litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_REMOVED);
-	litest_dispatch(li);
-
 	event = libinput_get_event(li);
-	litest_assert_enum_eq(libinput_event_get_type(event),
-			 LIBINPUT_EVENT_DEVICE_REMOVED);
-
-	litest_assert(libinput_event_get_device(event) == device);
+	litest_assert_event_type(event, LIBINPUT_EVENT_DEVICE_REMOVED);
+	litest_assert_ptr_eq(libinput_event_get_device(event), device);
 	libinput_event_destroy(event);
 
 	litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED);
 	event = libinput_get_event(li);
-	litest_assert_enum_eq(libinput_event_get_type(event),
-			 LIBINPUT_EVENT_DEVICE_ADDED);
-	litest_assert(libinput_event_get_device(event) != device);
+	litest_assert_event_type(event, LIBINPUT_EVENT_DEVICE_ADDED);
+	litest_assert_ptr_ne(libinput_event_get_device(event), device);
 	libinput_device_unref(device);
 
 	device = libinput_event_get_device(event);