diff --git a/jdk/test/demo/zipfs/basic.sh b/jdk/test/demo/zipfs/basic.sh
index 1b44152bc51..40dc0c0a19d 100644
--- a/jdk/test/demo/zipfs/basic.sh
+++ b/jdk/test/demo/zipfs/basic.sh
@@ -39,7 +39,7 @@ fi
 
 OS=`uname -s`
 case "$OS" in
-    Windows_* )
+    Windows_* | CYGWIN* )
         CLASSPATH="${TESTCLASSES};${ZIPFS}"
         ;;
     * )
diff --git a/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh b/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh
index dcde1f47c32..3ff58411c44 100644
--- a/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh
+++ b/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh
@@ -36,7 +36,7 @@ OS=`uname -s`
 case "$OS" in
   SunOS | Linux ) ;;
   # Skip locale test for Windows
-  Windows* )
+  Windows* | CYGWIN* )
     echo "Passed"; exit 0 ;;
   * ) echo "Unrecognized system!" ;  exit 1 ;;
 esac