diff --git a/ncdump/testpathcvt.sh b/ncdump/testpathcvt.sh
index d1e5e36a5e..7954095e7c 100755
--- a/ncdump/testpathcvt.sh
+++ b/ncdump/testpathcvt.sh
@@ -5,6 +5,9 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 set -e
 
+# Disable automatic path conversions in MINGW shell:
+export MSYS2_ARG_CONV_EXCL='*'
+
 # We need to find the drive letter, if any
 DL=`${NCPATHCVT} -c -e / | sed -e 's|/cygdrive/\([a-zA-Z]\)/.*|\1|'`
 if test "x$DL" != x ; then
@@ -13,6 +16,7 @@ if test "x$DL" != x ; then
   DL="-d $DLL"
 fi
 
+
 testcase1() {
 T="$1"
 P="$2"
diff --git a/test_common.in b/test_common.in
index 109b129988..f7c04b3bc9 100644
--- a/test_common.in
+++ b/test_common.in
@@ -88,14 +88,11 @@ if test "x$SETX" = x1 ; then set -x ; fi
 # On MINGW, bash and other POSIX utilities use a mounted root directory,
 # but executables compiled for Windows do not recognise the mount point.
 # Here we ensure that Windows paths are used in tests of Windows executables.
-if test "x${FP_ISMSYS}" = xyes || test "x${FP_ISCYGWIN}" = xyes ; then
-  if test "x${MSYS2_PREFIX}" = x ; then
-    MSYS2_PREFIX=`cygpath -w '/'`
-    export MSYS2_PREFIX
-  fi
-fi
-if test "x${FP_ISMINGW}" = xyes ; then
-    alias pwd='pwd -W'
+
+system=`uname`
+if test "x${system##MINGW*}" = x; then
+  alias pwd='pwd -W'
+
 fi
 
 # We assume that TOPSRCDIR and TOPBUILDDIR are defined