--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -29,7 +29,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<img .*? src="_images/.*?.png" .*?/></div>'))
 
     @with_app(srcdir='tests/docs/subdir', buildername='html', write_docstring=True)
@@ -41,7 +41,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'subdir' / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<img .*? src="\.\./_images/.*?.png" .*?/></div>'))
 
     @with_png_app
@@ -54,7 +54,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<a class="reference internal image-reference" href="(.*?.png)">'
                                           r'<img height="97.0" src="\1" width="224.0" /></a></div>'))
 
@@ -68,7 +68,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<a class="reference internal image-reference" href="(.*?.png)">'
                                           r'<img height="97.0" src="\1" width="224.0" /></a></div>'))
 
@@ -83,7 +83,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<a class="reference internal image-reference" href="(.*?.png)">'
                                           r'<img height="200.0" src="\1" width="100.0" /></a></div>'))
 
@@ -97,7 +97,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<a class="reference internal image-reference" href="(.*?.png)">'
                                           r'<img height="48.5" src="\1" width="112.0" /></a></div>'))
 
@@ -112,7 +112,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<a class="reference internal image-reference" href="(.*?.png)">'
                                           r'<img height="3.03125" src="\1" width="7.0" /></a></div>'))
 
@@ -126,7 +126,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'<div class="align-center"><img .*? /></div>')
+        self.assertRegex(source, r'<div class="align-center"><img .*? /></div>')
 
     @with_png_app
     def test_align_option_and_width_option_on_png(self, app, status, warning):
@@ -139,7 +139,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-center">'
+        self.assertRegex(source, (r'<div class="align-center">'
                                           r'<a class="reference internal image-reference" href="(.*?.png)">'
                                           r'<img height="97.0" src="\1" width="224.0" /></a></div>'))
 
@@ -153,7 +153,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<img .*? id="target" src=".*?" .*? /></div>'))
 
     @with_png_app
@@ -167,7 +167,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<a class="reference internal image-reference" href="(.*?.png)">'
                                           r'<img height="97.0" id="target" src="\1" width="224.0" /></a></div>'))
 
@@ -182,7 +182,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<a class="reference internal image-reference" href="(.*?.png)">'
                                           r'<map name="(map_\d+)">'
                                           r'<area shape="rect" coords="32.0,20.0,96.0,40.0" '
@@ -204,7 +204,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default"><map name="(map_\d+)">'
+        self.assertRegex(source, (r'<div class="align-default"><map name="(map_\d+)">'
                                           r'<area shape="rect" coords="64.0,40.0,192.0,80.0" href="#target"></map>'
                                           r'<img .*? src=".*?.png" usemap="#\1" .*?/></div>'))
 
@@ -223,7 +223,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default"><map name="(map_\d+)">'
+        self.assertRegex(source, (r'<div class="align-default"><map name="(map_\d+)">'
                                           r'<area shape="rect" coords="64.0,40.0,192.0,80.0" href="#hello-world">'
                                           r'</map><img .*? src=".*?.png" usemap="#\1" .*?/></div>'))
 
@@ -237,7 +237,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<img .*? src=".*?.png" .*?/></div>'))
         self.assertIn('undefined label: unknown_target', warning.getvalue())
 
@@ -250,7 +250,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'<div class="align-default"><svg .*?>')
+        self.assertRegex(source, r'<div class="align-default"><svg .*?>')
 
     @with_svg_app
     def test_width_option_on_svg(self, app, status, warning):
@@ -262,7 +262,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<svg height="97.0" viewBox="0 0 448 194" width="224.0" .*?>'))
 
     @with_svg_app
@@ -275,7 +275,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<svg height="97.0" viewBox="0 0 448 194" width="224.0" .*?>'))
 
     @with_svg_app
@@ -289,7 +289,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<svg height="200.0" viewBox="0 0 448 194" width="100.0" .*?>'))
 
     @with_svg_app
@@ -302,7 +302,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<svg height="48.5" viewBox="0 0 448 194" width="112.0" .*?>'))
 
     @with_svg_app
@@ -316,7 +316,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<svg height="3.03125" viewBox="0 0 448 194" width="7.0" .*?>'))
 
     @with_svg_app
@@ -329,7 +329,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'<div class="align-center"><svg .*?>')
+        self.assertRegex(source, r'<div class="align-center"><svg .*?>')
 
     @with_svg_app
     def test_name_option_on_svg(self, app, status, warning):
@@ -341,7 +341,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'<div class="align-default">'
+        self.assertRegex(source, (r'<div class="align-default">'
                                           r'<span id="target"></span><svg .*?>'))
 
     @with_svg_app
@@ -359,7 +359,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'<a xlink:href="#target">\n\s*<rect .*?>\n\s*</a>')
+        self.assertRegex(source, r'<a xlink:href="#target">\n\s*<rect .*?>\n\s*</a>')
 
     @with_svg_app
     def test_reftarget_in_href_on_svg2(self, app, status, warning):
