diff --git a/test/from-markdown/lists/ol/basic/input.md b/test/from-markdown/lists/ol/basic/input.md
new file mode 100644
index 00000000..9e05f56a
--- /dev/null
+++ b/test/from-markdown/lists/ol/basic/input.md
@@ -0,0 +1,2 @@
+1. Hello
+2. World
diff --git a/test/from-markdown/lists/ol/basic/output.yaml b/test/from-markdown/lists/ol/basic/output.yaml
new file mode 100644
index 00000000..24efc2e8
--- /dev/null
+++ b/test/from-markdown/lists/ol/basic/output.yaml
@@ -0,0 +1,20 @@
+nodes:
+  - kind: block
+    type: ordered_list
+    nodes:
+      - kind: block
+        type: list_item
+        nodes:
+          - kind: block
+            type: unstyled
+            nodes:
+              - kind: text
+                text: Hello
+      - kind: block
+        type: list_item
+        nodes:
+          - kind: block
+            type: unstyled
+            nodes:
+              - kind: text
+                text: World
diff --git a/test/from-markdown/lists/ol/followed-by-ul/input.md b/test/from-markdown/lists/ol/followed-by-ul/input.md
new file mode 100644
index 00000000..9820fabd
--- /dev/null
+++ b/test/from-markdown/lists/ol/followed-by-ul/input.md
@@ -0,0 +1,5 @@
+1. Hello
+2. World
+
+* Bonjour
+* Monde
diff --git a/test/from-markdown/lists/ol/followed-by-ul/output.yaml b/test/from-markdown/lists/ol/followed-by-ul/output.yaml
new file mode 100644
index 00000000..fa93b82b
--- /dev/null
+++ b/test/from-markdown/lists/ol/followed-by-ul/output.yaml
@@ -0,0 +1,39 @@
+nodes:
+  - kind: block
+    type: ordered_list
+    nodes:
+      - kind: block
+        type: list_item
+        nodes:
+          - kind: block
+            type: unstyled
+            nodes:
+              - kind: text
+                text: Hello
+      - kind: block
+        type: list_item
+        nodes:
+          - kind: block
+            type: unstyled
+            nodes:
+              - kind: text
+                text: World
+  - kind: block
+    type: unordered_list
+    nodes:
+      - kind: block
+        type: list_item
+        nodes:
+          - kind: block
+            type: unstyled
+            nodes:
+              - kind: text
+                text: Bonjour
+      - kind: block
+        type: list_item
+        nodes:
+          - kind: block
+            type: unstyled
+            nodes:
+              - kind: text
+                text: Monde
diff --git a/test/from-markdown/lists/ul/input.md b/test/from-markdown/lists/ul/basic/input.md
similarity index 100%
rename from test/from-markdown/lists/ul/input.md
rename to test/from-markdown/lists/ul/basic/input.md
diff --git a/test/from-markdown/lists/ul/output.yaml b/test/from-markdown/lists/ul/basic/output.yaml
similarity index 100%
rename from test/from-markdown/lists/ul/output.yaml
rename to test/from-markdown/lists/ul/basic/output.yaml
diff --git a/test/from-markdown/lists/ul-loose/input.md b/test/from-markdown/lists/ul/loose/input.md
similarity index 100%
rename from test/from-markdown/lists/ul-loose/input.md
rename to test/from-markdown/lists/ul/loose/input.md
diff --git a/test/from-markdown/lists/ul-loose/output.yaml b/test/from-markdown/lists/ul/loose/output.yaml
similarity index 100%
rename from test/from-markdown/lists/ul-loose/output.yaml
rename to test/from-markdown/lists/ul/loose/output.yaml
diff --git a/test/from-markdown/lists/ul-nested-more/input.md b/test/from-markdown/lists/ul/nested-more/input.md
similarity index 100%
rename from test/from-markdown/lists/ul-nested-more/input.md
rename to test/from-markdown/lists/ul/nested-more/input.md
diff --git a/test/from-markdown/lists/ul-nested-more/output.yaml b/test/from-markdown/lists/ul/nested-more/output.yaml
similarity index 100%
rename from test/from-markdown/lists/ul-nested-more/output.yaml
rename to test/from-markdown/lists/ul/nested-more/output.yaml
diff --git a/test/from-markdown/lists/ul-nested/input.md b/test/from-markdown/lists/ul/nested/input.md
similarity index 100%
rename from test/from-markdown/lists/ul-nested/input.md
rename to test/from-markdown/lists/ul/nested/input.md
diff --git a/test/from-markdown/lists/ul-nested/output.yaml b/test/from-markdown/lists/ul/nested/output.yaml
similarity index 100%
rename from test/from-markdown/lists/ul-nested/output.yaml
rename to test/from-markdown/lists/ul/nested/output.yaml