--- old/test/sun/security/pkcs11/fips/ImportKeyStore.java	2016-01-07 19:49:40.605761524 -0800
+++ new/test/sun/security/pkcs11/fips/ImportKeyStore.java	2016-01-07 19:49:40.379744919 -0800
@@ -48,7 +48,8 @@
     public static void main(String[] args) throws Exception {
         String nssCfg = "--name=NSS\nnssSecmodDirectory=.\n ";
 //          "attributes(*,CKO_PRIVATE_KEY,CKK_DSA) = { CKA_NETSCAPE_DB = 0h00 }";
-        Provider p = new sun.security.pkcs11.SunPKCS11(nssCfg);
+        Provider p = Security.getProvider("SunPKCS11");
+        p.configure(nssCfg);
 
         KeyStore ks = KeyStore.getInstance("PKCS11", p);
         ks.load(null, "test12".toCharArray());