diff --git a/Makefile b/Makefile
index f03e9300056..470694ceea7 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ UNAME := $(shell uname)
 ifeq (MSYS, $(findstring MSYS, $(UNAME)))
 DISABLE_TRYRUN=y
 HOST_OS=MSYS
-PWD_OPT=-W
 else ifeq (MINGW, $(findstring MINGW, $(UNAME)))
 HOST_OS=MINGW
 PWD_OPT=-W
diff --git a/zephyr-env.sh b/zephyr-env.sh
index 4d820a1ce70..d6bac0f4864 100644
--- a/zephyr-env.sh
+++ b/zephyr-env.sh
@@ -35,7 +35,7 @@ fi
 # .zephyrrc in your home directory. It will be automatically
 # run (if it exists) by this script.
 
-if uname | grep -q -P "MINGW|MSYS"; then
+if uname | grep -q -P "MINGW"; then
     win_build=1
     PWD_OPT="-W"
 else