diff --git a/test/test-ei-device.c b/test/test-ei-device.c
index 77999da..b9f77c4 100644
--- a/test/test-ei-device.c
+++ b/test/test-ei-device.c
@@ -768,56 +768,3 @@ MUNIT_TEST(test_ei_keymap_set)
 
 	return MUNIT_OK;
 }
-
-MUNIT_TEST(test_ei_keymap_null)
-{
-	/* FIXME: needs review after the switch to server-side devices */
-	return MUNIT_SKIP;
-#if 0
-	const char data[5] = {1, 2, 3, 4, 5};
-	_unref_(peck) *peck = peck_new();
-	_unref_(memfile) *fd = memfile_new(data, sizeof(data));
-
-	peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_ACCEPT_CLIENT);
-	peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_DEFAULT_SEAT);
-	peck_enable_ei_behavior(peck, PECK_EI_BEHAVIOR_AUTOCONNNECT);
-	peck_dispatch_until_stable(peck);
-
-	with_client(peck) {
-		struct ei_seat *seat = peck_ei_get_default_seat(peck);
-		_unref_(ei_device) *device = ei_device_new(seat);
-		ei_device_configure_name(device, __func__);
-		ei_device_configure_capability(device, EI_DEVICE_CAP_KEYBOARD);
-
-		_unref_(ei_keymap) *keymap =
-			ei_keymap_new(EI_KEYMAP_TYPE_XKB, memfile_get_fd(fd), memfile_get_size(fd));
-		ei_device_keyboard_configure_keymap(device, keymap);
-		ei_device_add(device);
-	}
-
-	peck_dispatch_until_stable(peck);
-
-	/* server sets the keymap to NULL */
-	with_server(peck) {
-		_unref_(eis_event) *event =
-			peck_eis_next_event(eis, EIS_EVENT_DEVICE_ADDED);
-		struct eis_device *device = eis_event_get_device(event);
-		eis_device_keyboard_set_keymap(device, NULL);
-		eis_device_allow_capability(device, EIS_DEVICE_CAP_KEYBOARD);
-		eis_device_connect(device);
-	}
-
-	peck_dispatch_until_stable(peck);
-
-	with_client(peck) {
-		_unref_(ei_event) *event =
-			peck_ei_next_event(ei, EI_EVENT_DEVICE_ADDED);
-		struct ei_device *device = ei_event_get_device(event);
-
-		struct ei_keymap *keymap = ei_device_keyboard_get_keymap(device);
-		munit_assert_ptr_null(keymap);
-	}
-
-	return MUNIT_OK;
-#endif
-}