diff --git a/flang/test/Driver/werror-wrong.f90 b/flang/test/Driver/werror-wrong.f90
index 3151bb165dc9..6c18f1663f98 100644
--- a/flang/test/Driver/werror-wrong.f90
+++ b/flang/test/Driver/werror-wrong.f90
@@ -1,4 +1,5 @@
 ! Ensure that only argument -Werror is supported.
+! REQUIRES: new-flang-driver
 
 ! RUN: not %flang_fc1 -fsyntax-only -Wall %s  2>&1 | FileCheck %s --check-prefix=WRONG
 ! RUN: not %flang_fc1 -fsyntax-only -WX %s  2>&1 | FileCheck %s --check-prefix=WRONG
diff --git a/flang/tools/f18/f18.cpp b/flang/tools/f18/f18.cpp
index 691d4378928a..1ea22cef920b 100644
--- a/flang/tools/f18/f18.cpp
+++ b/flang/tools/f18/f18.cpp
@@ -514,11 +514,6 @@ int main(int argc, char *const argv[]) {
     } else if (arg.find("-W") != std::string::npos) {
       if (arg == "-Werror")
         driver.warningsAreErrors = true;
-      else {
-        // Only -Werror is supported currently
-        llvm::errs() << "Only `-Werror` is supported currently.\n";
-        return EXIT_FAILURE;
-      }
     } else if (arg == "-ed") {
       options.features.Enable(Fortran::common::LanguageFeature::OldDebugLines);
     } else if (arg == "-E") {