diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 88266aaeb..6e2849466 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -241,8 +241,8 @@ def _treat_as_renewal(config, domains):
             # We aren't in a duplicative-names situation at all, so we don't
             # have to tell or ask the user anything about this.
             pass
-        elif zope.component.getUtility(interfaces.IDisplay).yesno(
-                question, "Replace", "Cancel"):
+        elif config.no_confirm or zope.component.getUtility(
+                interfaces.IDisplay).yesno(question, "Replace", "Cancel"):
             renewal = True
         else:
             reporter_util = zope.component.getUtility(interfaces.IReporter)
@@ -661,7 +661,7 @@ def create_parser(plugins, args):
         help="show program's version number and exit")
     helpful.add(
         "automation", "--no-confirm", dest="no_confirm", action="store_true",
-        help="Turn off confirmation screens, currently used for --revoke")
+        help="Turn off confirmation screens, used for renewal screens")
     helpful.add(
         "automation", "--agree-eula", dest="eula", action="store_true",
         help="Agree to the Let's Encrypt Developer Preview EULA")
diff --git a/tests/integration/_common.sh b/tests/integration/_common.sh
index c8b142cf2..7897ff1b7 100755
--- a/tests/integration/_common.sh
+++ b/tests/integration/_common.sh
@@ -23,6 +23,7 @@ letsencrypt_test () {
         --agree-eula \
         --agree-tos \
         --email "" \
+        --no-confirm \
         --debug \
         -vvvvvvv \
         "$@"