diff --git a/test/Makefile b/test/Makefile
index ab43cff5fce..45296195366 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -40,11 +40,11 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
 	@echo '## these variables are automatically generated by make ##' >site.tmp
 	@echo '# Do not edit here.  If you wish to override these values' >>site.tmp
 	@echo '# edit the last section' >>site.tmp
-	@echo "set target_triplet $(TARGET_TRIPLE)" >> site.tmp
-	@echo "set llvmgcc_version $(LLVMGCC_VERSION)" >> site.tmp
+	@echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp
+	@echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp
 	@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 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 llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp