diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 94bc6c3b9..6b5c03be5 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -43,7 +43,7 @@ reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \
 :encoding: option\\n?
 %(root)s/includes.txt:4: WARNING: download file not readable: .*?nonexisting.png
 %(root)s/markup.txt:\\d+: WARNING: Malformed :option: u'Python c option', does \
-not contain option marker - or -- or /
+not contain option marker - or -- or / or \\+
 """
 
 HTML_WARNINGS = ENV_WARNINGS + """\
@@ -144,7 +144,7 @@ HTML_XPATH = {
         (".//a[@href='subdir/includes.html']"
             "[@class='reference internal']/em", 'Including in subdir'),
         (".//a[@href='objects.html#cmdoption-python-c']"
-            "[@class='reference internal']/em", 'Python -c option'),
+            "[@class='reference internal']/code/span[@class='pre']", '-c'),
         # abbreviations
         (".//abbr[@title='abbreviation']", '^abbr$'),
         # version stuff
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 81ade641d..a327348e6 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -108,8 +108,9 @@ def test_inline():
 
     # non-interpolation of dashes in option role
     yield (verify_re, ':option:`--with-option`',
-           '<p><em( class="xref std std-option")?>--with-option</em></p>$',
-           r'\\emph{\\texttt{-{-}with-option}}$')
+           '<p><code( class="xref std std-option docutils literal")?>'
+           '<span class="pre">--with-option</span></code></p>$',
+           r'\\code{-{-}with-option}$')
 
     # verify smarty-pants quotes
     yield verify, '"John"', '<p>&#8220;John&#8221;</p>', "``John''"