5 files changed, 9 insertions, 10 deletions
diff --git a/tests/test_markup/__init__.py b/tests/test_markup/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/test_markup/__init__.py
diff --git a/tests/test_markup.py b/tests/test_markup/test_markup.py
index 0d877b3..c933481 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup/test_markup.py
@@ -520,7 +520,7 @@ def test_XRefRole(inliner):
 
 @pytest.mark.sphinx('dummy', testroot='prolog')
 def test_rst_prolog(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
     rst = app.env.get_doctree('restructuredtext')
     md = app.env.get_doctree('markdown')
 
@@ -544,7 +544,7 @@ def test_rst_prolog(app, status, warning):
 
 @pytest.mark.sphinx('dummy', testroot='keep_warnings')
 def test_keep_warnings_is_True(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
     doctree = app.env.get_doctree('index')
     assert_node(doctree[0], nodes.section)
     assert len(doctree[0]) == 2
@@ -554,7 +554,7 @@ def test_keep_warnings_is_True(app, status, warning):
 @pytest.mark.sphinx('dummy', testroot='keep_warnings',
                     confoverrides={'keep_warnings': False})
 def test_keep_warnings_is_False(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
     doctree = app.env.get_doctree('index')
     assert_node(doctree[0], nodes.section)
     assert len(doctree[0]) == 1
@@ -562,7 +562,7 @@ def test_keep_warnings_is_False(app, status, warning):
 
 @pytest.mark.sphinx('dummy', testroot='refonly_bullet_list')
 def test_compact_refonly_bullet_list(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
     doctree = app.env.get_doctree('index')
     assert_node(doctree[0], nodes.section)
     assert len(doctree[0]) == 5
@@ -580,7 +580,7 @@ def test_compact_refonly_bullet_list(app, status, warning):
 
 @pytest.mark.sphinx('dummy', testroot='default_role')
 def test_default_role1(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
 
     # default-role: pep
     doctree = app.env.get_doctree('index')
@@ -601,7 +601,7 @@ def test_default_role1(app, status, warning):
 @pytest.mark.sphinx('dummy', testroot='default_role',
                     confoverrides={'default_role': 'guilabel'})
 def test_default_role2(app, status, warning):
-    app.builder.build_all()
+    app.build(force_all=True)
 
     # default-role directive is stronger than configratuion
     doctree = app.env.get_doctree('index')
diff --git a/tests/test_metadata.py b/tests/test_markup/test_metadata.py
index 7f31997..7f31997 100644
--- a/tests/test_metadata.py
+++ b/tests/test_markup/test_metadata.py
diff --git a/tests/test_parser.py b/tests/test_markup/test_parser.py
index 86163c6..86163c6 100644
--- a/tests/test_parser.py
+++ b/tests/test_markup/test_parser.py
diff --git a/tests/test_smartquotes.py b/tests/test_markup/test_smartquotes.py
index 1d4e8e1..6c84386 100644
--- a/tests/test_smartquotes.py
+++ b/tests/test_markup/test_smartquotes.py
@@ -1,7 +1,8 @@
 """Test smart quotes."""
 
 import pytest
-from html5lib import HTMLParser
+
+from sphinx.testing.util import etree_parse
 
 
 @pytest.mark.sphinx(buildername='html', testroot='smartquotes', freshenv=True)
@@ -16,9 +17,7 @@ def test_basic(app, status, warning):
 def test_literals(app, status, warning):
     app.build()
 
-    with (app.outdir / 'literals.html').open(encoding='utf-8') as html_file:
-        etree = HTMLParser(namespaceHTMLElements=False).parse(html_file)
-
+    etree = etree_parse(app.outdir / 'literals.html')
     for code_element in etree.iter('code'):
         code_text = ''.join(code_element.itertext())