--- old/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java	2020-05-20 18:07:26.102639279 -0700
+++ new/test/jdk/sun/security/pkcs11/Config/ReadConfInUTF16Env.java	2020-05-20 18:07:25.710631753 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -28,11 +28,8 @@
     public static void main(String argv[]) {
         Provider p = Security.getProvider("SunPKCS11");
         if (p == null) {
-            p = Security.getProvider("SunPKCS11-Solaris");
-            if (p == null) {
-                System.out.println("Skipping test - no PKCS11 provider available");
-                return;
-            }
+            System.out.println("Skipping test - no PKCS11 provider available");
+            return;
         }
 
         System.out.println(p.getName());