diff --git a/pandoc.cabal b/pandoc.cabal
index d25446779..329724c24 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -196,6 +196,12 @@ extra-source-files:
                  test/bodybg.gif
                  test/*.native
                  test/command/*.md
+                 test/command/A.txt
+                 test/command/B.txt
+                 test/command/C.txt
+                 test/command/D.txt
+                 test/command/defaults1.yaml
+                 test/command/defaults2.yaml
                  test/command/3533-rst-csv-tables.csv
                  test/command/3880.txt
                  test/command/5182.txt
diff --git a/test/command/5881.md b/test/command/5881.md
index 3c3970a89..e29166959 100644
--- a/test/command/5881.md
+++ b/test/command/5881.md
@@ -1,5 +1,5 @@
 ```
-% pandoc -t markdown -s -H D.txt -d defaults1.yaml -d defaults2.yaml
+% pandoc -t markdown -s -H command/D.txt -d command/defaults1.yaml -d command/defaults2.yaml
 Ok
 ^D
 here's d
diff --git a/test/command/5904.md b/test/command/5904.md
index fdc29407d..326a0f622 100644
--- a/test/command/5904.md
+++ b/test/command/5904.md
@@ -1,5 +1,5 @@
 ```
-%  pandoc -s -t markdown -H test/B.txt --variable header-includes:foo
+%  pandoc -s -t markdown -H command/B.txt --variable header-includes:foo
 Hi
 ^D
 foo
diff --git a/test/A.txt b/test/command/A.txt
similarity index 100%
rename from test/A.txt
rename to test/command/A.txt
diff --git a/test/B.txt b/test/command/B.txt
similarity index 100%
rename from test/B.txt
rename to test/command/B.txt
diff --git a/test/C.txt b/test/command/C.txt
similarity index 100%
rename from test/C.txt
rename to test/command/C.txt
diff --git a/test/D.txt b/test/command/D.txt
similarity index 100%
rename from test/D.txt
rename to test/command/D.txt
diff --git a/test/command/defaults1.yaml b/test/command/defaults1.yaml
new file mode 100644
index 000000000..22b18b3c4
--- /dev/null
+++ b/test/command/defaults1.yaml
@@ -0,0 +1 @@
+include-in-header: command/A.txt
diff --git a/test/command/defaults2.yaml b/test/command/defaults2.yaml
new file mode 100644
index 000000000..4b728fa74
--- /dev/null
+++ b/test/command/defaults2.yaml
@@ -0,0 +1,4 @@
+include-in-header:
+- command/B.txt
+- command/C.txt
+
diff --git a/test/defaults1.yaml b/test/defaults1.yaml
deleted file mode 100644
index b99caa46a..000000000
--- a/test/defaults1.yaml
+++ /dev/null
@@ -1 +0,0 @@
-include-in-header: A.txt
diff --git a/test/defaults2.yaml b/test/defaults2.yaml
deleted file mode 100644
index 93f41896a..000000000
--- a/test/defaults2.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-include-in-header:
-- B.txt
-- C.txt
-