diff --git a/test/javax/imageio/stream/StreamCloserLeak/run_test.sh b/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
index af3e428cb30a98664d4ad96f4a33998b8897d0dc..f60cfd5d52ab4c82facd96b854c96097d651a6cc 100644
--- a/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
+++ b/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
@@ -92,7 +92,7 @@ case "$OS" in
       TMP="/tmp"
       ;;
 
-   Windows_95 | Windows_98 | Windows_NT | Windows_ME )
+   Windows_95 | Windows_98 | Windows_NT | Windows_ME | CYGWIN* )
       VAR="A different value for Win32"
       DEFAULT_JDK=/usr/local/java/jdk1.2/win32
       FILESEP="\\"
diff --git a/test/javax/script/CommonSetup.sh b/test/javax/script/CommonSetup.sh
index e76da82125b848dd80bde5a0ea465652334e6db9..4a66829131fdd40da91542a6a54a2d1e1a05200f 100644
--- a/test/javax/script/CommonSetup.sh
+++ b/test/javax/script/CommonSetup.sh
@@ -49,6 +49,12 @@ case "$OS" in
     OS="Windows"
     FS="\\"
     ;;
+  CYGWIN* )
+    PS=";"
+    OS="Windows"
+    FS="\\"
+    isCygwin=true
+    ;;
   * )
     echo "Unrecognized system!"
     exit 1;
diff --git a/test/javax/script/ProviderTest.sh b/test/javax/script/ProviderTest.sh
index 211d9edc1d90f9865de021b6a5635535f0175bc6..a32383e4078e5d4c443425b7d32b4fbe30be4e81 100644
--- a/test/javax/script/ProviderTest.sh
+++ b/test/javax/script/ProviderTest.sh
@@ -46,5 +46,5 @@ $JAR -cf ${TESTCLASSES}/dummy.jar \
 echo "Running test ..."
 
 $JAVA -classpath \
-  ${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar \
+  "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
   ProviderTest
diff --git a/test/sun/misc/URLClassPath/ClassnameCharTest.sh b/test/sun/misc/URLClassPath/ClassnameCharTest.sh
index 9cc5c58b555754f97b01357c366490678b9707e5..3e1db07e0173efcc232098db7649ed9bb6bf8578 100644
--- a/test/sun/misc/URLClassPath/ClassnameCharTest.sh
+++ b/test/sun/misc/URLClassPath/ClassnameCharTest.sh
@@ -44,7 +44,7 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
-  Windows* )
+  Windows* | CYGWIN* )
     PS=";"
     FS="\\"
     ;;
@@ -59,6 +59,6 @@ cd ${TESTCLASSES}
 ${TESTJAVA}${FS}bin${FS}jar xvf testclasses.jar "fo o.class"
 ${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES} ${TESTSRC}${FS}ClassnameCharTest.java
 
-${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES}${PS}${TESTCLASSES}${FS}sun${FS}misc${FS}URLClassPath ClassnameCharTest
+${TESTJAVA}${FS}bin${FS}java -classpath "${TESTCLASSES}${PS}${TESTCLASSES}${FS}sun${FS}misc${FS}URLClassPath" ClassnameCharTest
 
 rm -rf "fo o.class" testclasses.jar