diff --git a/presubmit_support.py b/presubmit_support.py
index e63306f1a..3cc68182f 100755
--- a/presubmit_support.py
+++ b/presubmit_support.py
@@ -767,7 +767,7 @@ def DoPresubmitChecks(change_info,
                             may_prompt=False):
           error_count += 1
         output_stream.write('\n')
-  if not errors and warnings:
+  if not errors and warnings and may_prompt:
     output_stream.write(
       'There were presubmit warnings. Sure you want to continue? (y/N): ')
     response = input_stream.readline()
diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py
index 9908bfb54..d6827cb63 100755
--- a/tests/presubmit_unittest.py
+++ b/tests/presubmit_unittest.py
@@ -380,7 +380,7 @@ class PresubmitUnittest(PresubmitTestsBase):
     output = StringIO.StringIO()
     input = StringIO.StringIO('n\n')  # say no to the warning
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
-                                            None, False))
+                                            None, True))
     self.assertEqual(output.getvalue().count('??'), 2)
 
     output = StringIO.StringIO()
@@ -391,7 +391,7 @@ class PresubmitUnittest(PresubmitTestsBase):
                                                 output,
                                                 input,
                                                 None,
-                                                False))
+                                                True))
     self.assertEquals(output.getvalue().count('??'), 2)
 
   def testDoPresubmitChecksNoWarningPromptIfErrors(self):