diff --git a/jdk/test/tools/launcher/UnicodeTest.sh b/jdk/test/tools/launcher/UnicodeTest.sh
index 98cbeab7db8..5ce017658af 100644
--- a/jdk/test/tools/launcher/UnicodeTest.sh
+++ b/jdk/test/tools/launcher/UnicodeTest.sh
@@ -54,7 +54,11 @@ mkdir UnicodeTest-src UnicodeTest-classes
 
 echo "creating test source files"
 "$JAVAC" -d . "${TESTSRC}"/UnicodeTest.java
-CLASS_NAME=`"$JAVA" UnicodeTest | sed -e 's@\\r@@g' `
+if [ "`uname -s | grep CYGWIN`" != "" ] ; then
+  CLASS_NAME=`"$JAVA" UnicodeTest | sed -e 's@\\r@@g' `
+else
+  CLASS_NAME=`"$JAVA" UnicodeTest`
+fi
 
 if [ "$CLASS_NAME" = "" ]
 then