diff --git a/tests/ref/grid-subheaders-alone.png b/tests/ref/grid-subheaders-alone.png
new file mode 100644
index 000000000..0e05dda83
Binary files /dev/null and b/tests/ref/grid-subheaders-alone.png differ
diff --git a/tests/ref/grid-subheaders-basic-non-consecutive.png b/tests/ref/grid-subheaders-basic-non-consecutive.png
new file mode 100644
index 000000000..9f3f84402
Binary files /dev/null and b/tests/ref/grid-subheaders-basic-non-consecutive.png differ
diff --git a/tests/ref/grid-subheaders-basic-replace.png b/tests/ref/grid-subheaders-basic-replace.png
new file mode 100644
index 000000000..2b3baa379
Binary files /dev/null and b/tests/ref/grid-subheaders-basic-replace.png differ
diff --git a/tests/ref/grid-subheaders-basic.png b/tests/ref/grid-subheaders-basic.png
new file mode 100644
index 000000000..5a6468075
Binary files /dev/null and b/tests/ref/grid-subheaders-basic.png differ
diff --git a/tests/ref/grid-subheaders-repeat-non-consecutive.png b/tests/ref/grid-subheaders-repeat-non-consecutive.png
new file mode 100644
index 000000000..2e0fe2364
Binary files /dev/null and b/tests/ref/grid-subheaders-repeat-non-consecutive.png differ
diff --git a/tests/ref/grid-subheaders-repeat.png b/tests/ref/grid-subheaders-repeat.png
new file mode 100644
index 000000000..c57ed769f
Binary files /dev/null and b/tests/ref/grid-subheaders-repeat.png differ
diff --git a/tests/suite/layout/grid/subheaders.typ b/tests/suite/layout/grid/subheaders.typ
index 1946719d8..bdb687e35 100644
--- a/tests/suite/layout/grid/subheaders.typ
+++ b/tests/suite/layout/grid/subheaders.typ
@@ -1,3 +1,92 @@
+--- grid-subheaders-basic ---
+#grid(
+  grid.header(
+    [a]
+  ),
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  [c]
+)
+
+--- grid-subheaders-basic-non-consecutive ---
+#grid(
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  [y],
+)
+
+--- grid-subheaders-basic-replace ---
+#grid(
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  [y],
+  grid.header(
+    level: 2,
+    [c]
+  ),
+  [z],
+)
+
+--- grid-subheaders-repeat ---
+#set page(height: 8em)
+#grid(
+  grid.header(
+    [a]
+  ),
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  ..([c],) * 10,
+)
+
+--- grid-subheaders-repeat-non-consecutive ---
+#set page(height: 8em)
+#grid(
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  ..([y],) * 10,
+)
+
+--- grid-subheaders-repeat-replace ---
+#set page(height: 8em)
+#grid(
+  grid.header(
+    [a]
+  ),
+  [x],
+  grid.header(
+    level: 2,
+    [b]
+  ),
+  ..([y],) * 10,
+  grid.header(
+    level: 2,
+    [c]
+  ),
+  ..([z],) * 10,
+)
+
 --- grid-subheaders ---
 #set page(width: auto, height: 12em)
 #let rows(n) = {
@@ -22,3 +111,14 @@
   ),
   ..rows(5)
 )
+
+--- grid-subheaders-alone ---
+#table(
+  table.header(
+    [a]
+  ),
+  table.header(
+    level: 2,
+    [b]
+  ),
+)