--- a/jdk/test/com/sun/jdi/BadHandshakeTest.java	Mon Nov 30 14:15:15 2009 -0800
+++ b/jdk/test/com/sun/jdi/BadHandshakeTest.java	Tue Dec 01 08:51:16 2009 -0800
@@ -110,9 +110,10 @@
         String exe =   System.getProperty("java.home")
                      + File.separator + "bin" + File.separator;
         String arch = System.getProperty("os.arch");
-        if (arch.equals("sparcv9")) {
+        String osname = System.getProperty("os.name");
+        if (osname.equals("SunOS") && arch.equals("sparcv9")) {
             exe += "sparcv9/java";
-        } else if (arch.equals("amd64")) {
+        } else if (osname.equals("SunOS") && arch.equals("amd64")) {
             exe += "amd64/java";
         } else {
             exe += "java";