diff --git a/tests/root/desc.txt b/tests/root/desc.txt
index 43519773e..ee70b0507 100644
--- a/tests/root/desc.txt
+++ b/tests/root/desc.txt
@@ -65,6 +65,14 @@ Others
 
 .. envvar:: HOME
 
+.. program:: python
+
+.. cmdoption:: -c command
+
+.. program:: perl
+
+.. cmdoption:: -c
+
 
 Testing references
 ==================
diff --git a/tests/root/markup.txt b/tests/root/markup.txt
index 3d328e8d3..07f8deb6d 100644
--- a/tests/root/markup.txt
+++ b/tests/root/markup.txt
@@ -103,16 +103,32 @@ Inline markup
 * :newsgroup:`newsgroup`
 * :program:`program`
 * :regexp:`regexp`
+* :menuselection:`File --> Close`
+* :file:`a/{varpart}/b`
+* :samp:`print {i}`
 
 *Linking inline markup*
 
 * :pep:`8`
 * :rfc:`1`
 * :envvar:`HOME`
+* :keyword:`with`
+* :token:`try statement <try_stmt>`
+* :doc:`subdir/includes`
+* ``:download:`` is tested in includes.txt
+* :option:`Python -c option <python -c>`
 
 Test :abbr:`abbr (abbreviation)` and another :abbr:`abbr (abbreviation)`.
 
 
+.. _with:
+
+With
+----
+
+(Empty section.)
+
+
 Tables
 ------
 
diff --git a/tests/test_build.py b/tests/test_build.py
index e4d29319f..f9704fdf8 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -103,9 +103,17 @@ HTML_XPATH = {
         ".//li/strong": '^program$',
         ".//li/em": '^dfn$',
         ".//li/tt/span[@class='pre']": '^kbd$',
-        ".//a[@href='desc.html#envvar-HOME']/tt/span[@class='pre']": 'HOME',
+        ".//li/em": u'File \N{TRIANGULAR BULLET} Close',
+        ".//li/tt/span[@class='pre']": '^a/$',
+        ".//li/tt/em/span[@class='pre']": '^varpart$',
+        ".//li/tt/em/span[@class='pre']": '^i$',
         ".//a[@href='http://www.python.org/dev/peps/pep-0008']/strong": 'PEP 8',
         ".//a[@href='http://tools.ietf.org/html/rfc1.html']/strong": 'RFC 1',
+        ".//a[@href='desc.html#envvar-HOME']/tt/span[@class='pre']": 'HOME',
+        ".//a[@href='#with']/tt/span[@class='pre']": '^with$',
+        ".//a[@href='#grammar-token-try_stmt']/tt/span": '^statement$',
+        ".//a[@href='subdir/includes.html']/em": 'Including in subdir',
+        ".//a[@href='desc.html#cmdoption-python-c']/em": 'Python -c option',
         # abbreviations
         ".//abbr[@title='abbreviation']": '^abbr$',
         # version stuff