diff --git a/tests/test-doctest.py b/tests/test-doctest.py
--- a/tests/test-doctest.py
+++ b/tests/test-doctest.py
@@ -49,14 +49,11 @@ def testmod(name, optionflags=0, testtar
     runner.summarize()
 
 
-testmod('mercurial.changegroup')
 testmod('mercurial.changelog')
 testmod('mercurial.cmdutil')
 testmod('mercurial.color')
 testmod('mercurial.config')
-testmod('mercurial.context')
 testmod('mercurial.dagparser', optionflags=doctest.NORMALIZE_WHITESPACE)
-testmod('mercurial.dispatch')
 testmod('mercurial.encoding')
 testmod('mercurial.fancyopts')
 testmod('mercurial.formatter')
@@ -65,23 +62,21 @@ testmod('mercurial.hgweb.hgwebdir_mod')
 testmod('mercurial.match')
 testmod('mercurial.mdiff')
 testmod('mercurial.minirst')
+testmod('mercurial.parser')
 testmod('mercurial.patch')
 testmod('mercurial.pathutil')
-testmod('mercurial.parser')
 testmod('mercurial.pycompat')
-testmod('mercurial.revlog')
 testmod('mercurial.revlogutils.deltas')
 testmod('mercurial.revset')
 testmod('mercurial.revsetlang')
+testmod('mercurial.simplemerge')
 testmod('mercurial.smartset')
 testmod('mercurial.store')
 testmod('mercurial.subrepo')
-testmod('mercurial.templatefilters')
 testmod('mercurial.templater')
 testmod('mercurial.ui')
-testmod('mercurial.url')
 testmod('mercurial.util')
-testmod('mercurial.util', testtarget='platform')
+testmod('mercurial.util', testtarget='platform')  # windows.py or posix.py
 testmod('mercurial.utils.dateutil')
 testmod('mercurial.utils.stringutil')
 testmod('hgext.convert.convcmd')
@@ -93,3 +88,7 @@ testmod('hgext.fix')
 testmod('hgext.mq')
 # Helper scripts in tests/ that have doctests:
 testmod('drawdag')
+testmod('test-run-tests')
+
+# Disabled since it requires extra modules that might not be installed.
+# testmod('i18n.check-translation')