diff --git a/test/test.py b/test/test.py
index 60645604a..977586baf 100755
--- a/test/test.py
+++ b/test/test.py
@@ -259,7 +259,7 @@ class PluginDocumentation:
                 for attr in cb.__class__.__dict__:
                     if cb.isCommand(attr):
                         self.failUnless(getattr(cb, attr).__doc__,
-                                        '%s has no help' % attr)
+                                        '%s has no syntax' % attr)
     def testAllCommandsHaveMorehelp(self):
         for cb in self.irc.callbacks:
             if isinstance(cb, callbacks.PrivmsgRegexp):
@@ -270,7 +270,7 @@ class PluginDocumentation:
                         command = getattr(cb, attr)
                         helps = command.__doc__
                         self.failUnless(helps and len(helps.splitlines()) >= 3,
-                                        '%s has no morehelp' % attr)
+                                        '%s has no help' % attr)
 
     def testPluginHasDocumentation(self):
         for cb in self.irc.callbacks:
diff --git a/test/test_Alias.py b/test/test_Alias.py
index 9b64b1f5a..c02af884f 100644
--- a/test/test_Alias.py
+++ b/test/test_Alias.py
@@ -70,8 +70,8 @@ class AliasTestCase(PluginTestCase, PluginDocumentation):
     plugins = ('Alias', 'FunCommands', 'Utilities', 'MiscCommands')
     def testAliasHelp(self):
         self.assertNotError('alias slashdot foo')
-        self.assertNotRegexp('help slashdot', 'None')
-        self.assertResponse('morehelp slashdot', "Alias for 'foo'")
+        self.assertNotRegexp('syntax slashdot', 'None')
+        self.assertRegexp('help slashdot', "Alias for 'foo'")
         
     def testSimpleAlias(self):
         pi = '3.1456926535897932384626433832795028841971693'
diff --git a/test/test_Dict.py b/test/test_Dict.py
index c844f69fa..35f2f9796 100644
--- a/test/test_Dict.py
+++ b/test/test_Dict.py
@@ -35,12 +35,12 @@ class DictTestCase(PluginTestCase, PluginDocumentation):
     plugins = ('Dict', 'MiscCommands')
     def testHelps(self):
         self.assertNotError('list Dict')
+        self.assertNotError('syntax dict')
         self.assertNotError('help dict')
-        self.assertNotError('morehelp dict')
+        self.assertNotError('syntax dictionaries')
         self.assertNotError('help dictionaries')
-        self.assertNotError('morehelp dictionaries')
+        self.assertNotError('syntax randomdictionary')
         self.assertNotError('help randomdictionary')
-        self.assertNotError('morehelp randomdictionary')
 
     def testDict(self):
         self.assertNotError('dict slash')