diff --git a/test/Makefile b/test/Makefile
index 31de463b3e2..4ab3df8c6a8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -136,7 +136,7 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
 	@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 prcontext $(LLVM_SRC_ROOT)/test/Scripts/prcontext.py' >> site.tmp
+	@echo 'set prcontext "$(PYTHON) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.py"' >> site.tmp
 	@echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp
 	@echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp
 	@echo 'set llvmgcc $(LLVMGCCDIR)/bin/gcc' >> site.tmp
diff --git a/test/lib/llvm-dg.exp b/test/lib/llvm-dg.exp
index 7fcb1facdb8..35f9d3bf295 100644
--- a/test/lib/llvm-dg.exp
+++ b/test/lib/llvm-dg.exp
@@ -53,7 +53,7 @@ proc llvm-runtest { programs objdir subdir target_triplet llvmgcc llvmgxx prcont
 		regsub -all {%llvmgxx} $new_runline $llvmgxx new_runline
 		
 		#replace %prcontext with actual path to llvmg++ (Goes away when we remove qmtest)
-		regsub -all {%prcontext} $new_runline "python $prcontext" new_runline
+		regsub -all {%prcontext} $new_runline "$prcontext" new_runline
 
 		puts $scriptFileId $new_runline
 	    } elseif {[regexp {XFAIL:[ *](.+)} $line match targets]} {