diff --git a/test/Makefile.am b/test/Makefile.am
index 82f5e538..c1c73b77 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,6 +13,7 @@ liblitest_la_SOURCES = \
 	litest-mouse.c \
 	litest-synaptics.c \
 	litest-trackpoint.c \
+	litest-wacom-touch.c \
 	litest.c
 
 run_tests = test-udev test-path
diff --git a/test/litest-wacom-touch.c b/test/litest-wacom-touch.c
new file mode 100644
index 00000000..a33e0852
--- /dev/null
+++ b/test/litest-wacom-touch.c
@@ -0,0 +1,138 @@
+/*
+ * Copyright © 2013 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "litest.h"
+#include "litest-int.h"
+#include "libinput-util.h"
+
+void litest_wacom_touch_setup(void)
+{
+	struct litest_device *d = litest_create_device(LITEST_WACOM_TOUCH);
+	litest_set_current_device(d);
+}
+
+void
+litest_wacom_touch_touch_down(struct litest_device *d,
+				     unsigned int slot,
+				     int x, int y)
+{
+	static int tracking_id;
+	struct input_event *ev;
+	struct input_event down[] = {
+		{ .type = EV_ABS, .code = ABS_X, .value = x  },
+		{ .type = EV_ABS, .code = ABS_Y, .value = y },
+		{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = slot },
+		{ .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = ++tracking_id },
+		{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = x },
+		{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = y },
+		{ .type = EV_KEY, .code = BTN_TOUCH, .value = 1 },
+		{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	};
+
+	down[0].value = litest_scale(d, ABS_X, x);
+	down[1].value = litest_scale(d, ABS_Y, y);
+	down[5].value = litest_scale(d, ABS_X, x);
+	down[6].value = litest_scale(d, ABS_Y, y);
+
+	ARRAY_FOR_EACH(down, ev)
+		litest_event(d, ev->type, ev->code, ev->value);
+}
+
+void
+litest_wacom_touch_move(struct litest_device *d,
+			       unsigned int slot,
+			       int x, int y)
+{
+	struct input_event *ev;
+	struct input_event move[] = {
+		{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = slot },
+		{ .type = EV_ABS, .code = ABS_X, .value = x  },
+		{ .type = EV_ABS, .code = ABS_Y, .value = y },
+		{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = x },
+		{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = y },
+		{ .type = EV_KEY, .code = BTN_TOUCH, .value = 1 },
+		{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	};
+
+	move[1].value = litest_scale(d, ABS_X, x);
+	move[2].value = litest_scale(d, ABS_Y, y);
+	move[3].value = litest_scale(d, ABS_X, x);
+	move[4].value = litest_scale(d, ABS_Y, y);
+
+	ARRAY_FOR_EACH(move, ev)
+		litest_event(d, ev->type, ev->code, ev->value);
+}
+
+static struct litest_device_interface interface = {
+	.touch_down = litest_wacom_touch_touch_down,
+	.touch_move = litest_wacom_touch_move,
+};
+
+void
+litest_create_wacom_touch(struct litest_device *d)
+{
+	struct libevdev *dev;
+	struct input_absinfo abs[] = {
+		{ ABS_X, 0, 2776, 75 },
+		{ ABS_Y, 0, 1569, 129 },
+		{ ABS_MT_SLOT, 0, 1, 0 },
+		{ ABS_MT_POSITION_X, 0, 2776, 0, 0, 10 },
+		{ ABS_MT_POSITION_Y, 0, 1569, 0, 0, 9 },
+		{ ABS_MT_TRACKING_ID, 0, 65535, 0 },
+	};
+	struct input_absinfo *a;
+	int rc;
+
+	d->interface = &interface;
+
+	dev = libevdev_new();
+	ck_assert(dev != NULL);
+
+	libevdev_set_name(dev, "Wacom ISDv4 E6 Finger");
+	libevdev_set_id_bustype(dev, 0x3);
+	libevdev_set_id_vendor(dev, 0x56a);
+	libevdev_set_id_product(dev, 0xe6);
+	libevdev_enable_event_code(dev, EV_KEY, BTN_TOUCH, NULL);
+	libevdev_enable_property(dev, INPUT_PROP_DIRECT);
+
+	ARRAY_FOR_EACH(abs, a)
+		libevdev_enable_event_code(dev, EV_ABS, a->value, a);
+
+	rc = libevdev_uinput_create_from_device(dev,
+						LIBEVDEV_UINPUT_OPEN_MANAGED,
+						&d->uinput);
+	ck_assert_int_eq(rc, 0);
+	libevdev_free(dev);
+}
+
+struct litest_test_device litest_wacom_touch_device = {
+	.type = LITEST_WACOM_TOUCH,
+	.features = LITEST_TOUCH,
+	.shortname = "wacom-touch",
+	.setup = litest_wacom_touch_setup,
+	.teardown = litest_generic_device_teardown,
+	.create = litest_create_wacom_touch,
+};
diff --git a/test/litest.c b/test/litest.c
index efab26c7..5235e3c2 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -80,6 +80,7 @@ extern struct litest_test_device litest_synaptics_clickpad_device;
 extern struct litest_test_device litest_trackpoint_device;
 extern struct litest_test_device litest_bcm5974_device;
 extern struct litest_test_device litest_mouse_device;
+extern struct litest_test_device litest_wacom_touch_device;
 
 struct litest_test_device* devices[] = {
 	&litest_synaptics_clickpad_device,
@@ -87,6 +88,7 @@ struct litest_test_device* devices[] = {
 	&litest_trackpoint_device,
 	&litest_bcm5974_device,
 	&litest_mouse_device,
+	&litest_wacom_touch_device,
 	NULL,
 };
 
@@ -316,9 +318,20 @@ close_restricted(int fd, void *userdata)
 	close(fd);
 }
 
+static void
+get_current_screen_dimensions(struct libinput_device *device,
+			      int *width,
+			      int *height,
+			      void *user_data)
+{
+	*width = 1024;
+	*height = 768;
+}
+
 const struct libinput_interface interface = {
 	.open_restricted = open_restricted,
 	.close_restricted = close_restricted,
+	.get_current_screen_dimensions = get_current_screen_dimensions,
 };
 
 struct litest_device *
diff --git a/test/litest.h b/test/litest.h
index 5dbc0daf..67c95e89 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -40,6 +40,7 @@ enum litest_device_type {
 	LITEST_KEYBOARD,
 	LITEST_TRACKPOINT,
 	LITEST_MOUSE,
+	LITEST_WACOM_TOUCH,
 };
 
 enum litest_device_feature {
@@ -51,6 +52,7 @@ enum litest_device_feature {
 	LITEST_KEYS = 1 << 3,
 	LITEST_POINTER = 1 << 4,
 	LITEST_WHEEL = 1 << 5,
+	LITEST_TOUCH = 1 << 6,
 };
 
 struct litest_device {