--- old/test/jdk/sun/security/pkcs11/PKCS11Test.java	2017-12-11 11:05:30.000000000 +0800
+++ new/test/jdk/sun/security/pkcs11/PKCS11Test.java	2017-12-11 11:05:30.000000000 +0800
@@ -741,13 +741,18 @@
     }
 
     private static String distro() {
-        try (BufferedReader in =
-            new BufferedReader(new InputStreamReader(
-                Runtime.getRuntime().exec("uname -v").getInputStream()))) {
+        if (props.getProperty("os.name").equals("SunOS")) {
+            try (BufferedReader in =
+                         new BufferedReader(new InputStreamReader(
+                                 Runtime.getRuntime().exec("uname -v").getInputStream()))) {
 
-            return in.readLine();
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to determine distro.", e);
+                return in.readLine();
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to determine distro.", e);
+            }
+        } else {
+            // Not used outside Solaris
+            return null;
         }
     }