diff --git a/pkcs11_test_fix.patch b/pkcs11_test_fix.patch
index 5af27fd..83ff4d2 100644
--- a/pkcs11_test_fix.patch
+++ b/pkcs11_test_fix.patch
@@ -1,17 +1,46 @@
 diff --git a/tests/pkcs11/setup-softhsm-tokens.sh b/tests/pkcs11/setup-softhsm-tokens.sh
-index 532c86a7..8a15c2e9 100755
+index 532c86a7..9050cea6 100755
 --- a/tests/pkcs11/setup-softhsm-tokens.sh
 +++ b/tests/pkcs11/setup-softhsm-tokens.sh
-@@ -41,8 +41,27 @@ if [ $ret -ne 0 ]; then
+@@ -17,10 +17,10 @@ echo "OBJNAME: $OBJNAME"
+ echo "LOADPUBLIC: $LOADPUBLIC"
+
+ # Create temporary directory for tokens
+-install -d -m 0755 $TESTDIR/db
++install -d -m 0755 "$TESTDIR/db"
+
+ # Create SoftHSM configuration file
+-cat >$TESTDIR/softhsm.conf <<EOF
++cat >"$TESTDIR/softhsm.conf" <<EOF
+ directories.tokendir = $TESTDIR/db
+ objectstore.backend = file
+ log.level = DEBUG
+@@ -28,12 +28,12 @@ EOF
+
+ export SOFTHSM2_CONF=$TESTDIR/softhsm.conf
+
+-cat $TESTDIR/softhsm.conf
++cat "$TESTDIR/softhsm.conf"
+
+ #init
+-cmd='softhsm2-util --init-token --label "$OBJNAME" --free --pin 1234 --so-pin 1234'
++cmd="softhsm2-util --init-token --label $OBJNAME --free --pin 1234 --so-pin 1234"
+ eval echo "$cmd"
+-out=$(eval $cmd)
++out=$(eval "$cmd")
+ ret=$?
+ if [ $ret -ne 0 ]; then
+     echo "Init token failed"
+@@ -41,10 +41,29 @@ if [ $ret -ne 0 ]; then
      exit 1
  fi
- 
+
 +find_library_path() {
 +    echo "$@"
 +    for _lib in "$@" ; do
 +        if test -f "$_lib" ; then
 +            LIBSOFTHSM_PATH="$_lib"
-+            echo "Using libsofthsm path: $_lib"
++            echo "Using libsofthsm path: $LIBSOFTHSM_PATH"
 +            return
 +        fi
 +    done
@@ -27,16 +56,43 @@ index 532c86a7..8a15c2e9 100755
 +
  #load private key
 -cmd='p11tool --provider /usr/lib64/pkcs11/libsofthsm2.so --write --load-privkey "$PRIVKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
-+cmd='p11tool --provider $LIBSOFTHSM_PATH --write --load-privkey "$PRIVKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
++cmd="p11tool --provider $LIBSOFTHSM_PATH --write --load-privkey $PRIVKEY --label $OBJNAME --login --set-pin=1234 \"pkcs11:token=$OBJNAME\""
  eval echo "$cmd"
- out=$(eval $cmd)
+-out=$(eval $cmd)
++out=$(eval "$cmd")
  ret=$?
-@@ -58,7 +77,7 @@ ls -l $TESTDIR
- 
- if [ $LOADPUBLIC -ne 0 ]; then
+ if [ $ret -ne 0 ]; then
+    echo "Loading privkey failed"
+@@ -52,15 +71,15 @@ if [ $ret -ne 0 ]; then
+    exit 1
+ fi
+
+-cat $PUBKEY
++cat "$PUBKEY"
+
+-ls -l $TESTDIR
++ls -l "$TESTDIR"
+
+-if [ $LOADPUBLIC -ne 0 ]; then
++if [ "$LOADPUBLIC" -ne 0 ]; then
  #load public key
 -    cmd='p11tool --provider /usr/lib64/pkcs11/libsofthsm2.so --write --load-pubkey "$PUBKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
-+    cmd='p11tool --provider $LIBSOFTHSM_PATH --write --load-pubkey "$PUBKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
++    cmd="p11tool --provider $LIBSOFTHSM_PATH --write --load-pubkey $PUBKEY --label $OBJNAME --login --set-pin=1234 \"pkcs11:token=$OBJNAME\""
      eval echo "$cmd"
-     out=$(eval $cmd)
+-    out=$(eval $cmd)
++    out=$(eval "$cmd")
      ret=$?
+     if [ $ret -ne 0 ]; then
+         echo "Loading pubkey failed"
+@@ -69,9 +88,9 @@ if [ $LOADPUBLIC -ne 0 ]; then
+     fi
+ fi
+
+-cmd='p11tool --list-all --login "pkcs11:token="$OBJNAME"" --set-pin=1234'
++cmd="p11tool --list-all --login \"pkcs11:token=$OBJNAME\" --set-pin=1234"
+ eval echo "$cmd"
+-out=$(eval $cmd)
++out=$(eval "$cmd")
+ ret=$?
+ if [ $ret -ne 0 ]; then
+     echo "Loging failed"