diff --git a/test/Makefile.am b/test/Makefile.am
index d3c573a4..df62a172 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,34 +13,34 @@ noinst_LTLIBRARIES = liblitest.la
 liblitest_la_SOURCES = \
 	litest.h \
 	litest-int.h \
-	litest-alps-semi-mt.c \
-	litest-alps-dualpoint.c \
-	litest-atmel-hover.c \
-	litest-bcm5974.c \
-	litest-generic-singletouch.c \
-	litest-keyboard.c \
-	litest-keyboard-razer-blackwidow.c \
-	litest-logitech-trackball.c \
-	litest-nexus4-touch-screen.c \
-	litest-magic-trackpad.c \
-	litest-mouse.c \
-	litest-mouse-roccat.c \
-	litest-mouse-low-dpi.c \
-	litest-ms-surface-cover.c \
-	litest-protocol-a-touch-screen.c \
-	litest-qemu-usb-tablet.c \
-	litest-synaptics.c \
-	litest-synaptics-hover.c \
-	litest-synaptics-st.c \
-	litest-synaptics-t440.c \
-	litest-synaptics-x1-carbon-3rd.c \
-	litest-trackpoint.c \
-	litest-touch-screen.c \
-	litest-wacom-touch.c \
-	litest-wacom-intuos-finger.c \
-	litest-wheel-only.c \
-	litest-xen-virtual-pointer.c \
-	litest-vmware-virtual-usb-mouse.c \
+	litest-device-alps-semi-mt.c \
+	litest-device-alps-dualpoint.c \
+	litest-device-atmel-hover.c \
+	litest-device-bcm5974.c \
+	litest-device-generic-singletouch.c \
+	litest-device-keyboard.c \
+	litest-device-keyboard-razer-blackwidow.c \
+	litest-device-logitech-trackball.c \
+	litest-device-nexus4-touch-screen.c \
+	litest-device-magic-trackpad.c \
+	litest-device-mouse.c \
+	litest-device-mouse-roccat.c \
+	litest-device-mouse-low-dpi.c \
+	litest-device-ms-surface-cover.c \
+	litest-device-protocol-a-touch-screen.c \
+	litest-device-qemu-usb-tablet.c \
+	litest-device-synaptics.c \
+	litest-device-synaptics-hover.c \
+	litest-device-synaptics-st.c \
+	litest-device-synaptics-t440.c \
+	litest-device-synaptics-x1-carbon-3rd.c \
+	litest-device-trackpoint.c \
+	litest-device-touch-screen.c \
+	litest-device-wacom-touch.c \
+	litest-device-wacom-intuos-finger.c \
+	litest-device-wheel-only.c \
+	litest-device-xen-virtual-pointer.c \
+	litest-device-vmware-virtual-usb-mouse.c \
 	litest.c
 liblitest_la_LIBADD = $(top_builddir)/src/libinput-util.la
 liblitest_la_CFLAGS = $(AM_CFLAGS) \
