diff --git a/clang/test/Analysis/missing-z3-nocrash.c b/clang/test/Analysis/missing-z3-nocrash.c
index 698430fffe1a1..2e345ad00f5ab 100644
--- a/clang/test/Analysis/missing-z3-nocrash.c
+++ b/clang/test/Analysis/missing-z3-nocrash.c
@@ -1,5 +1,5 @@
 // RUN: not %clang_analyze_cc1 -analyzer-constraints=z3 %s 2>&1 | FileCheck %s
-// REQUIRES: no-z3
+// UNSUPPORTED: z3
 
 // CHECK: error: analyzer constraint manager 'z3' is only available if LLVM
 // CHECK: was built with -DLLVM_ENABLE_Z3_SOLVER=ON
diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py
index 6796c64fc4778..14fefbf0d5424 100644
--- a/clang/test/lit.cfg.py
+++ b/clang/test/lit.cfg.py
@@ -224,8 +224,6 @@ def have_host_clang_repl_cuda():
         config.available_features.add("z3")
         if config.clang_staticanalyzer_z3_mock:
             config.available_features.add("z3-mock")
-    else:
-        config.available_features.add("no-z3")
 
     check_analyzer_fixit_path = os.path.join(
         config.test_source_root, "Analysis", "check-analyzer-fixit.py"