diff --git a/tests/plugins/AutoShift/explicit-config/explicit-config.ino b/tests/plugins/AutoShift/explicit-config/explicit-config.ino
new file mode 100644
index 0000000000..9975a4aa59
--- /dev/null
+++ b/tests/plugins/AutoShift/explicit-config/explicit-config.ino
@@ -0,0 +1,54 @@
+/* -*- mode: c++ -*-
+ * Copyright (C) 2021 Keyboard.io, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see .
+ */
+
+#include
+#include
+
+// *INDENT-OFF*
+KEYMAPS(
+ [0] = KEYMAP_STACKED
+ (
+ Key_LeftShift, Key_RightShift, ___, ___, ___, ___, ___,
+ Key_A, Key_B, ___, ___, ___, ___, ___,
+ ___, ___, ___, ___, ___, ___,
+ ___, ___, ___, ___, ___, ___, ___,
+ ___, ___, ___, ___,
+ ___,
+
+ ___, ___, ___, ___, ___, ___, ___,
+ ___, ___, ___, ___, ___, ___, ___,
+ ___, ___, ___, ___, ___, ___,
+ ___, ___, ___, ___, ___, ___, ___,
+ ___, ___, ___, ___,
+ ___
+ ),
+)
+// *INDENT-ON*
+
+KALEIDOSCOPE_INIT_PLUGINS(AutoShift);
+
+void setup() {
+ Kaleidoscope.setup();
+ AutoShift.setTimeout(20);
+
+ AUTOSHIFT(
+ kaleidoscope::plugin::LongPress(Key_A, Key_C),
+ )
+}
+
+void loop() {
+ Kaleidoscope.loop();
+}
diff --git a/tests/plugins/AutoShift/explicit-config/sketch.json b/tests/plugins/AutoShift/explicit-config/sketch.json
new file mode 100644
index 0000000000..8cc869221a
--- /dev/null
+++ b/tests/plugins/AutoShift/explicit-config/sketch.json
@@ -0,0 +1,6 @@
+{
+ "cpu": {
+ "fqbn": "keyboardio:virtual:model01",
+ "port": ""
+ }
+}
diff --git a/tests/plugins/AutoShift/explicit-config/sketch.yaml b/tests/plugins/AutoShift/explicit-config/sketch.yaml
new file mode 100644
index 0000000000..4d94810065
--- /dev/null
+++ b/tests/plugins/AutoShift/explicit-config/sketch.yaml
@@ -0,0 +1 @@
+default_fqbn: keyboardio:virtual:model01
diff --git a/tests/plugins/AutoShift/explicit-config/test.ktest b/tests/plugins/AutoShift/explicit-config/test.ktest
new file mode 100644
index 0000000000..4a433e6250
--- /dev/null
+++ b/tests/plugins/AutoShift/explicit-config/test.ktest
@@ -0,0 +1,52 @@
+VERSION 1
+
+KEYSWITCH LSHIFT 0 0
+KEYSWITCH RSHIFT 0 1
+KEYSWITCH A 1 0
+KEYSWITCH B 1 1
+
+# ==============================================================================
+NAME AutoShift explicit config
+
+RUN 4 ms
+PRESS A
+RUN 1 cycle
+
+# Timeout is 20ms
+RUN 20 ms
+EXPECT keyboard-report Key_C # report: { 6 }
+
+RUN 4 ms
+RELEASE A
+RUN 1 cycle
+EXPECT keyboard-report empty
+
+RUN 5 ms
+
+# ==============================================================================
+NAME AutoShift explicit config shifted
+
+RUN 4 ms
+PRESS LSHIFT
+RUN 1 cycle
+EXPECT keyboard-report Key_LeftShift # report: { e1 }
+
+RUN 4 ms
+PRESS A
+RUN 1 cycle
+
+# Timeout is 20ms
+RUN 20 ms
+EXPECT keyboard-report Key_LeftShift Key_C # report: { 6 e1 }
+
+RUN 4 ms
+RELEASE A
+RUN 1 cycle
+EXPECT keyboard-report Key_LeftShift # report: { e1 }
+
+RUN 4 ms
+RELEASE LSHIFT
+RUN 1 cycle
+EXPECT keyboard-report empty
+
+RUN 5 ms