diff --git a/debuginfo-tests/lit.cfg.py b/debuginfo-tests/lit.cfg.py
--- a/debuginfo-tests/lit.cfg.py
+++ b/debuginfo-tests/lit.cfg.py
@@ -118,7 +118,7 @@
         'debuginfo-tests project.'.format(config.host_triple))
 
 # Check which debuggers are available:
-built_lldb = llvm_config.use_llvm_tool('lldb', search_env='CLANG')
+built_lldb = llvm_config.use_llvm_tool('lldb', search_env='LLDB')
 lldb_path = None
 if built_lldb is not None:
     lldb_path = built_lldb
diff --git a/llvm/utils/lit/lit/TestingConfig.py b/llvm/utils/lit/lit/TestingConfig.py
--- a/llvm/utils/lit/lit/TestingConfig.py
+++ b/llvm/utils/lit/lit/TestingConfig.py
@@ -22,12 +22,13 @@
             }
 
         pass_vars = ['LIBRARY_PATH', 'LD_LIBRARY_PATH', 'SYSTEMROOT', 'TERM',
-                     'CLANG', 'LD_PRELOAD', 'ASAN_OPTIONS', 'UBSAN_OPTIONS',
-                     'LSAN_OPTIONS', 'ADB', 'ANDROID_SERIAL', 'SSH_AUTH_SOCK',
-                     'SANITIZER_IGNORE_CVE_2016_2143', 'TMPDIR', 'TMP', 'TEMP',
-                     'TEMPDIR', 'AVRLIT_BOARD', 'AVRLIT_PORT',
-                     'FILECHECK_OPTS', 'VCINSTALLDIR', 'VCToolsinstallDir',
-                     'VSINSTALLDIR', 'WindowsSdkDir', 'WindowsSDKLibVersion']
+                     'CLANG', 'LLDB', 'LD_PRELOAD', 'ASAN_OPTIONS',
+                     'UBSAN_OPTIONS', 'LSAN_OPTIONS', 'ADB', 'ANDROID_SERIAL',
+                     'SSH_AUTH_SOCK', 'SANITIZER_IGNORE_CVE_2016_2143',
+                     'TMPDIR', 'TMP', 'TEMP', 'TEMPDIR', 'AVRLIT_BOARD',
+                     'AVRLIT_PORT', 'FILECHECK_OPTS', 'VCINSTALLDIR',
+                     'VCToolsinstallDir', 'VSINSTALLDIR', 'WindowsSdkDir',
+                     'WindowsSDKLibVersion']
 
         if sys.platform == 'win32':
             pass_vars.append('INCLUDE')