diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 4cbfb8a2a..4c4692675 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -323,7 +323,7 @@ def diagnose_configurator_problem(cfg_type, requested, plugins):
     :param string requested: the plugin that was requested
     :param PluginRegistry plugins: available plugins
 
-    :raises error.ConfiguratorError if there was a problem
+    :raises error.ConfiguratorError: if there was a problem
     """
 
     if requested:
diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py
index ccc57cb8c..ee847b234 100644
--- a/letsencrypt/tests/cli_test.py
+++ b/letsencrypt/tests/cli_test.py
@@ -98,10 +98,13 @@ class CLITest(unittest.TestCase):
         plugins = disco.PluginsRegistry.find_all()
         args = ['--agree-eula', '--apache', '--authenticator', 'standalone']
         ret, _, _, _ = self._call(args)
+        # TODO replace these cases with .mockery to test both paths regardless
+        # of what's actually installed
         if "apache" in plugins:
             self.assertTrue("Too many flags setting" in ret)
         else:
-            self.assertTrue("The requested apache plugin does not" in ret)
+            self.assertTrue("The requested apache plugin does not appear" in ret)
+
 
     def test_rollback(self):
         _, _, _, client = self._call(['rollback'])