diff --git a/test/litest-alps-dualpoint.c b/test/litest-device-alps-dualpoint.c
similarity index 100%
rename from test/litest-alps-dualpoint.c
rename to test/litest-device-alps-dualpoint.c
diff --git a/test/litest-alps-semi-mt.c b/test/litest-device-alps-semi-mt.c
similarity index 100%
rename from test/litest-alps-semi-mt.c
rename to test/litest-device-alps-semi-mt.c
diff --git a/test/litest-atmel-hover.c b/test/litest-device-atmel-hover.c
similarity index 100%
rename from test/litest-atmel-hover.c
rename to test/litest-device-atmel-hover.c
diff --git a/test/litest-bcm5974.c b/test/litest-device-bcm5974.c
similarity index 100%
rename from test/litest-bcm5974.c
rename to test/litest-device-bcm5974.c
diff --git a/test/litest-generic-singletouch.c b/test/litest-device-generic-singletouch.c
similarity index 100%
rename from test/litest-generic-singletouch.c
rename to test/litest-device-generic-singletouch.c
diff --git a/test/litest-keyboard-razer-blackwidow.c b/test/litest-device-keyboard-razer-blackwidow.c
similarity index 100%
rename from test/litest-keyboard-razer-blackwidow.c
rename to test/litest-device-keyboard-razer-blackwidow.c
diff --git a/test/litest-keyboard.c b/test/litest-device-keyboard.c
similarity index 100%
rename from test/litest-keyboard.c
rename to test/litest-device-keyboard.c
diff --git a/test/litest-logitech-trackball.c b/test/litest-device-logitech-trackball.c
similarity index 100%
rename from test/litest-logitech-trackball.c
rename to test/litest-device-logitech-trackball.c
diff --git a/test/litest-magic-trackpad.c b/test/litest-device-magic-trackpad.c
similarity index 100%
rename from test/litest-magic-trackpad.c
rename to test/litest-device-magic-trackpad.c
diff --git a/test/litest-mouse-low-dpi.c b/test/litest-device-mouse-low-dpi.c
similarity index 100%
rename from test/litest-mouse-low-dpi.c
rename to test/litest-device-mouse-low-dpi.c
diff --git a/test/litest-mouse-roccat.c b/test/litest-device-mouse-roccat.c
similarity index 100%
rename from test/litest-mouse-roccat.c
rename to test/litest-device-mouse-roccat.c
diff --git a/test/litest-mouse.c b/test/litest-device-mouse.c
similarity index 100%
rename from test/litest-mouse.c
rename to test/litest-device-mouse.c
diff --git a/test/litest-ms-surface-cover.c b/test/litest-device-ms-surface-cover.c
similarity index 100%
rename from test/litest-ms-surface-cover.c
rename to test/litest-device-ms-surface-cover.c
diff --git a/test/litest-nexus4-touch-screen.c b/test/litest-device-nexus4-touch-screen.c
similarity index 100%
rename from test/litest-nexus4-touch-screen.c
rename to test/litest-device-nexus4-touch-screen.c
diff --git a/test/litest-protocol-a-touch-screen.c b/test/litest-device-protocol-a-touch-screen.c
similarity index 100%
rename from test/litest-protocol-a-touch-screen.c
rename to test/litest-device-protocol-a-touch-screen.c
diff --git a/test/litest-qemu-usb-tablet.c b/test/litest-device-qemu-usb-tablet.c
similarity index 100%
rename from test/litest-qemu-usb-tablet.c
rename to test/litest-device-qemu-usb-tablet.c
diff --git a/test/litest-synaptics-hover.c b/test/litest-device-synaptics-hover.c
similarity index 100%
rename from test/litest-synaptics-hover.c
rename to test/litest-device-synaptics-hover.c
diff --git a/test/litest-synaptics-st.c b/test/litest-device-synaptics-st.c
similarity index 100%
rename from test/litest-synaptics-st.c
rename to test/litest-device-synaptics-st.c
diff --git a/test/litest-synaptics-t440.c b/test/litest-device-synaptics-t440.c
similarity index 100%
rename from test/litest-synaptics-t440.c
rename to test/litest-device-synaptics-t440.c
diff --git a/test/litest-synaptics-x1-carbon-3rd.c b/test/litest-device-synaptics-x1-carbon-3rd.c
similarity index 100%
rename from test/litest-synaptics-x1-carbon-3rd.c
rename to test/litest-device-synaptics-x1-carbon-3rd.c
diff --git a/test/litest-synaptics.c b/test/litest-device-synaptics.c
similarity index 100%
rename from test/litest-synaptics.c
rename to test/litest-device-synaptics.c
diff --git a/test/litest-touch-screen.c b/test/litest-device-touch-screen.c
similarity index 100%
rename from test/litest-touch-screen.c
rename to test/litest-device-touch-screen.c
diff --git a/test/litest-trackpoint.c b/test/litest-device-trackpoint.c
similarity index 100%
rename from test/litest-trackpoint.c
rename to test/litest-device-trackpoint.c
diff --git a/test/litest-vmware-virtual-usb-mouse.c b/test/litest-device-vmware-virtual-usb-mouse.c
similarity index 100%
rename from test/litest-vmware-virtual-usb-mouse.c
rename to test/litest-device-vmware-virtual-usb-mouse.c
diff --git a/test/litest-wacom-intuos-finger.c b/test/litest-device-wacom-intuos-finger.c
similarity index 100%
rename from test/litest-wacom-intuos-finger.c
rename to test/litest-device-wacom-intuos-finger.c
diff --git a/test/litest-wacom-touch.c b/test/litest-device-wacom-touch.c
similarity index 100%
rename from test/litest-wacom-touch.c
rename to test/litest-device-wacom-touch.c
diff --git a/test/litest-wheel-only.c b/test/litest-device-wheel-only.c
similarity index 100%
rename from test/litest-wheel-only.c
rename to test/litest-device-wheel-only.c
diff --git a/test/litest-xen-virtual-pointer.c b/test/litest-device-xen-virtual-pointer.c
similarity index 100%
rename from test/litest-xen-virtual-pointer.c
rename to test/litest-device-xen-virtual-pointer.c