diff --git a/tests/lint/xhtml/x-001/golden/x-001-out.txt b/tests/lint/xhtml/x-001/golden/x-001-out.txt
index e69de29b..ed09dc00 100644
--- a/tests/lint/xhtml/x-001/golden/x-001-out.txt
+++ b/tests/lint/xhtml/x-001/golden/x-001-out.txt
@@ -0,0 +1 @@
+x-001 [Error] chapter-1.xhtml String `UTF-8` must always be lowercase.
diff --git a/tests/lint/xhtml/x-001/in/chapter-1.xhtml b/tests/lint/xhtml/x-001/in/src/epub/text/chapter-1.xhtml
similarity index 100%
rename from tests/lint/xhtml/x-001/in/chapter-1.xhtml
rename to tests/lint/xhtml/x-001/in/src/epub/text/chapter-1.xhtml
diff --git a/tests/lint/xhtml/x-021/golden/x-021-out.txt b/tests/lint/xhtml/x-021/golden/x-021-out.txt
index e69de29b..1bd6591b 100644
--- a/tests/lint/xhtml/x-021/golden/x-021-out.txt
+++ b/tests/lint/xhtml/x-021/golden/x-021-out.txt
@@ -0,0 +1,12 @@
+x-021 [Error] chapter-1.xhtml `<figure>` element with no `id` attribute.
+        <figure>
+                <img alt="A portrait illustration of a young woman." 
+src="test.png" epub:type="z3998:illustration 
+se:image.color-depth.black-on-transparent se:image.style.realistic"/>
+        </figure>
+m-028 [Error] content.opf Images found in ebook, but no `schema:accessMode` 
+property set to `visual` in metadata.
+m-029 [Error] content.opf Images found in ebook, but no 
+`schema:accessibilityFeature` property set to `alternativeText` in metadata.
+m-040 [Error] content.opf Images found in ebook, but no `role` property set to 
+`wat` in metadata for the writer of the alt text.
diff --git a/tests/lint/xhtml/x-021/in/chapter-1.xhtml b/tests/lint/xhtml/x-021/in/src/epub/text/chapter-1.xhtml
similarity index 100%
rename from tests/lint/xhtml/x-021/in/chapter-1.xhtml
rename to tests/lint/xhtml/x-021/in/src/epub/text/chapter-1.xhtml