--- a/jdk/test/sun/security/tools/keytool/autotest.sh	Tue Oct 07 15:14:05 2014 +0200
+++ b/jdk/test/sun/security/tools/keytool/autotest.sh	Thu Oct 09 16:05:24 2014 +0800
@@ -85,9 +85,7 @@
     fi
     ;;
   Darwin )
-    LIBNAME=`find_one \
-            "/Applications/Firefox.app/Contents/MacOS/libsoftokn3.dylib" \
-            "/Applications/Thunderbird.app//Contents/MacOS/libsoftokn3.dylib"`
+    LIBNAME="$TESTSRC/../../pkcs11/nss/lib/macosx-x86_64/libsoftokn3.dylib"
     ;;
   * )
     echo "Will not run test on: ${OS}"
@@ -102,10 +100,6 @@
 
 echo "Using NSS lib at $LIBNAME"
 
-if [ $OS = Darwin ]; then
-    export DYLD_LIBRARY_PATH=`dirname $LIBNAME`
-fi
-
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . -XDignore.symbol.file \
         ${TESTSRC}${FS}KeyToolTest.java || exit 10