diff --git a/test/Makefile.am b/test/Makefile.am
index 681b9065..f12b2ee0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -50,6 +50,7 @@ liblitest_la_SOURCES = \
 	litest-device-wacom-bamboo-tablet.c \
 	litest-device-wacom-cintiq-tablet.c \
 	litest-device-wacom-cintiq-24hd.c \
+	litest-device-wacom-ekr.c \
 	litest-device-wacom-intuos-tablet.c \
 	litest-device-wacom-intuos3-pad.c \
 	litest-device-wacom-intuos5-pad.c \
diff --git a/test/litest-device-wacom-ekr.c b/test/litest-device-wacom-ekr.c
new file mode 100644
index 00000000..fa739274
--- /dev/null
+++ b/test/litest-device-wacom-ekr.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright © 2016 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"
+
+static void
+litest_wacom_ekr_setup(void)
+{
+	struct litest_device *d = litest_create_device(LITEST_WACOM_EKR);
+	litest_set_current_device(d);
+}
+
+static struct input_event down[] = {
+	{ .type = -1, .code = -1 },
+};
+
+static struct input_event move[] = {
+	{ .type = -1, .code = -1 },
+};
+
+static struct input_event ring_start[] = {
+	{ .type = EV_ABS, .code = ABS_WHEEL, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_ABS, .code = ABS_MISC, .value = 15 },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+} ;
+
+static struct input_event ring_change[] = {
+	{ .type = EV_ABS, .code = ABS_WHEEL, .value = LITEST_AUTO_ASSIGN },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+} ;
+
+static struct input_event ring_end[] = {
+	{ .type = EV_ABS, .code = ABS_WHEEL, .value = 0 },
+	{ .type = EV_ABS, .code = ABS_MISC, .value = 0 },
+	{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+	{ .type = -1, .code = -1 },
+} ;
+
+static struct litest_device_interface interface = {
+	.touch_down_events = down,
+	.touch_move_events = move,
+	.pad_ring_start_events = ring_start,
+	.pad_ring_change_events = ring_change,
+	.pad_ring_end_events = ring_end,
+};
+
+static struct input_absinfo absinfo[] = {
+	{ ABS_X, 0, 1, 0, 0, 0 },
+	{ ABS_Y, 0, 1, 0, 0, 0 },
+	{ ABS_WHEEL, 0, 71, 0, 0, 0 },
+	{ ABS_MISC, 0, 0, 0, 0, 0 },
+	{ .value = -1 },
+};
+
+static struct input_id input_id = {
+	.bustype = 0x3,
+	.vendor = 0x56a,
+	.product = 0x331,
+};
+
+static int events[] = {
+	EV_KEY, BTN_0,
+	EV_KEY, BTN_1,
+	EV_KEY, BTN_2,
+	EV_KEY, BTN_3,
+	EV_KEY, BTN_3,
+	EV_KEY, BTN_4,
+	EV_KEY, BTN_5,
+	EV_KEY, BTN_6,
+	EV_KEY, BTN_7,
+	EV_KEY, BTN_8,
+	EV_KEY, BTN_9,
+	EV_KEY, BTN_BASE,
+	EV_KEY, BTN_BASE2,
+	EV_KEY, BTN_SOUTH,
+	EV_KEY, BTN_EAST,
+	EV_KEY, BTN_C,
+	EV_KEY, BTN_NORTH,
+	EV_KEY, BTN_WEST,
+	EV_KEY, BTN_Z,
+	EV_KEY, BTN_STYLUS,
+	-1, -1,
+};
+
+static const char udev_rule[] =
+"ACTION==\"remove\", GOTO=\"pad_end\"\n"
+"KERNEL!=\"event*\", GOTO=\"pad_end\"\n"
+"\n"
+"ATTRS{name}==\"litest Wacom Express Key Remote Pad*\",\\\n"
+"    ENV{ID_INPUT_TABLET_PAD}=\"1\"\n"
+"\n"
+"LABEL=\"pad_end\"";
+
+struct litest_test_device litest_wacom_ekr_device = {
+	.type = LITEST_WACOM_EKR,
+	.features = LITEST_TABLET_PAD | LITEST_RING,
+	.shortname = "wacom-ekr",
+	.setup = litest_wacom_ekr_setup,
+	.interface = &interface,
+
+	.name = "Wacom Express Key Remote Pad",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+	.udev_rule = udev_rule,
+};
diff --git a/test/litest.c b/test/litest.c
index cc4ac6c7..dbd11067 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -384,6 +384,7 @@ extern struct litest_test_device litest_wacom_intuos3_pad_device;
 extern struct litest_test_device litest_wacom_intuos5_pad_device;
 extern struct litest_test_device litest_keyboard_all_codes_device;
 extern struct litest_test_device litest_magicmouse_device;
+extern struct litest_test_device litest_wacom_ekr_device;
 
 struct litest_test_device* devices[] = {
 	&litest_synaptics_clickpad_device,
@@ -434,6 +435,7 @@ struct litest_test_device* devices[] = {
 	&litest_wacom_intuos5_pad_device,
 	&litest_keyboard_all_codes_device,
 	&litest_magicmouse_device,
+	&litest_wacom_ekr_device,
 	NULL,
 };
 
diff --git a/test/litest.h b/test/litest.h
index c8309285..7dfb36bb 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -201,6 +201,7 @@ enum litest_device_type {
 	LITEST_WACOM_INTUOS5_PAD,
 	LITEST_KEYBOARD_ALL_CODES,
 	LITEST_MAGICMOUSE,
+	LITEST_WACOM_EKR,
 };
 
 enum litest_device_feature {