diff --git a/clang/utils/C++Tests/lit.cfg b/clang/utils/C++Tests/lit.cfg
index aa3b09d50a4c..e61502b62edd 100644
--- a/clang/utils/C++Tests/lit.cfg
+++ b/clang/utils/C++Tests/lit.cfg
@@ -17,14 +17,10 @@ config.suffixes = []
 # Reset these from the Clang config.
 config.test_source_root = config.test_exec_root = None
 
-# Don't run Clang checks by default.
+# Don't run Clang and LLVM code checks by default.
 config.excludes = []
-if (not lit.params.get('run_clang_syntax') and
-    not lit.params.get('run_clang_all')):
-    config.excludes.append('Clang-Syntax')
-if (not lit.params.get('run_clang_code_syntax') and
-    not lit.params.get('run_clang_all')):
+if not lit.params.get('run_clang_all'):
     config.excludes.append('Clang-Code-Syntax')
-if (not lit.params.get('run_clang_compile') and
-    not lit.params.get('run_clang_all')):
     config.excludes.append('Clang-Code-Compile')
+    config.excludes.append('LLVM-Code-Syntax')
+    config.excludes.append('LLVM-Code-Compile')