diff --git a/tests/ref/grid-subheaders-non-repeat-replace.png b/tests/ref/grid-subheaders-non-repeat-replace.png
new file mode 100644
index 000000000..e9c254b46
Binary files /dev/null and b/tests/ref/grid-subheaders-non-repeat-replace.png differ
diff --git a/tests/ref/grid-subheaders-non-repeat.png b/tests/ref/grid-subheaders-non-repeat.png
new file mode 100644
index 000000000..030f1baae
Binary files /dev/null and b/tests/ref/grid-subheaders-non-repeat.png differ
diff --git a/tests/ref/grid-subheaders-non-repeating-replace-didnt-fit-once.png b/tests/ref/grid-subheaders-non-repeating-replace-didnt-fit-once.png
new file mode 100644
index 000000000..6685125a4
Binary files /dev/null and b/tests/ref/grid-subheaders-non-repeating-replace-didnt-fit-once.png differ
diff --git a/tests/ref/grid-subheaders-non-repeating-replace-orphan.png b/tests/ref/grid-subheaders-non-repeating-replace-orphan.png
new file mode 100644
index 000000000..ffa465c42
Binary files /dev/null and b/tests/ref/grid-subheaders-non-repeating-replace-orphan.png differ
diff --git a/tests/suite/layout/grid/subheaders.typ b/tests/suite/layout/grid/subheaders.typ
index e4515c09e..a5b315900 100644
--- a/tests/suite/layout/grid/subheaders.typ
+++ b/tests/suite/layout/grid/subheaders.typ
@@ -414,6 +414,86 @@
   ..([z],) * 10,
 )
 
+--- grid-subheaders-non-repeat ---
+#set page(height: 8em)
+#grid(
+  grid.header(
+    [a],
+    repeat: false,
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    repeat: false,
+    [b]
+  ),
+  ..([y],) * 10,
+)
+
+--- grid-subheaders-non-repeat-replace ---
+#set page(height: 8em)
+#grid(
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  grid.header(
+    level: 3,
+    [c]
+  ),
+  ..([y],) * 9,
+  grid.header(
+    level: 2,
+    [d],
+    repeat: false,
+  ),
+  ..([z],) * 6,
+)
+
+--- grid-subheaders-non-repeating-replace-orphan ---
+#set page(height: 8em)
+#grid(
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  ..([y],) * 12,
+  grid.header(
+    level: 2,
+    repeat: false,
+    [c]
+  ),
+  ..([z],) * 10,
+)
+
+--- grid-subheaders-non-repeating-replace-didnt-fit-once ---
+#set page(height: 8em)
+#grid(
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  ..([y],) * 10,
+  grid.header(
+    level: 2,
+    repeat: false,
+    [c\ c\ c]
+  ),
+  ..([z],) * 4,
+)
+
 --- grid-subheaders-multi-page-rowspan ---
 #set page(height: 8em)
 #grid(