diff --git a/bolt/test/lit.cfg.py b/bolt/test/lit.cfg.py
--- a/bolt/test/lit.cfg.py
+++ b/bolt/test/lit.cfg.py
@@ -55,8 +55,10 @@
 
 llvm_config.use_default_substitutions()
 
-llvm_config.use_clang(additional_tool_dirs=[os.path.dirname(config.bolt_clang)])
-llvm_config.use_lld(additional_tool_dirs=[os.path.dirname(config.bolt_lld)])
+llvm_config.config.environment['CLANG'] = config.bolt_clang
+llvm_config.config.environment['LLD'] = config.bolt_lld
+llvm_config.use_clang()
+llvm_config.use_llvm_tool('lld', required=True, search_env='LLD')
 
 config.substitutions.append(('%cflags', '-no-pie'))
 config.substitutions.append(('%cxxflags', '-no-pie'))