diff --git a/clang-tools-extra/test/Makefile b/clang-tools-extra/test/Makefile
index 484c24bcd4fc..7b0b71f3dc9b 100644
--- a/clang-tools-extra/test/Makefile
+++ b/clang-tools-extra/test/Makefile
@@ -53,6 +53,7 @@ lit.site.cfg: FORCE
 	@$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> lit.tmp
 	@$(ECHOPATH) s=@CLANG_TOOLS_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> lit.tmp
 	@$(ECHOPATH) s=@CLANG_TOOLS_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> lit.tmp
+	@$(ECHOPATH) s=@CLANG_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
 	@$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp
 	@sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
 	@-rm -f lit.tmp
diff --git a/clang-tools-extra/test/lit.site.cfg.in b/clang-tools-extra/test/lit.site.cfg.in
index 7fe0af3ae96d..8db15639e866 100644
--- a/clang-tools-extra/test/lit.site.cfg.in
+++ b/clang-tools-extra/test/lit.site.cfg.in
@@ -15,6 +15,7 @@ config.have_libedit = "@HAVE_LIBEDIT@"
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
 try:
+    config.clang_tools_dir = config.clang_tools_dir % lit_config.params
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
 except KeyError: