diff --git a/flang/test/Driver/help-f18.f90 b/flang/test/Driver/help-f18.f90
--- a/flang/test/Driver/help-f18.f90
+++ b/flang/test/Driver/help-f18.f90
@@ -1,7 +1,9 @@
-! RUN: %f18 -h 2>&1 | FileCheck %s
-! RUN: %f18 -help 2>&1 | FileCheck %s
-! RUN: %f18 --help 2>&1 | FileCheck %s
-! RUN: %f18 -? 2>&1 | FileCheck %s
+! REQUIRES: old-flang-driver
+
+! RUN: %flang -h 2>&1 | FileCheck %s
+! RUN: %flang -help 2>&1 | FileCheck %s
+! RUN: %flang --help 2>&1 | FileCheck %s
+! RUN: %flang -? 2>&1 | FileCheck %s
 
 ! CHECK: f18: LLVM Fortran compiler
 
diff --git a/flang/test/lit.cfg.py b/flang/test/lit.cfg.py
--- a/flang/test/lit.cfg.py
+++ b/flang/test/lit.cfg.py
@@ -42,6 +42,8 @@
 # config.
 if config.include_flang_new_driver_test:
   config.available_features.add('new-flang-driver')
+else:
+  config.available_features.add('old-flang-driver')
 
 # test_source_root: The root path where tests are located.
 config.test_source_root = os.path.dirname(__file__)
@@ -62,11 +64,7 @@
 
 # For each occurrence of a flang tool name, replace it with the full path to
 # the build directory holding that tool.
-tools = [
-  ToolSubst('%f18', command=FindTool('f18'),
-    unresolved='fatal')
-]
-
+tools = []
 if config.include_flang_new_driver_test:
    tools.append(ToolSubst('%flang', command=FindTool('flang-new'), unresolved='fatal'))
    tools.append(ToolSubst('%flang_fc1', command=FindTool('flang-new'),