diff --git a/tests/ref/basics/enum.png b/tests/ref/basics/enum.png
deleted file mode 100644
index 8e48076b8..000000000
Binary files a/tests/ref/basics/enum.png and /dev/null differ
diff --git a/tests/ref/layout/enum.png b/tests/ref/layout/enum.png
new file mode 100644
index 000000000..97c3f7a74
Binary files /dev/null and b/tests/ref/layout/enum.png differ
diff --git a/tests/ref/basics/list-attach.png b/tests/ref/layout/list-attach.png
similarity index 100%
rename from tests/ref/basics/list-attach.png
rename to tests/ref/layout/list-attach.png
diff --git a/tests/ref/basics/list.png b/tests/ref/layout/list.png
similarity index 100%
rename from tests/ref/basics/list.png
rename to tests/ref/layout/list.png
diff --git a/tests/ref/basics/table.png b/tests/ref/layout/table.png
similarity index 100%
rename from tests/ref/basics/table.png
rename to tests/ref/layout/table.png
diff --git a/tests/ref/basics/terms.png b/tests/ref/layout/terms.png
similarity index 100%
rename from tests/ref/basics/terms.png
rename to tests/ref/layout/terms.png
diff --git a/tests/ref/basics/heading.png b/tests/ref/meta/heading.png
similarity index 100%
rename from tests/ref/basics/heading.png
rename to tests/ref/meta/heading.png
diff --git a/tests/typ/basics/enum.typ b/tests/typ/basics/enum.typ
deleted file mode 100644
index fd845c2b0..000000000
--- a/tests/typ/basics/enum.typ
+++ /dev/null
@@ -1,69 +0,0 @@
-// Test enumerations.
-
----
-#enum[Embrace][Extend][Extinguish]
-
----
-1. First.
-   2. Indented
-
-+ Second
-
----
-// Test automatic numbering in summed content.
-#for i in range(5) {
-   [+ #numbering("I", 1 + i)]
-}
-
----
-// Test label pattern.
-#set enum(numbering: "~ A:")
-1. First
- + Second
-
-#set enum(numbering: "(*)")
-+ A
-+ B
-+ C
-
-#set enum(numbering: "i)")
-+ A
-+ B
-
----
-// Mix of different lists
-- Bullet List
-+ Numbered List
-/ Term: List
-
----
-// Test numbering with closure.
-#enum(
-  start: 4,
-  spacing: 0.65em - 3pt,
-  tight: false,
-  numbering: n => text(
-    fill: (red, green, blue).at(calc.mod(n, 3)),
-    numbering("A", n),
-  ),
-  [Red], [Green], [Blue],
-)
-
----
-#set enum(numbering: n => n > 1)
-+ A
-+ B
-
----
-// Edge cases.
-+
-Empty
-+Nope
-
----
-// Error: 22-24 invalid numbering pattern
-#set enum(numbering: "")
-
----
-// Error: 22-28 invalid numbering pattern
-#set enum(numbering: "(())")
diff --git a/tests/typ/layout/enum.typ b/tests/typ/layout/enum.typ
new file mode 100644
index 000000000..9512e1b55
--- /dev/null
+++ b/tests/typ/layout/enum.typ
@@ -0,0 +1,28 @@
+// Test enumerations.
+
+---
+#enum[Embrace][Extend][Extinguish]
+
+---
+1. First.
+   2. Indented
+
++ Second
+
+---
+// Test automatic numbering in summed content.
+#for i in range(5) {
+   [+ #numbering("I", 1 + i)]
+}
+
+---
+// Mix of different lists
+- Bullet List
++ Numbered List
+/ Term: List
+
+---
+// Edge cases.
++
+Empty
++Nope
diff --git a/tests/typ/basics/list-attach.typ b/tests/typ/layout/list-attach.typ
similarity index 100%
rename from tests/typ/basics/list-attach.typ
rename to tests/typ/layout/list-attach.typ
diff --git a/tests/typ/basics/list.typ b/tests/typ/layout/list.typ
similarity index 100%
rename from tests/typ/basics/list.typ
rename to tests/typ/layout/list.typ
diff --git a/tests/typ/basics/table.typ b/tests/typ/layout/table.typ
similarity index 100%
rename from tests/typ/basics/table.typ
rename to tests/typ/layout/table.typ
diff --git a/tests/typ/basics/terms.typ b/tests/typ/layout/terms.typ
similarity index 100%
rename from tests/typ/basics/terms.typ
rename to tests/typ/layout/terms.typ
diff --git a/tests/typ/basics/heading.typ b/tests/typ/meta/heading.typ
similarity index 100%
rename from tests/typ/basics/heading.typ
rename to tests/typ/meta/heading.typ