diff --git a/app/tests/macros/from-tap-hold/behavior_keymap.dtsi b/app/tests/macros/from-tap-hold/behavior_keymap.dtsi
new file mode 100644
index 00000000..81b26531
--- /dev/null
+++ b/app/tests/macros/from-tap-hold/behavior_keymap.dtsi
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan_mock.h>
+
+/ {
+	macros {
+		abc_macro: abc_macro {
+			label = "ABCs";
+			compatible = "zmk,behavior-macro";
+			#binding-cells = <0>;
+			bindings = <&kp A &kp B &kp C>;
+		};
+
+		hold_shift_macro: hold_shift_macro {
+			label = "HOLD_SHFT";
+			compatible = "zmk,behavior-macro";
+			#binding-cells = <0>;
+			bindings
+				= <&macro_press &kp LSHFT>
+				, <&macro_tap>
+				, <&kp D &kp O &kp G>
+				, <&macro_release &kp LSHFT>
+				;
+		};
+	};
+
+	keymap {
+		compatible = "zmk,keymap";
+		label ="Default keymap";
+
+		default_layer {
+			bindings = <
+				&abc_macro 			&mo 1
+				&hold_shift_macro 	&custom_timing>;
+		};
+
+		extra_layer {
+			bindings = <
+				&dual_sequence_macro &trans
+				&kp TAB &none>;
+
+		};
+
+	};
+};
diff --git a/app/tests/macros/from-tap-hold/events.patterns b/app/tests/macros/from-tap-hold/events.patterns
new file mode 100644
index 00000000..3c9d3f83
--- /dev/null
+++ b/app/tests/macros/from-tap-hold/events.patterns
@@ -0,0 +1 @@
+s/.*hid_listener_keycode/kp/p
\ No newline at end of file
diff --git a/app/tests/macros/from-tap-hold/keycode_events.snapshot b/app/tests/macros/from-tap-hold/keycode_events.snapshot
new file mode 100644
index 00000000..9fe52e6d
--- /dev/null
+++ b/app/tests/macros/from-tap-hold/keycode_events.snapshot
@@ -0,0 +1,6 @@
+kp_pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
+kp_released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
+kp_pressed: usage_page 0x07 keycode 0x05 implicit_mods 0x00 explicit_mods 0x00
+kp_released: usage_page 0x07 keycode 0x05 implicit_mods 0x00 explicit_mods 0x00
+kp_pressed: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
+kp_released: usage_page 0x07 keycode 0x06 implicit_mods 0x00 explicit_mods 0x00
diff --git a/app/tests/macros/from-tap-hold/native_posix.keymap b/app/tests/macros/from-tap-hold/native_posix.keymap
new file mode 100644
index 00000000..6a2391db
--- /dev/null
+++ b/app/tests/macros/from-tap-hold/native_posix.keymap
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2022 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+ 
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan_mock.h>
+#include "../behavior_keymap.dtsi"
+
+&kscan {
+	events = <ZMK_MOCK_PRESS(0,0,10) ZMK_MOCK_RELEASE(0,0,1000)>;
+};
\ No newline at end of file