diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert9.db b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert9.db
new file mode 100644
index 00000000000..f701c4fc2d4
Binary files /dev/null and b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert9.db differ
diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/key4.db b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/key4.db
new file mode 100644
index 00000000000..3c489989b0a
Binary files /dev/null and b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/key4.db differ
diff --git a/jdk/test/sun/security/pkcs11/Secmod/cert9.db b/jdk/test/sun/security/pkcs11/Secmod/cert9.db
index a202bea21e9..b823a79864f 100644
Binary files a/jdk/test/sun/security/pkcs11/Secmod/cert9.db and b/jdk/test/sun/security/pkcs11/Secmod/cert9.db differ
diff --git a/jdk/test/sun/security/pkcs11/Secmod/key4.db b/jdk/test/sun/security/pkcs11/Secmod/key4.db
index 222adb32286..8ddfc4c0fa6 100644
Binary files a/jdk/test/sun/security/pkcs11/Secmod/key4.db and b/jdk/test/sun/security/pkcs11/Secmod/key4.db differ
diff --git a/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt b/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt
index 60cc1c56553..bb4679f459f 100644
--- a/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt
+++ b/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt
@@ -1,4 +1,8 @@
 library=
 name=NSS Internal PKCS #11 Module
-parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
-NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=trustOrder=75 cipherOrder=100 slotParams={0x00000001=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM askpw=any timeout=30 ] }  Flags=internal,critical
+
+library=libnssckbi.so
+name=Builtin Roots Module
+NSS=trustOrder=100 
diff --git a/jdk/test/sun/security/pkcs11/SecmodTest.java b/jdk/test/sun/security/pkcs11/SecmodTest.java
index 6ff6dd29acd..700632d84a7 100644
--- a/jdk/test/sun/security/pkcs11/SecmodTest.java
+++ b/jdk/test/sun/security/pkcs11/SecmodTest.java
@@ -34,7 +34,7 @@ public class SecmodTest extends PKCS11Test {
     static String DBDIR;
     static char[] password = "test12".toCharArray();
     static String keyAlias = "mykey";
-    static boolean useSqlite = false;
+    static boolean useSqlite = true;
 
     static void useSqlite(boolean b) {
         useSqlite = b;
diff --git a/jdk/test/sun/security/pkcs11/fips/cert9.db b/jdk/test/sun/security/pkcs11/fips/cert9.db
new file mode 100644
index 00000000000..247bdad0abc
Binary files /dev/null and b/jdk/test/sun/security/pkcs11/fips/cert9.db differ
diff --git a/jdk/test/sun/security/pkcs11/fips/key4.db b/jdk/test/sun/security/pkcs11/fips/key4.db
new file mode 100644
index 00000000000..580dd2ebd6b
Binary files /dev/null and b/jdk/test/sun/security/pkcs11/fips/key4.db differ
diff --git a/jdk/test/sun/security/pkcs11/fips/pkcs11.txt b/jdk/test/sun/security/pkcs11/fips/pkcs11.txt
new file mode 100644
index 00000000000..ba339b25c76
--- /dev/null
+++ b/jdk/test/sun/security/pkcs11/fips/pkcs11.txt
@@ -0,0 +1,9 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=trustOrder=75 cipherOrder=100 slotParams={0x00000001=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM askpw=any timeout=30 ] }  Flags=internal,critical
+
+library=libnssckbi.so
+name=Builtin Roots Module
+NSS=trustOrder=100    
+