diff --git a/msvc/diff.exe b/msvc/diff.exe
index 6b37dd5b..40e91432 100644
Binary files a/msvc/diff.exe and b/msvc/diff.exe differ
diff --git a/msvc/path-test/libexpat.dll b/msvc/path-test/libexpat.dll
deleted file mode 100644
index edb5aa4a..00000000
Binary files a/msvc/path-test/libexpat.dll and /dev/null differ
diff --git a/test/exiv2-test.sh b/test/exiv2-test.sh
index 7fa29a81..bcd14f8a 100755
--- a/test/exiv2-test.sh
+++ b/test/exiv2-test.sh
@@ -1,5 +1,12 @@
 #! /bin/sh
 # Test driver for exiv2 utility tests
+
+os=`uname`
+if [ "${os:0:4}" == "CYGW" ]; then
+	# use the diff.exe in msvc (cygwin's default diff is suspect)
+	export PATH=$PWD/../msvc:$PATH
+fi
+
 export LC_ALL=C
 if [ -z "$EXIV2_BINDIR" ] ; then
     bin="$VALGRIND ../../src"
@@ -126,7 +133,7 @@ diff iii kkk
 
 ) > $results 2>&1
 
-if [ `../config/config.guess` = "i686-pc-mingw32" ] ; then
+if [ -e `which dos2unix` ]; then
     sed 's,\\,/,g' $results > ${results}-new
     mv -f ${results}-new $results
     unix2dos $results >/dev/null 2>&1