--- old/test/jdk/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java	2020-05-20 18:07:57.983251410 -0700
+++ new/test/jdk/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java	2020-05-20 18:07:57.647244959 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -203,12 +203,9 @@
             System.out.println("Client getReuseAddress(): "
                         + socket.getReuseAddress());
 
-            // Solaris does not support set/get of IPV6_TCLASS when connected
-            if (!"SunOS".equals(System.getProperty("os.name"))) {
-                socket.setTrafficClass(8);
-                System.out.println("Client getTrafficClass(): "
-                        + socket.getTrafficClass());
-            }
+            socket.setTrafficClass(8);
+            System.out.println("Client getTrafficClass(): "
+                    + socket.getTrafficClass());
 
             os.write(237);
             os.flush();