diff --git a/meson.build b/meson.build
index 41e6ea4c..eefe3d61 100644
--- a/meson.build
+++ b/meson.build
@@ -541,6 +541,7 @@ if get_option('tests')
 		'test/litest-device-generic-singletouch.c',
 		'test/litest-device-gpio-keys.c',
 		'test/litest-device-huion-pentablet.c',
+		'test/litest-device-hp-wmi-hotkeys.c',
 		'test/litest-device-ignored-mouse.c',
 		'test/litest-device-keyboard.c',
 		'test/litest-device-keyboard-all-codes.c',
diff --git a/test/litest-device-hp-wmi-hotkeys.c b/test/litest-device-hp-wmi-hotkeys.c
new file mode 100644
index 00000000..2d12bf15
--- /dev/null
+++ b/test/litest-device-hp-wmi-hotkeys.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2017 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.
+ */
+
+#include "config.h"
+
+#include "litest.h"
+#include "litest-int.h"
+
+static struct input_id input_id = {
+	.bustype = 0x19,
+	.vendor = 0x000,
+	.product = 0x000,
+};
+
+static int events[] = {
+	EV_KEY, KEY_HELP,
+	EV_KEY, KEY_SETUP,
+	EV_KEY, KEY_PROG1,
+	EV_KEY, KEY_ROTATE_DISPLAY,
+	EV_KEY, KEY_BRIGHTNESSDOWN,
+	EV_KEY, KEY_BRIGHTNESSUP,
+	EV_KEY, KEY_MEDIA,
+	EV_KEY, KEY_UNKNOWN,
+	EV_KEY, KEY_INFO,
+	EV_SW, SW_TABLET_MODE,
+	EV_SW, SW_DOCK,
+	-1, -1,
+};
+
+static const char udev_rule[] =
+"ACTION==\"remove\", GOTO=\"switch_end\"\n"
+"KERNEL!=\"event*\", GOTO=\"switch_end\"\n"
+"\n"
+"ATTRS{name}==\"litest HP WMI Hotkeys*\",\\\n"
+"    ENV{ID_INPUT_SWITCH}=\"1\",\\\n"
+"\n"
+"LABEL=\"switch_end\"";
+
+TEST_DEVICE("wmi-hotkeys",
+	.type = LITEST_HP_WMI_HOTKEYS,
+	.features = LITEST_SWITCH,
+	.interface = NULL,
+
+	.name = "HP WMI hotkeys",
+	.id = &input_id,
+	.events = events,
+	.absinfo = NULL,
+
+	.udev_rule = udev_rule,
+)
diff --git a/test/litest.h b/test/litest.h
index d6d5c82c..400b15ec 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -268,6 +268,7 @@ enum litest_device_type {
 	LITEST_WACOM_BAMBOO_2FG_PAD,
 	LITEST_WACOM_BAMBOO_2FG_PEN,
 	LITEST_WACOM_BAMBOO_2FG_FINGER,
+	LITEST_HP_WMI_HOTKEYS,
 };
 
 enum litest_device_feature {
diff --git a/test/test-switch.c b/test/test-switch.c
index d62ca9fa..12488cbb 100644
--- a/test/test-switch.c
+++ b/test/test-switch.c
@@ -1021,6 +1021,25 @@ START_TEST(tablet_mode_disable_trackpoint_on_init)
 }
 END_TEST
 
+START_TEST(dock_toggle)
+{
+	struct litest_device *sw = litest_current_device();
+	struct libinput *li = sw->libinput;
+
+	if (!libevdev_has_event_code(sw->evdev, EV_SW, SW_DOCK))
+		return;
+
+	litest_drain_events(li);
+
+	litest_event(sw, EV_SW, SW_DOCK, 1);
+	libinput_dispatch(li);
+
+	litest_event(sw, EV_SW, SW_DOCK, 0);
+	libinput_dispatch(li);
+
+	litest_assert_empty_queue(li);
+}
+END_TEST
 void
 litest_setup_tests_lid(void)
 {
@@ -1057,4 +1076,6 @@ litest_setup_tests_lid(void)
 	litest_add("tablet-mode:keyboard", tablet_mode_disable_keyboard_on_init, LITEST_SWITCH, LITEST_ANY);
 	litest_add("tablet-mode:trackpoint", tablet_mode_disable_trackpoint, LITEST_SWITCH, LITEST_ANY);
 	litest_add("tablet-mode:trackpoint", tablet_mode_disable_trackpoint_on_init, LITEST_SWITCH, LITEST_ANY);
+
+	litest_add("lid:dock", dock_toggle, LITEST_SWITCH, LITEST_ANY);
 }