diff --git a/win32/build/Makefile b/win32/build/Makefile
index 3ca135a4842..9f389360d6c 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -152,15 +152,14 @@ clean-pgo: clean-all
 	-del /f /q $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING).zip
 
 !if $(PHP_TEST_INI_PATH) == ""
-test: set-test-env
+test: set-tmp-env
 	"$(BUILD_DIR)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(BUILD_DIR)\php.exe"
 !else
-test: set-test-env
+test: set-tmp-env
 	"$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) -d open_basedir= -d output_buffering=0 -d memory_limit=-1 run-tests.php -p "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(TESTS)
 !endif
 
-build-snap: generated_files
-	SET PATH=$(PATH);$(PHP_BUILD)\bin
+build-snap: set-tmp-env generated_files
 	@$(MAKE) "$(BUILD_DIR)\$(PHPDLL)"
 	-for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
 	-for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 72936e16e24..286ca0e34a6 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1840,7 +1840,7 @@ function is_on_exclude_list_for_test_ini(list, name)
 	return false;
 }
 
-function generate_test_php_ini()
+function generate_tmp_php_ini()
 {
 	if ("no" == PHP_TEST_INI) {
 		/* Test ini generation is disabled. */
@@ -1918,7 +1918,7 @@ function generate_files()
 
 	STDOUT.WriteLine("Generating files...");
 	if (!MODE_PHPIZE) {
-		generate_test_php_ini();
+		generate_tmp_php_ini();
 	}
 	generate_makefile();
 	if (!MODE_PHPIZE) {
@@ -2351,7 +2351,7 @@ function generate_makefile()
 
 	if (!MODE_PHPIZE) {
 		var val = "yes" == PHP_TEST_INI ? PHP_TEST_INI_PATH : "";
-		/* Be sure it's done after generate_test_php_ini(). */
+		/* Be sure it's done after generate_tmp_php_ini(). */
 		MF.WriteLine("PHP_TEST_INI_PATH=\"" + val + "\"");
 	}
 
@@ -2404,7 +2404,7 @@ function generate_makefile()
 
 	MF.WriteBlankLines(1);
 
-	var extra_path = PHP_PHP_BUILD + "\\bin";
+	var extra_path = "$(PHP_BUILD)\\bin";
 	if (PHP_EXTRA_LIBS.length) {
 		path = PHP_EXTRA_LIBS.split(';');
 		for (i = 0; i < path.length; i++) {
@@ -2414,7 +2414,7 @@ function generate_makefile()
 			}
 		}
 	}
-	MF.WriteLine("set-test-env:");
+	MF.WriteLine("set-tmp-env:");
 	MF.WriteLine("	@set PATH=" + extra_path + ";$(PATH)");
 
 	MF.WriteBlankLines(2);