diff --git a/cli/save-as.sh b/cli/save-as.sh
index b0645ea12..a5f6ad8fe 100644
--- a/cli/save-as.sh
+++ b/cli/save-as.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2018-2019 Igara Studio S.A.
 
 function list_files() {
-    oldwd=$(pwd)
+    oldwd=$(pwd $PWDARG)
     cd $1 && ls -1 *.*
     cd $oldwd
 }
@@ -162,7 +162,7 @@ $ASEPRITE -b -script "$d/compare.lua" || exit 1
 
 d=$t/save-as-without-path
 mkdir $d
-oldwd=$(pwd)
+oldwd=$(pwd $PWDARG)
 cd $d
 $ASEPRITE -b -split-layers $oldwd/sprites/abcd.aseprite -save-as issue591.png || exit 1
 if [[ ! -f "issue591 (a).png" ||
diff --git a/run-tests.sh b/run-tests.sh
index bd52f6100..c04686469 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -33,6 +33,12 @@ if [[ "$filter" != "" ]]; then
 fi
 
 t=$(mktemp -d)
+if [[ "$(uname)" =~ "MINGW32" ]] || [[ "$(uname)" =~ "MSYS_NT-10.0" ]] ; then
+    PWDARG=-W
+    t=$(cd "$t" && pwd $PWDARG)
+else
+    PWDARG=
+fi
 echo Temp dir: $t
 export ASEPRITE_USER_FOLDER=$t