diff --git a/test/litest-device-wacom-cintiq-12wx-pen.c b/test/litest-device-wacom-cintiq-12wx-pen.c
index e9c4f684..0e900c97 100644
--- a/test/litest-device-wacom-cintiq-12wx-pen.c
+++ b/test/litest-device-wacom-cintiq-12wx-pen.c
@@ -137,8 +137,8 @@ static int events[] = {
 	-1, -1,
 };
 
-TEST_DEVICE("wacom-cintiq-tablet",
-	.type = LITEST_WACOM_CINTIQ,
+TEST_DEVICE("wacom-cintiq-12wx",
+	.type = LITEST_WACOM_CINTIQ_12WX,
 	.features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT | LITEST_DIRECT | LITEST_HOVER,
 	.interface = &interface,
 
diff --git a/test/litest.h b/test/litest.h
index e985dc04..8171e081 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -455,7 +455,7 @@ enum litest_device_type {
 	LITEST_WACOM_BAMBOO_2FG_PAD,
 	LITEST_WACOM_BAMBOO_2FG_PEN,
 	LITEST_WACOM_CALIBRATED_TABLET,
-	LITEST_WACOM_CINTIQ,
+	LITEST_WACOM_CINTIQ_12WX,
 	LITEST_WACOM_CINTIQ_13HDT_FINGER,
 	LITEST_WACOM_CINTIQ_13HDT_PAD,
 	LITEST_WACOM_CINTIQ_13HDT_PEN,
diff --git a/test/test-misc.c b/test/test-misc.c
index aada187f..7ab27164 100644
--- a/test/test-misc.c
+++ b/test/test-misc.c
@@ -887,7 +887,7 @@ TEST_COLLECTION(misc)
 	litest_add_for_device(event_conversion_key, LITEST_KEYBOARD);
 	litest_add_for_device(event_conversion_touch, LITEST_WACOM_TOUCH);
 	litest_add_for_device(event_conversion_gesture, LITEST_BCM5974);
-	litest_add_for_device(event_conversion_tablet, LITEST_WACOM_CINTIQ);
+	litest_add_for_device(event_conversion_tablet, LITEST_WACOM_CINTIQ_12WX);
 	litest_add_for_device(event_conversion_tablet_pad, LITEST_WACOM_INTUOS5_PAD);
 	litest_add_for_device(event_conversion_switch, LITEST_LID_SWITCH);
 
diff --git a/test/test-tablet.c b/test/test-tablet.c
index 8c5e6a0e..fe1b5aa6 100644
--- a/test/test-tablet.c
+++ b/test/test-tablet.c
@@ -7205,7 +7205,7 @@ TEST_COLLECTION(tablet_left_handed)
 	litest_add_for_device(left_handed_tilt, LITEST_WACOM_INTUOS);
 	litest_add_for_device(left_handed_mouse_rotation, LITEST_WACOM_INTUOS);
 	litest_add_for_device(left_handed_artpen_rotation, LITEST_WACOM_INTUOS);
-	litest_add_for_device(no_left_handed, LITEST_WACOM_CINTIQ);
+	litest_add_for_device(no_left_handed, LITEST_WACOM_CINTIQ_12WX);
 
 	litest_with_parameters(params,
 			       "tablet_from", 'b',