diff --git a/tests/ref/grid-subheaders-repeat-replace-gutter-orphan-at-child.png b/tests/ref/grid-subheaders-repeat-replace-gutter-orphan-at-child.png
new file mode 100644
index 000000000..80f9b12bc
Binary files /dev/null and b/tests/ref/grid-subheaders-repeat-replace-gutter-orphan-at-child.png differ
diff --git a/tests/ref/grid-subheaders-repeat-replace-gutter-orphan-at-gutter.png b/tests/ref/grid-subheaders-repeat-replace-gutter-orphan-at-gutter.png
new file mode 100644
index 000000000..38521e44a
Binary files /dev/null and b/tests/ref/grid-subheaders-repeat-replace-gutter-orphan-at-gutter.png differ
diff --git a/tests/ref/grid-subheaders-repeat-replace-gutter.png b/tests/ref/grid-subheaders-repeat-replace-gutter.png
new file mode 100644
index 000000000..e87e3b5bf
Binary files /dev/null and b/tests/ref/grid-subheaders-repeat-replace-gutter.png differ
diff --git a/tests/suite/layout/grid/subheaders.typ b/tests/suite/layout/grid/subheaders.typ
index 760809d74..3d790460b 100644
--- a/tests/suite/layout/grid/subheaders.typ
+++ b/tests/suite/layout/grid/subheaders.typ
@@ -229,6 +229,26 @@
   ..([z],) * 6,
 )
 
+--- grid-subheaders-repeat-replace-gutter ---
+#set page(height: 8em)
+#grid(
+  gutter: 3pt,
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  ..([y],) * 8,
+  grid.header(
+    level: 2,
+    [c]
+  ),
+  ..([z],) * 4,
+)
+
 --- grid-subheaders-repeat-replace-orphan ---
 #set page(height: 8em)
 #grid(
@@ -271,6 +291,48 @@
   ..([z],) * 10,
 )
 
+--- grid-subheaders-repeat-replace-gutter-orphan-at-child ---
+#set page(height: 8em)
+#grid(
+  gutter: 3pt,
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  ..([y],) * 9,
+  grid.header(
+    level: 2,
+    [c]
+  ),
+  [z \ z],
+  ..([z],) * 3,
+)
+
+--- grid-subheaders-repeat-replace-gutter-orphan-at-gutter ---
+#set page(height: 8em)
+#grid(
+  gutter: 3pt,
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  ..([y],) * 9,
+  box(height: 3pt),
+  grid.header(
+    level: 2,
+    [c]
+  ),
+  ..([z],) * 4,
+)
+
 --- grid-subheaders-repeat-replace-didnt-fit-once ---
 #set page(height: 8em)
 #grid(