diff --git a/src/tests/meson.build b/src/tests/meson.build
index ed30535ce..aa2edac84 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -142,6 +142,7 @@ stacking_tests = [
   'set-override-redirect-parent',
   'set-parent-exported',
   'restore-size',
+  'unmaximize-new-size',
 ]
 
 foreach stacking_test: stacking_tests
diff --git a/src/tests/stacking/unmaximize-new-size.metatest b/src/tests/stacking/unmaximize-new-size.metatest
new file mode 100644
index 000000000..b25922a70
--- /dev/null
+++ b/src/tests/stacking/unmaximize-new-size.metatest
@@ -0,0 +1,22 @@
+# This is only tested on Wayland since it's broken on X11
+
+new_client w wayland
+create w/1 csd
+
+resize w/1 500 400
+show w/1
+wait
+
+assert_size w/1 500 400
+
+maximize w/1
+wait_reconfigure
+assert_size w/1 MONITOR_WIDTH MONITOR_HEIGHT
+
+resize w/1 300 500
+wait_reconfigure
+assert_size w/1 MONITOR_WIDTH MONITOR_HEIGHT
+
+unmaximize w/1
+wait_reconfigure
+assert_size w/1 300 500