diff --git a/tests/ref/grid-subheaders-too-large-non-repeating-orphan-before-auto.png b/tests/ref/grid-subheaders-too-large-non-repeating-orphan-before-auto.png
new file mode 100644
index 000000000..c7d632ade
Binary files /dev/null and b/tests/ref/grid-subheaders-too-large-non-repeating-orphan-before-auto.png differ
diff --git a/tests/ref/grid-subheaders-too-large-non-repeating-orphan-before-relative.png b/tests/ref/grid-subheaders-too-large-non-repeating-orphan-before-relative.png
new file mode 100644
index 000000000..dfcac8500
Binary files /dev/null and b/tests/ref/grid-subheaders-too-large-non-repeating-orphan-before-relative.png differ
diff --git a/tests/ref/grid-subheaders-too-large-repeating-orphan-before-auto.png b/tests/ref/grid-subheaders-too-large-repeating-orphan-before-auto.png
new file mode 100644
index 000000000..de77beb29
Binary files /dev/null and b/tests/ref/grid-subheaders-too-large-repeating-orphan-before-auto.png differ
diff --git a/tests/ref/grid-subheaders-too-large-repeating-orphan-before-relative.png b/tests/ref/grid-subheaders-too-large-repeating-orphan-before-relative.png
new file mode 100644
index 000000000..dfcac8500
Binary files /dev/null and b/tests/ref/grid-subheaders-too-large-repeating-orphan-before-relative.png differ
diff --git a/tests/suite/layout/grid/subheaders.typ b/tests/suite/layout/grid/subheaders.typ
index d4d2fba14..8123fc201 100644
--- a/tests/suite/layout/grid/subheaders.typ
+++ b/tests/suite/layout/grid/subheaders.typ
@@ -815,3 +815,57 @@
     [a],
   )
 )
+
+--- grid-subheaders-too-large-non-repeating-orphan-before-auto ---
+#set page(height: 8em)
+#grid(
+  grid.header([1]),
+  grid.header(
+    [a\ ] * 2,
+    level: 2,
+    repeat: false,
+  ),
+  grid.header([2], level: 3),
+  [b\ b\ b],
+)
+
+--- grid-subheaders-too-large-repeating-orphan-before-auto ---
+#set page(height: 8em)
+#grid(
+  grid.header([1]),
+  grid.header(
+    [a\ ] * 2,
+    level: 2,
+    repeat: true,
+  ),
+  grid.header([2], level: 3),
+  rect(width: 10pt, height: 3em, fill: red),
+)
+
+--- grid-subheaders-too-large-repeating-orphan-before-relative ---
+#set page(height: 8em)
+#grid(
+  rows: (auto, auto, auto, 3em),
+  grid.header([1]),
+  grid.header(
+    [a\ ] * 2,
+    level: 2,
+    repeat: true,
+  ),
+  grid.header([2], level: 3),
+  rect(width: 10pt, height: 3em, fill: red),
+)
+
+--- grid-subheaders-too-large-non-repeating-orphan-before-relative ---
+#set page(height: 8em)
+#grid(
+  rows: (auto, auto, auto, 3em),
+  grid.header([1]),
+  grid.header(
+    [a\ ] * 2,
+    level: 2,
+    repeat: false,
+  ),
+  grid.header([2], level: 3),
+  rect(width: 10pt, height: 3em, fill: red),
+)