diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 31e30af777449c563ffe51ed3b45e20d9ff24856..d411ac60acc5b2fa4861d03b1ba08871f3590b9e 100644
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -15,6 +15,8 @@ set -e
 : ${PGPORT=50432}
 export PGPORT
 
+testhost=`uname -o`
+
 temp_root=$PWD/tmp_check
 
 if [ "$1" = '--install' ]; then
@@ -107,7 +109,12 @@ initdb
 pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"
 
 pg_ctl start -l "$logdir/postmaster2.log" -w
-sh ./analyze_new_cluster.sh
+
+if [ $testhost = Msys ] ; then
+	cmd /c analyze_new_cluster.bat
+else
+	sh ./analyze_new_cluster.sh
+fi
 pg_dumpall >"$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 if [ -n "$pg_dumpall2_status" ]; then
@@ -115,7 +122,15 @@ if [ -n "$pg_dumpall2_status" ]; then
 	exit 1
 fi
 
-sh ./delete_old_cluster.sh
+if [ $testhost = Msys ] ; then
+	cmd /c delete_old_cluster.bat
+else
+	sh ./delete_old_cluster.sh
+fi
+
+if [ $testhost = Msys ] ; then
+       dos2unix "$temp_root"/dump1.sql "$temp_root"/dump2.sql
+fi
 
 if diff -q "$temp_root"/dump1.sql "$temp_root"/dump2.sql; then
 	echo PASSED