diff --git a/test/Makefile.am b/test/Makefile.am
index 392d904a..ba05729e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -53,21 +53,21 @@ liblitest_la_SOURCES = \
 	litest-device-trackpoint.c \
 	litest-device-touch-screen.c \
 	litest-device-touchscreen-fuzz.c \
-	litest-device-wacom-bamboo-tablet.c \
-	litest-device-wacom-cintiq-tablet.c \
+	litest-device-wacom-bamboo-16fg-pen.c \
+	litest-device-wacom-cintiq-12wx-pen.c \
 	litest-device-wacom-cintiq-13hdt-finger.c \
 	litest-device-wacom-cintiq-13hdt-pad.c \
 	litest-device-wacom-cintiq-13hdt-pen.c \
-	litest-device-wacom-cintiq-24hd.c \
+	litest-device-wacom-cintiq-24hd-pen.c \
 	litest-device-wacom-cintiq-24hdt-pad.c \
 	litest-device-wacom-ekr.c \
 	litest-device-wacom-hid4800-pen.c \
-	litest-device-wacom-intuos-tablet.c \
 	litest-device-wacom-intuos3-pad.c \
+	litest-device-wacom-intuos5-finger.c \
 	litest-device-wacom-intuos5-pad.c \
-	litest-device-wacom-isdv4-tablet.c \
-	litest-device-wacom-touch.c \
-	litest-device-wacom-intuos-finger.c \
+	litest-device-wacom-intuos5-pen.c \
+	litest-device-wacom-isdv4-e6-pen.c \
+	litest-device-wacom-isdv4-e6-finger.c \
 	litest-device-waltop-tablet.c \
 	litest-device-wheel-only.c \
 	litest-device-xen-virtual-pointer.c \
diff --git a/test/litest-device-wacom-bamboo-tablet.c b/test/litest-device-wacom-bamboo-16fg-pen.c
similarity index 100%
rename from test/litest-device-wacom-bamboo-tablet.c
rename to test/litest-device-wacom-bamboo-16fg-pen.c
diff --git a/test/litest-device-wacom-cintiq-tablet.c b/test/litest-device-wacom-cintiq-12wx-pen.c
similarity index 100%
rename from test/litest-device-wacom-cintiq-tablet.c
rename to test/litest-device-wacom-cintiq-12wx-pen.c
diff --git a/test/litest-device-wacom-cintiq-24hd.c b/test/litest-device-wacom-cintiq-24hd-pen.c
similarity index 100%
rename from test/litest-device-wacom-cintiq-24hd.c
rename to test/litest-device-wacom-cintiq-24hd-pen.c
diff --git a/test/litest-device-wacom-intuos-finger.c b/test/litest-device-wacom-intuos5-finger.c
similarity index 100%
rename from test/litest-device-wacom-intuos-finger.c
rename to test/litest-device-wacom-intuos5-finger.c
diff --git a/test/litest-device-wacom-intuos-tablet.c b/test/litest-device-wacom-intuos5-pen.c
similarity index 100%
rename from test/litest-device-wacom-intuos-tablet.c
rename to test/litest-device-wacom-intuos5-pen.c
diff --git a/test/litest-device-wacom-touch.c b/test/litest-device-wacom-isdv4-e6-finger.c
similarity index 100%
rename from test/litest-device-wacom-touch.c
rename to test/litest-device-wacom-isdv4-e6-finger.c
diff --git a/test/litest-device-wacom-isdv4-tablet.c b/test/litest-device-wacom-isdv4-e6-pen.c
similarity index 100%
rename from test/litest-device-wacom-isdv4-tablet.c
rename to test/litest-device-wacom-isdv4-e6-pen.c