diff --git a/test/Makefile b/test/Makefile
index 259f34ccbd5..3c56b79f924 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -44,8 +44,8 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
 	@echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp
 	@echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp
 	@echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp
-	@echo 'set llvmgcc "PATH=$(LLVMToolDir):$(PATH) $(LLVMGCC)"' >> site.tmp
-	@echo 'set llvmgxx "PATH=$(LLVMToolDir):$(PATH) $(LLVMGCC)"' >> site.tmp
+	@echo 'set llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
+	@echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
 	@echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
 	@test ! -f site.exp || \
 	sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp