diff --git a/test/test-ei.c b/test/test-ei.c
index 096c70d..1e3f72e 100644
--- a/test/test-ei.c
+++ b/test/test-ei.c
@@ -129,9 +129,8 @@ MUNIT_TEST(test_ei_disconnect_after_add_after_received)
 
 	with_server(peck) {
 		eis_dispatch(eis);
-		_cleanup_eis_event_ struct eis_event *e = eis_get_event(eis);
-		munit_assert_ptr_not_null(e);
-		munit_assert_int(eis_event_get_type(e), ==, EIS_EVENT_CLIENT_CONNECT);
+		_cleanup_eis_event_ struct eis_event *e =
+			peck_eis_next_event(eis, EIS_EVENT_CLIENT_CONNECT);
 		client = eis_client_ref(eis_event_get_client(e));
 		eis_client_connect(client);
 	}
@@ -173,9 +172,8 @@ MUNIT_TEST(test_ei_disconnect_after_remove_before_received)
 
 	with_server(peck) {
 		eis_dispatch(eis);
-		_cleanup_eis_event_ struct eis_event *e = eis_get_event(eis);
-		munit_assert_ptr_not_null(e);
-		munit_assert_int(eis_event_get_type(e), ==, EIS_EVENT_CLIENT_CONNECT);
+		_cleanup_eis_event_ struct eis_event *e =
+			peck_eis_next_event(eis, EIS_EVENT_CLIENT_CONNECT);
 		client = eis_client_ref(eis_event_get_client(e));
 		eis_client_connect(client);
 	}
@@ -228,9 +226,8 @@ MUNIT_TEST(test_ei_disconnect_after_remove_after_received)
 
 	with_server(peck) {
 		eis_dispatch(eis);
-		_cleanup_eis_event_ struct eis_event *e = eis_get_event(eis);
-		munit_assert_ptr_not_null(e);
-		munit_assert_int(eis_event_get_type(e), ==, EIS_EVENT_CLIENT_CONNECT);
+		_cleanup_eis_event_ struct eis_event *e =
+			peck_eis_next_event(eis, EIS_EVENT_CLIENT_CONNECT);
 		client = eis_client_ref(eis_event_get_client(e));
 		eis_client_connect(client);
 	}
@@ -345,9 +342,8 @@ MUNIT_TEST(test_ei_device_add)
 	peck_dispatch_until_stable(peck);
 
 	with_client(peck) {
-		_cleanup_ei_event_ struct ei_event *event = ei_get_event(ei);
-		munit_assert_ptr_not_null(event);
-		munit_assert_int(ei_event_get_type(event), ==, EI_EVENT_DEVICE_ADDED);
+		_cleanup_ei_event_ struct ei_event *event =
+			peck_ei_next_event(ei, EI_EVENT_DEVICE_ADDED);
 
 		struct ei_device *added = ei_event_get_device(event);
 		munit_assert_ptr_equal(device, added);
@@ -382,9 +378,8 @@ MUNIT_TEST(test_ei_device_add_drop_caps)
 	with_client(peck) {
 		ei_dispatch(ei);
 
-		_cleanup_ei_event_ struct ei_event *event = ei_get_event(ei);
-		munit_assert_ptr_not_null(event);
-		munit_assert_int(ei_event_get_type(event), ==, EI_EVENT_DEVICE_ADDED);
+		_cleanup_ei_event_ struct ei_event *event =
+			peck_ei_next_event(ei, EI_EVENT_DEVICE_ADDED);
 
 		struct ei_device *d = ei_event_get_device(event);
 		munit_assert_ptr_equal(d, device);
@@ -420,9 +415,8 @@ MUNIT_TEST(test_ei_device_add_zero_caps)
 	with_client(peck) {
 		ei_dispatch(ei);
 
-		_cleanup_ei_event_ struct ei_event *event = ei_get_event(ei);
-		munit_assert_ptr_not_null(event);
-		munit_assert_int(ei_event_get_type(event), ==, EI_EVENT_DEVICE_REMOVED);
+		_cleanup_ei_event_ struct ei_event *event =
+			peck_ei_next_event(ei, EI_EVENT_DEVICE_REMOVED);
 	}
 
 	return MUNIT_OK;