diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am
index b38f9a57d..175611549 100644
--- a/src/Makefile-tests.am
+++ b/src/Makefile-tests.am
@@ -15,6 +15,9 @@ dist_stacking_DATA =						\
 	$(srcdir)/tests/stacking/basic-x11.metatest 	\
 	$(srcdir)/tests/stacking/basic-wayland.metatest	\
 	$(srcdir)/tests/stacking/closed-transient.metatest	\
+	$(srcdir)/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest \
+	$(srcdir)/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest \
+	$(srcdir)/tests/stacking/closed-transient-no-input-parent.metatest \
 	$(srcdir)/tests/stacking/minimized.metatest 	\
 	$(srcdir)/tests/stacking/mixed-windows.metatest     \
 	$(srcdir)/tests/stacking/set-parent.metatest	\
diff --git a/src/tests/meson.build b/src/tests/meson.build
index ff7a875a3..fdf842759 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -87,6 +87,9 @@ stacking_tests = files([
   'stacking/basic-wayland.metatest',
   'stacking/client-side-decorated.metatest',
   'stacking/closed-transient.metatest',
+  'stacking/closed-transient-no-input-no-take-focus-parent.metatest',
+  'stacking/closed-transient-no-input-no-take-focus-parents.metatest',
+  'stacking/closed-transient-no-input-parent.metatest',
   'stacking/minimized.metatest',
   'stacking/mixed-windows.metatest',
   'stacking/set-parent.metatest',
diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
new file mode 100644
index 000000000..f0b4d6ccf
--- /dev/null
+++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
@@ -0,0 +1,23 @@
+new_client 1 x11
+create 1/1
+show 1/1
+wait
+
+create 1/2 csd
+set_parent 1/2 1
+take_focus 1/2 false
+accept_focus 1/2 false
+show 1/2
+wait
+
+create 1/3 csd
+set_parent 1/3 2
+show 1/3
+wait
+
+assert_stacking 1/1 1/2 1/3
+
+destroy 1/3
+wait
+
+assert_stacking 1/1 1/2
diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
new file mode 100644
index 000000000..25bcc3c18
--- /dev/null
+++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
@@ -0,0 +1,25 @@
+new_client 1 x11
+create 1/1
+accept_focus 1/1 false
+take_focus 1/1 false
+show 1/1
+wait
+
+create 1/2 csd
+set_parent 1/2 1
+take_focus 1/2 false
+accept_focus 1/2 false
+show 1/2
+wait
+
+create 1/3 csd
+set_parent 1/3 2
+show 1/3
+wait
+
+assert_stacking 1/1 1/2 1/3
+
+destroy 1/3
+wait
+
+assert_stacking 1/1 1/2
diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest
new file mode 100644
index 000000000..af24a1072
--- /dev/null
+++ b/src/tests/stacking/closed-transient-no-input-parent.metatest
@@ -0,0 +1,22 @@
+new_client 1 x11
+create 1/1
+show 1/1
+wait
+
+create 1/2 csd
+set_parent 1/2 1
+accept_focus 1/2 false
+show 1/2
+wait
+
+create 1/3 csd
+set_parent 1/3 2
+show 1/3
+wait
+
+assert_stacking 1/1 1/2 1/3
+
+destroy 1/3
+
+wait
+assert_stacking 1/1 1/2