diff --git a/certbot/plugins/manual.py b/certbot/plugins/manual.py
index ae263e0a3..7ae45a8b5 100644
--- a/certbot/plugins/manual.py
+++ b/certbot/plugins/manual.py
@@ -217,11 +217,11 @@ s.serve_forever()" """
                 achall.chall, achall.domain,
                 achall.account_key.public_key())
         except acme_errors.DependencyError:
-            verification_status = False
-            logger.warning("Dns challenge requires `dnspython`")
-
-        if not verification_status:
-            logger.warning("Self-verify of challenge failed.")
+            logger.warning("Self verification requires optional "
+                           "dependency `dnspython` to be installed.")
+        else:
+            if not verification_status:
+                logger.warning("Self-verify of challenge failed.")
 
         return response
 
diff --git a/certbot/plugins/manual_test.py b/certbot/plugins/manual_test.py
index 7626f607d..e55abbeb5 100644
--- a/certbot/plugins/manual_test.py
+++ b/certbot/plugins/manual_test.py
@@ -90,7 +90,7 @@ class AuthenticatorTest(unittest.TestCase):
 
         with mock.patch("certbot.plugins.manual.logger") as mock_logger:
             self.auth.perform([self.dns01])
-            self.assertEqual(2, mock_logger.warning.call_count)
+            self.assertEqual(1, mock_logger.warning.call_count)
 
         mock_raw_input.assert_called_once_with("Press ENTER to continue")