diff --git a/llvm/test/FileCheck/verbose.txt b/llvm/test/FileCheck/verbose.txt
index 45123b5cdd10cd..d0532d02f9fc61 100644
--- a/llvm/test/FileCheck/verbose.txt
+++ b/llvm/test/FileCheck/verbose.txt
@@ -10,6 +10,22 @@
 ; RUN: FileCheck --dump-input=never -vv --input-file %s %s 2>&1 | \
 ; RUN:   FileCheck --strict-whitespace --check-prefixes V,VV %s
 
+; RUN: %ProtectFileCheckOutput \
+; RUN: FileCheck --dump-input=never -v -v --input-file %s %s 2>&1 | \
+; RUN:   FileCheck --strict-whitespace --check-prefix V %s
+
+; RUN: %ProtectFileCheckOutput \
+; RUN: FileCheck --dump-input=never -vv -vv --input-file %s %s 2>&1 | \
+; RUN:   FileCheck --strict-whitespace --check-prefixes V,VV %s
+
+; RUN: %ProtectFileCheckOutput \
+; RUN: FileCheck --dump-input=never -v -vv --input-file %s %s 2>&1 | \
+; RUN:   FileCheck --strict-whitespace --check-prefixes V,VV %s
+
+; RUN: %ProtectFileCheckOutput \
+; RUN: FileCheck --dump-input=never -vv -v --input-file %s %s 2>&1 | \
+; RUN:   FileCheck --strict-whitespace --check-prefixes V,VV %s
+
 ; END.
 
 foo
diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp
index 52d0fb8681f79c..e0037b596cdb92 100644
--- a/llvm/utils/FileCheck/FileCheck.cpp
+++ b/llvm/utils/FileCheck/FileCheck.cpp
@@ -97,12 +97,12 @@ static cl::opt<bool> AllowDeprecatedDagOverlap(
              "non-overlapping CHECK-DAG implementation.\n"));
 
 static cl::opt<bool> Verbose(
-    "v", cl::init(false),
+    "v", cl::init(false), cl::ZeroOrMore,
     cl::desc("Print directive pattern matches, or add them to the input dump\n"
              "if enabled.\n"));
 
 static cl::opt<bool> VerboseVerbose(
-    "vv", cl::init(false),
+    "vv", cl::init(false), cl::ZeroOrMore,
     cl::desc("Print information helpful in diagnosing internal FileCheck\n"
              "issues, or add it to the input dump if enabled.  Implies\n"
              "-v.\n"));