diff --git a/.pytest.expect b/.pytest.expect
index 1b3705a7..4961b00f 100644
--- a/.pytest.expect
+++ b/.pytest.expect
@@ -2,20 +2,21 @@ pytest-expect file v1
(2, 7, 18, 'final', 0)
b'html5lib/tests/test_encoding.py::test_parser_encoding[\\n-iso-8859-2]': FAIL
b'html5lib/tests/test_encoding.py::test_prescan_encoding[\\n-iso-8859-2]': FAIL
+u'html5lib/tests/testdata/tokenizer/domjs.test::4::cdataSectionState': FAIL
u'html5lib/tests/testdata/tokenizer/test2.test::0::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::228::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::231::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::232::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::234::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::235::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::237::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::240::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::241::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::243::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::244::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::246::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::258::dataState': FAIL
-u'html5lib/tests/testdata/tokenizer/test3.test::656::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::280::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::283::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::284::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::286::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::287::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::289::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::292::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::293::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::295::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::296::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::298::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::310::dataState': FAIL
+u'html5lib/tests/testdata/tokenizer/test3.test::718::dataState': FAIL
u'html5lib/tests/testdata/tree-construction/adoption01.dat::17::DOM::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/adoption01.dat::17::DOM::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/adoption01.dat::17::ElementTree::parser::namespaced': FAIL
@@ -24,6 +25,14 @@ u'html5lib/tests/testdata/tree-construction/adoption01.dat::17::cElementTree::pa
u'html5lib/tests/testdata/tree-construction/adoption01.dat::17::cElementTree::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/adoption01.dat::17::lxml::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/adoption01.dat::17::lxml::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/blocks.dat::12::DOM::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/blocks.dat::12::DOM::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/blocks.dat::12::ElementTree::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/blocks.dat::12::ElementTree::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/blocks.dat::12::cElementTree::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/blocks.dat::12::cElementTree::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/blocks.dat::12::lxml::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/blocks.dat::12::lxml::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/foreign-fragment.dat::0::DOM::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/foreign-fragment.dat::0::DOM::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/foreign-fragment.dat::0::ElementTree::parser::namespaced': FAIL
@@ -216,30 +225,6 @@ u'html5lib/tests/testdata/tree-construction/isindex.dat::3::cElementTree::parser
u'html5lib/tests/testdata/tree-construction/isindex.dat::3::cElementTree::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/isindex.dat::3::lxml::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/isindex.dat::3::lxml::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::3::DOM::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::3::DOM::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::3::ElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::3::ElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::3::cElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::3::cElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::3::lxml::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::3::lxml::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::4::DOM::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::4::DOM::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::4::ElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::4::ElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::4::cElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::4::cElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::4::lxml::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::4::lxml::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::5::DOM::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::5::DOM::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::5::ElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::5::ElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::5::cElementTree::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::5::cElementTree::parser::void-namespace': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::5::lxml::parser::namespaced': FAIL
-u'html5lib/tests/testdata/tree-construction/menuitem-element.dat::5::lxml::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/namespace-sensitivity.dat::0::DOM::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/namespace-sensitivity.dat::0::DOM::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/namespace-sensitivity.dat::0::ElementTree::parser::namespaced': FAIL
@@ -1248,6 +1233,14 @@ u'html5lib/tests/testdata/tree-construction/tests11.dat::6::cElementTree::parser
u'html5lib/tests/testdata/tree-construction/tests11.dat::6::cElementTree::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/tests11.dat::6::lxml::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/tests11.dat::6::lxml::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/tests18.dat::15::DOM::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/tests18.dat::15::DOM::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/tests18.dat::15::ElementTree::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/tests18.dat::15::ElementTree::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/tests18.dat::15::cElementTree::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/tests18.dat::15::cElementTree::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/tests18.dat::15::lxml::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/tests18.dat::15::lxml::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/tests19.dat::14::DOM::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/tests19.dat::14::DOM::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/tests19.dat::14::ElementTree::parser::namespaced': FAIL
@@ -1296,6 +1289,16 @@ u'html5lib/tests/testdata/tree-construction/tests25.dat::7::cElementTree::parser
u'html5lib/tests/testdata/tree-construction/tests25.dat::7::cElementTree::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/tests25.dat::7::lxml::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/tests25.dat::7::lxml::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/tests8.dat::5::DOM::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/tests8.dat::5::DOM::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/tests8.dat::5::ElementTree::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/tests8.dat::5::ElementTree::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/tests8.dat::5::cElementTree::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/tests8.dat::5::cElementTree::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/tests8.dat::5::lxml::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/tests8.dat::5::lxml::parser::void-namespace': FAIL
+u'html5lib/tests/testdata/tree-construction/webkit01.dat::22::lxml::parser::namespaced': FAIL
+u'html5lib/tests/testdata/tree-construction/webkit01.dat::22::lxml::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/webkit02.dat::14::DOM::parser::namespaced': FAIL
u'html5lib/tests/testdata/tree-construction/webkit02.dat::14::DOM::parser::void-namespace': FAIL
u'html5lib/tests/testdata/tree-construction/webkit02.dat::14::ElementTree::parser::namespaced': FAIL
diff --git a/html5lib/tests/testdata b/html5lib/tests/testdata
index c305da74..71eebd59 160000
--- a/html5lib/tests/testdata
+++ b/html5lib/tests/testdata
@@ -1 +1 @@
-Subproject commit c305da74fae50fb018870de7a042da36c1a93b65
+Subproject commit 71eebd59772d1d39aced0c0582ae9c09acf3ce6e