diff --git a/src/tests/tests.sh b/src/tests/tests.sh
index 52e89101..79a407c3 100755
--- a/src/tests/tests.sh
+++ b/src/tests/tests.sh
@@ -32,7 +32,7 @@ PROG="../yubihsm-shell --connector=${DEFAULT_CONNECTOR_URL}"
 if [ "x$(uname)" = "xFreeBSD" ]; then
   DECODE="b64decode -pr"
 else
-  DECODE="base64 --decode"
+  DECODE="base64 --decode -i"
 fi
 
 echo "Hello World!" >"$DATA"
diff --git a/src/tests/wrapped_tests.sh b/src/tests/wrapped_tests.sh
index 16d6ba27..2ba807b2 100755
--- a/src/tests/wrapped_tests.sh
+++ b/src/tests/wrapped_tests.sh
@@ -223,7 +223,7 @@ put_yhwrapped_asymmetric_rsa() {
       --object-id="$keyid" --algorithm "rsa-pkcs1-sha256" --in="$sigbuf" --out "$signature.$size" --outformat="bin"
 
     echo "${FUNCNAME[0]}: verifying rsa$size sha256 signature"
-    openssl dgst -sha256 -verify "$keyfile.$size" -signature "$signature.$size" "$sigbuf"
+    openssl dgst -sha256 -verify "$keyfile.$size.pub" -signature "$signature.$size" "$sigbuf"
 
   done
 }