diff --git a/test/Makefile.am b/test/Makefile.am
index d4838ca0..6a55c7f0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -14,6 +14,7 @@ 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 \
diff --git a/test/litest-alps-dualpoint.c b/test/litest-alps-dualpoint.c
new file mode 100644
index 00000000..8e42f9a8
--- /dev/null
+++ b/test/litest-alps-dualpoint.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright © 2014 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <assert.h>
+
+#include "libinput-util.h"
+
+#include "litest.h"
+#include "litest-int.h"
+
+static void alps_dualpoint_create(struct litest_device *d);
+
+static void
+litest_alps_dualpoint_setup(void)
+{
+	struct litest_device *d = litest_create_device(LITEST_ALPS_DUALPOINT);
+	litest_set_current_device(d);
+}
+
+static void
+alps_dualpoint_touch_down(struct litest_device *d, unsigned int slot, double x, double y)
+{
+	struct litest_semi_mt *semi_mt = d->private;
+
+	litest_semi_mt_touch_down(d, semi_mt, slot, x, y);
+}
+
+static void
+alps_dualpoint_touch_move(struct litest_device *d, unsigned int slot, double x, double y)
+{
+	struct litest_semi_mt *semi_mt = d->private;
+
+	litest_semi_mt_touch_move(d, semi_mt, slot, x, y);
+}
+
+static void
+alps_dualpoint_touch_up(struct litest_device *d, unsigned int slot)
+{
+	struct litest_semi_mt *semi_mt = d->private;
+
+	litest_semi_mt_touch_up(d, semi_mt, slot);
+}
+
+static struct litest_device_interface interface = {
+	.touch_down = alps_dualpoint_touch_down,
+	.touch_move = alps_dualpoint_touch_move,
+	.touch_up = alps_dualpoint_touch_up,
+};
+
+static struct input_id input_id = {
+	.bustype = 0x11,
+	.vendor = 0x2,
+	.product = 0x310,
+};
+
+static int events[] = {
+	EV_KEY, BTN_LEFT,
+	EV_KEY, BTN_RIGHT,
+	EV_KEY, BTN_MIDDLE,
+	EV_KEY, BTN_TOOL_FINGER,
+	EV_KEY, BTN_TOUCH,
+	EV_KEY, BTN_TOOL_DOUBLETAP,
+	EV_KEY, BTN_TOOL_TRIPLETAP,
+	EV_KEY, BTN_TOOL_QUADTAP,
+	INPUT_PROP_MAX, INPUT_PROP_POINTER,
+	INPUT_PROP_MAX, INPUT_PROP_SEMI_MT,
+	-1, -1,
+};
+
+static struct input_absinfo absinfo[] = {
+	{ ABS_X, 0, 2000, 0, 0, 25 },
+	{ ABS_Y, 0, 1400, 0, 0, 32 },
+	{ ABS_PRESSURE, 0, 127, 0, 0, 0 },
+	{ ABS_MT_SLOT, 0, 1, 0, 0, 0 },
+	{ ABS_MT_POSITION_X, 0, 2000, 0, 0, 25 },
+	{ ABS_MT_POSITION_Y, 0, 1400, 0, 0, 32 },
+	{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
+	{ .value = -1 }
+};
+
+struct litest_test_device litest_alps_dualpoint_device = {
+	.type = LITEST_ALPS_DUALPOINT,
+	.features = LITEST_TOUCHPAD | LITEST_BUTTON | LITEST_SEMI_MT,
+	.shortname = "alps dualpoint",
+	.setup = litest_alps_dualpoint_setup,
+	.interface = &interface,
+	.create = alps_dualpoint_create,
+
+	.name = "AlpsPS/2 ALPS DualPoint TouchPad",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+};
+
+static void
+alps_dualpoint_create(struct litest_device *d)
+{
+	struct litest_semi_mt *semi_mt = zalloc(sizeof(*semi_mt));
+	assert(semi_mt);
+
+	d->private = semi_mt;
+
+	d->uinput = litest_create_uinput_device_from_description(litest_alps_dualpoint_device.name,
+								 litest_alps_dualpoint_device.id,
+								 absinfo,
+								 events);
+	d->interface = &interface;
+}
diff --git a/test/litest.c b/test/litest.c
index fb4b99cf..82df550d 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -351,6 +351,7 @@ extern struct litest_test_device litest_mouse_roccat_device;
 extern struct litest_test_device litest_ms_surface_cover_device;
 extern struct litest_test_device litest_logitech_trackball_device;
 extern struct litest_test_device litest_atmel_hover_device;
+extern struct litest_test_device litest_alps_dualpoint_device;
 
 struct litest_test_device* devices[] = {
 	&litest_synaptics_clickpad_device,
@@ -376,6 +377,7 @@ struct litest_test_device* devices[] = {
 	&litest_ms_surface_cover_device,
 	&litest_logitech_trackball_device,
 	&litest_atmel_hover_device,
+	&litest_alps_dualpoint_device,
 	NULL,
 };
 
diff --git a/test/litest.h b/test/litest.h
index e49cd0c3..b08ac40d 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -136,6 +136,7 @@ enum litest_device_type {
 	LITEST_MOUSE_ROCCAT = -22,
 	LITEST_LOGITECH_TRACKBALL = -23,
 	LITEST_ATMEL_HOVER = -24,
+	LITEST_ALPS_DUALPOINT = -25,
 };
 
 enum litest_device_feature {