diff --git a/jdk/test/sun/security/pkcs11/PKCS11Test.java b/jdk/test/sun/security/pkcs11/PKCS11Test.java
index fc0eae01272..d47c30e6cac 100644
--- a/jdk/test/sun/security/pkcs11/PKCS11Test.java
+++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, 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
@@ -129,6 +129,13 @@ public abstract class PKCS11Test {
     }
 
     private static String PKCS11_BASE;
+    static {
+        try {
+            PKCS11_BASE = getBase();
+        } catch (Exception e) {
+            // ignore
+        }
+    }
 
     private final static String PKCS11_REL_PATH = "sun/security/pkcs11";
 
@@ -160,20 +167,18 @@ public abstract class PKCS11Test {
         }
         String osid = osName + "-"
                 + props.getProperty("os.arch") + "-" + props.getProperty("sun.arch.data.model");
-        String ostype = osMap.get(osid);
-        if (ostype == null) {
+        String nssLibDir = osMap.get(osid);
+        if (nssLibDir == null) {
             System.out.println("Unsupported OS, skipping: " + osid);
             return null;
-//          throw new Exception("Unsupported OS " + osid);
+//          throw new Exception("Unsupported OS " + osName);
         }
-        if (ostype.length() == 0) {
+        if (nssLibDir.length() == 0) {
             System.out.println("NSS not supported on this platform, skipping test");
             return null;
         }
-        String base = getBase();
-        String libdir = base + SEP + "nss" + SEP + "lib" + SEP + ostype + SEP;
-        System.setProperty("pkcs11test.nss.libdir", libdir);
-        return libdir;
+        System.setProperty("pkcs11test.nss.libdir", nssLibDir);
+        return nssLibDir;
     }
 
     protected static void safeReload(String lib) throws Exception {
@@ -191,6 +196,8 @@ public abstract class PKCS11Test {
         safeReload(libdir + System.mapLibraryName(NSPR_PREFIX + "nspr4"));
         safeReload(libdir + System.mapLibraryName(NSPR_PREFIX + "plc4"));
         safeReload(libdir + System.mapLibraryName(NSPR_PREFIX + "plds4"));
+        safeReload(libdir + System.mapLibraryName("sqlite3"));
+        safeReload(libdir + System.mapLibraryName("nssutil3"));
         return true;
     }
 
@@ -229,15 +236,15 @@ public abstract class PKCS11Test {
 
     private static final Map<String,String> osMap;
 
+    // Location of the NSS libraries on each supported platform
     static {
         osMap = new HashMap<String,String>();
-        osMap.put("SunOS-sparc-32", "solaris-sparc");
-        osMap.put("SunOS-sparcv9-64", "solaris-sparcv9");
-        osMap.put("SunOS-x86-32", "solaris-i586");
-        osMap.put("SunOS-amd64-64", "solaris-amd64");
-        osMap.put("Linux-i386-32", "linux-i586");
-        osMap.put("Linux-amd64-64", "linux-amd64");
-        osMap.put("Windows-x86-32", "windows-i586");
+        osMap.put("SunOS-sparc-32", "/usr/lib/mps/");
+        osMap.put("SunOS-sparcv9-64", "/usr/lib/mps/64/");
+        osMap.put("SunOS-x86-32", "/usr/lib/mps/");
+        osMap.put("SunOS-amd64-64", "/usr/lib/mps/64/");
+        osMap.put("Linux-i386-32", "/usr/lib/");
+        osMap.put("Linux-amd64-64", "/usr/lib64/");
     }
 
     private final static char[] hexDigits = "0123456789abcdef".toCharArray();
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk
deleted file mode 100644
index e2aeec63898..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so
deleted file mode 100644
index d2e10f943de..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so
deleted file mode 100644
index c77ce2f5302..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so
deleted file mode 100644
index 53ad847526f..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so
deleted file mode 100644
index 4daaf117ec2..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so
deleted file mode 100644
index 8a8f4e3fc13..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so
deleted file mode 100644
index e42b31988df..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk
deleted file mode 100644
index 5a0474c956f..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so
deleted file mode 100644
index fd497cbed40..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so
deleted file mode 100644
index 27641d8cc19..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so
deleted file mode 100644
index a8dd0d19de8..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so
deleted file mode 100644
index 88bddb35bf9..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so
deleted file mode 100644
index 8df3b94194d..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so
deleted file mode 100644
index 82f7bfc6a52..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so b/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so
deleted file mode 100644
index 19ddc7754ce..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so
deleted file mode 100644
index e1d7e66c5c8..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so
deleted file mode 100644
index 412bdee72c8..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so
deleted file mode 100644
index 2370e2a641d..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so
deleted file mode 100644
index 7e84f40ad96..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so
deleted file mode 100644
index 12a679f9828..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so
deleted file mode 100644
index ee31257ccaf..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so
deleted file mode 100644
index a77c9aa03d1..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so
deleted file mode 100644
index 50779f3d1b0..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so
deleted file mode 100644
index b0d0b066574..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnssckbi.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnssckbi.so
deleted file mode 100644
index d3099f323cf..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libnssckbi.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so
deleted file mode 100644
index 169ac715531..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so
deleted file mode 100644
index b5bae824641..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so
deleted file mode 100644
index 4e371dde093..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk
deleted file mode 100644
index 18aaf3bdf30..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so
deleted file mode 100644
index 06f232b52ae..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so
deleted file mode 100644
index 18b9ffbfa5f..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so
deleted file mode 100644
index dfaa4316b61..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so
deleted file mode 100644
index 0f4bb9280b9..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so
deleted file mode 100644
index 354ff58ca67..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so
deleted file mode 100644
index ce6bfe98fd9..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk
deleted file mode 100644
index fcda49fe00c..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so
deleted file mode 100644
index d4ba72d18c5..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so
deleted file mode 100644
index 95ecd9ae712..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so
deleted file mode 100644
index 0b8a224dbe4..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnssckbi.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnssckbi.so
deleted file mode 100644
index 912d9b47506..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnssckbi.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so
deleted file mode 100644
index 533f274770d..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so
deleted file mode 100644
index 6dfae3a9525..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so b/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so
deleted file mode 100644
index c8e84bd617e..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
deleted file mode 100644
index 87f0fa1b595..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
deleted file mode 100644
index 855d4d95a89..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
deleted file mode 100644
index 8b254502586..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
deleted file mode 100644
index 56e87407676..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
deleted file mode 100644
index c623791d9f1..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll and /dev/null differ
diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
deleted file mode 100644
index eb21ed084ab..00000000000
Binary files a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll and /dev/null differ
diff --git a/jdk/test/sun/security/tools/keytool/autotest.sh b/jdk/test/sun/security/tools/keytool/autotest.sh
index 53fbde1533b..ee6a0d5e55b 100644
--- a/jdk/test/sun/security/tools/keytool/autotest.sh
+++ b/jdk/test/sun/security/tools/keytool/autotest.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -50,7 +50,7 @@ case "$OS" in
     ARCH=`isainfo`
     case "$ARCH" in
       sparc* )
-        PF="solaris-sparc"
+        NSSDIR="/usr/lib/mps"
         ;;
       * )
         echo "Will not run test on: Solaris ${ARCH}"
@@ -64,7 +64,7 @@ case "$OS" in
     FS="/"
     case "$ARCH" in
       i[3-6]86 )
-        PF="linux-i586"
+        NSSDIR="/usr/lib"
         ;;
       * )
         echo "Will not run test on: Linux ${ARCH}"
@@ -91,7 +91,7 @@ chmod u+w key3.db
 chmod u+w cert8.db
 
 echo | ${TESTJAVA}${FS}bin${FS}java -Dnss \
-   -Dnss.lib=${NSS}${FS}lib${FS}${PF}${FS}${LIBNAME} \
+   -Dnss.lib=${NSSDIR}${FS}${LIBNAME} \
    KeyToolTest
 status=$?