@@ -376,7 +376,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'<a xlink:href="#hello-world">\n\s*<rect .*?>\n\s*</a>')
+        self.assertRegex(source, r'<a xlink:href="#hello-world">\n\s*<rect .*?>\n\s*</a>')
 
     @with_svg_app
     def test_missing_reftarget_in_href_on_svg(self, app, status, warning):
@@ -412,4 +412,4 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'index.html').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'<text[^>]+>A_foo</text>')  # 2nd diagram has a node labeled 'A_foo'.
+        self.assertRegex(source, r'<text[^>]+>A_foo</text>')  # 2nd diagram has a node labeled 'A_foo'.
--- a/tests/test_latex.py
+++ b/tests/test_latex.py
@@ -43,7 +43,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'\\sphinxincludegraphics{{seqdiag-.*?}.png}')
+        self.assertRegex(source, r'\\sphinxincludegraphics{{seqdiag-.*?}.png}')
 
     @unittest.skipUnless(os.path.exists(seqdiag_fontpath), "TrueType font not found")
     @with_pdf_app
@@ -55,7 +55,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'\\sphinxincludegraphics{seqdiag-.*?.pdf}')
+        self.assertRegex(source, r'\\sphinxincludegraphics{seqdiag-.*?.pdf}')
 
     @unittest.skipUnless(os.path.exists(seqdiag_fontpath), "TrueType font not found")
     @with_oldpdf_app
@@ -67,7 +67,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'\\sphinxincludegraphics{{seqdiag-.*?}.pdf}')
+        self.assertRegex(source, r'\\sphinxincludegraphics{{seqdiag-.*?}.pdf}')
 
     @with_png_app
     def test_width_option(self, app, status, warning):
@@ -79,7 +79,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'\\sphinxincludegraphics\[width=3cm\]{{seqdiag-.*?}.png}')
+        self.assertRegex(source, r'\\sphinxincludegraphics\[width=3cm\]{{seqdiag-.*?}.png}')
 
     @with_png_app
     def test_height_option(self, app, status, warning):
@@ -91,7 +91,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'\\sphinxincludegraphics\[height=4cm\]{{seqdiag-.*?}.png}')
+        self.assertRegex(source, r'\\sphinxincludegraphics\[height=4cm\]{{seqdiag-.*?}.png}')
 
     @with_png_app
     def test_scale_option(self, app, status, warning):
@@ -103,7 +103,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'\\sphinxincludegraphics\[scale=0.5\]{{seqdiag-.*?}.png}')
+        self.assertRegex(source, r'\\sphinxincludegraphics\[scale=0.5\]{{seqdiag-.*?}.png}')
 
     @with_png_app
     def test_align_option_left(self, app, status, warning):
@@ -115,7 +115,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'{\\sphinxincludegraphics{{seqdiag-.*?}.png}'
+        self.assertRegex(source, (r'{\\sphinxincludegraphics{{seqdiag-.*?}.png}'
                                           r'\\hspace\*{\\fill}}'))
 
     @with_png_app
@@ -128,7 +128,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'{\\hspace\*{\\fill}'
+        self.assertRegex(source, (r'{\\hspace\*{\\fill}'
                                           r'\\sphinxincludegraphics{{seqdiag-.*?}.png}'
                                           r'\\hspace\*{\\fill}}'))
 
@@ -142,7 +142,7 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, (r'{\\hspace\*{\\fill}'
+        self.assertRegex(source, (r'{\\hspace\*{\\fill}'
                                           r'\\sphinxincludegraphics{{seqdiag-.*?}.png}}'))
 
     @with_png_app
@@ -162,7 +162,7 @@
                              r'\\noindent\\sphinxincludegraphics{{seqdiag-.*?}.png}' + CR +
                              r'\\caption{hello world}\\label{\\detokenize{index:id1}}\\end{figure}'),
                             re.DOTALL)
-        self.assertRegexpMatches(source, figure)
+        self.assertRegex(source, figure)
 
     @with_png_app
     def test_caption_option_and_align_option(self, app, status, warning):
@@ -181,7 +181,7 @@
                              r'\\noindent\\sphinxincludegraphics{{seqdiag-.*?}.png}' + CR +
                              r'\\caption{hello world}\\label{\\detokenize{index:id1}}\\end{wrapfigure}'),
                             re.DOTALL)
-        self.assertRegexpMatches(source, figure)
+        self.assertRegex(source, figure)
 
     @with_png_app
     def test_href(self, app, status, warning):
@@ -193,4 +193,4 @@
         """
         app.builder.build_all()
         source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
-        self.assertRegexpMatches(source, r'\\sphinxincludegraphics{{seqdiag-.*?}.png}')
+        self.assertRegex(source, r'\\sphinxincludegraphics{{seqdiag-.*?}.png}')