diff --git a/tests/custom-html5lib-tests/custom.test b/tests/custom-html5lib-tests/tokenizer/custom.test
similarity index 100%
rename from tests/custom-html5lib-tests/custom.test
rename to tests/custom-html5lib-tests/tokenizer/custom.test
diff --git a/tests/custom-html5lib-tests/error-order-bytes.test b/tests/custom-html5lib-tests/tokenizer/error-order-bytes.test
similarity index 100%
rename from tests/custom-html5lib-tests/error-order-bytes.test
rename to tests/custom-html5lib-tests/tokenizer/error-order-bytes.test
diff --git a/tests/custom-html5lib-tests/tree-construction/custom.dat b/tests/custom-html5lib-tests/tree-construction/custom.dat
new file mode 100644
index 0000000..1450e22
--- /dev/null
+++ b/tests/custom-html5lib-tests/tree-construction/custom.dat
@@ -0,0 +1,11 @@
+#data
+<script></code><a href=foo></a></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</code><a href=foo></a>"
+|   <body>
+#errors
diff --git a/tests/html5lib_tokenizer.rs b/tests/html5lib_tokenizer.rs
index ddfb83c..46b840d 100644
--- a/tests/html5lib_tokenizer.rs
+++ b/tests/html5lib_tokenizer.rs
@@ -385,7 +385,7 @@ fn main() {
         produce_testcases_from_file(&mut tests, &entry.unwrap());
     }
 
-    for entry in glob("tests/custom-html5lib-tests/*.test").unwrap() {
+    for entry in glob("tests/custom-html5lib-tests/tokenizer/*.test").unwrap() {
         produce_testcases_from_file(&mut tests, &entry.unwrap());
     }
 
diff --git a/tests/html5lib_tree_builder.rs b/tests/html5lib_tree_builder.rs
index 302a01d..93674f2 100644
--- a/tests/html5lib_tree_builder.rs
+++ b/tests/html5lib_tree_builder.rs
@@ -92,7 +92,11 @@ impl Testcase {
             }
         }
 
-        None
+        if has_errors {
+            Some(rv)
+        } else {
+            None
+        }
     }
 }
 
@@ -290,6 +294,10 @@ fn main() {
     let args = Arguments::from_args();
     let mut tests = Vec::new();
 
+    for entry in glob("tests/custom-html5lib-tests/tree-construction/*.dat").unwrap() {
+        produce_testcases_from_file(&mut tests, &entry.unwrap());
+    }
+
     for entry in glob("tests/html5lib-tests/tree-construction/*.dat").unwrap() {
         produce_testcases_from_file(&mut tests, &entry.unwrap());
     }
