diff --git a/infra/kokoro/windows/build.bat b/infra/kokoro/windows/build.bat
index 0de7b53622..e3b2670087 100644
--- a/infra/kokoro/windows/build.bat
+++ b/infra/kokoro/windows/build.bat
@@ -156,7 +156,7 @@ cd /d %SRC_DIR% || goto :error
 rem Run tests with DXC, FXC and Metal validation
 set OLD_PATH=%PATH%
 set PATH=C:\Program Files\Metal Developer Tools\macos\bin;%PATH%
-call git bash -- ./test/tint/test-all.sh ../dawn-build/tint.exe --verbose || goto :error
+call git bash -- ./test/tint/test-all.sh %BUILD_DIR%/tint.exe --verbose || goto :error
 set PATH=%OLD_PATH%
 @echo off
 
diff --git a/tools/run b/tools/run
index ffcb9d89d2..b70540c2a9 100755
--- a/tools/run
+++ b/tools/run
@@ -45,6 +45,6 @@ if [ ! -d "${SCRIPT_DIR}/src/cmd/${TOOL}" ]; then
   show_usage
 fi
 
-pushd "${SCRIPT_DIR}/src" > /dev/null
-    go run "./cmd/${TOOL}" "${@:2}"
+pushd "${SCRIPT_DIR}/.." > /dev/null
+    go run "${SCRIPT_DIR}/src/cmd/${TOOL}" "${@:2}"
 popd > /dev/null