diff --git a/src/tests/meson.build b/src/tests/meson.build
index cbd223129..127aa52b8 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -408,6 +408,7 @@ stacking_tests = [
   'modals',
   'map-fixed-size',
   'client-resize-respect-constraints',
+  'map-on-hotplug',
 ]
 
 foreach stacking_test: stacking_tests
diff --git a/src/tests/stacking/map-on-hotplug.metatest b/src/tests/stacking/map-on-hotplug.metatest
new file mode 100644
index 000000000..664ae21f1
--- /dev/null
+++ b/src/tests/stacking/map-on-hotplug.metatest
@@ -0,0 +1,20 @@
+# Test that monitor hotplugs with unmapped windows are handled
+
+new_client w wayland
+
+create w/1 csd
+freeze w/1
+resize w/1 100 200
+show w/1 async
+
+resize_monitor primary 1024 768
+
+wait
+
+thaw w/1
+wait
+sync_shown w/1
+assert_stacking w/1
+assert_size w/1 100 200
+
+destroy w/1