diff --git a/test/test_Config.py b/test/test_Config.py
index 8911a7e24..96cd5b88e 100644
--- a/test/test_Config.py
+++ b/test/test_Config.py
@@ -46,9 +46,9 @@ class ConfigTestCase(ChannelPluginTestCase):
 
     def testHelp(self):
         self.assertError('config help alsdkfj')
-        self.assertError('config help supybot')
-        self.assertError('config help supybot.plugins')
         self.assertError('config help supybot.alsdkfj')
+        self.assertNotError('config help supybot') # We tell the user to list.
+        self.assertNotError('config help supybot.plugins')
         self.assertNotError('config help supybot.replies.success')
         self.assertNotError('config help replies.success')
 
@@ -57,6 +57,11 @@ class ConfigTestCase(ChannelPluginTestCase):
                              'supybot.commands.defaultPlugins.help',
                              'AssertionError')
 
+    def testHelpExhaustively(self):
+        L = conf.supybot.getValues(getChildren=True)
+        for (name, v) in L:
+            self.assertNotError('config help %s' % name)
+
     def testSearch(self):
         self.assertNotError('config search chars')
         self.assertNotError('config channel reply.whenAddressedBy.chars @')