diff --git a/src/tests/regression/crypt0001 b/src/tests/regression/crypt0001
index ea62afb7..57f640c5 100755
--- a/src/tests/regression/crypt0001
+++ b/src/tests/regression/crypt0001
@@ -20,7 +20,8 @@ s=$p15temp/signed
 p=$p15temp/key.pem
 
 p15_init --no-so-pin
-p15_gen_key rsa/1024 --insecure --id 45
+p15_set_pin -a 01
+p15_gen_key rsa/1024 --id 45 -a 01
 
 msg "Extracting public key"
 run_check_status $p15tool --read-public-key 45 -o $p
@@ -30,14 +31,14 @@ echo lalla > $m
 
 msg "Signing and verifying using MD5"
 run_check_status openssl dgst -md5 -binary -out $d < $m
-run_check_status $p15crypt -s --md5 --pkcs1 -i $d -o $s
+p15_crypt -s --md5 --pkcs1 -i $d -o $s
 run_check_output "Verified OK" \
 	openssl dgst -verify $p -md5 -signature $s < $m
 success
 
 msg "Signing and verifying using SHA1"
 run_check_status openssl dgst -sha1 -binary -out $d < $m
-run_check_status $p15crypt -s --sha-1 --pkcs1 -i $d -o $s
+p15_crypt -s --sha-1 --pkcs1 -i $d -o $s
 run_check_output "Verified OK" \
 	openssl dgst -verify $p -sha1 -signature $s < $m
 success
diff --git a/src/tests/regression/crypt0002 b/src/tests/regression/crypt0002
index f01a2ba8..10f9398e 100755
--- a/src/tests/regression/crypt0002
+++ b/src/tests/regression/crypt0002
@@ -20,7 +20,8 @@ d=$p15temp/decrypted
 p=$p15temp/key.pem
 
 p15_init --no-so-pin
-p15_gen_key rsa/1024 --insecure --id 45 --key-usage decrypt
+p15_set_pin -a 01
+p15_gen_key rsa/1024 --id 45 --key-usage decrypt -a 01
 
 msg "Extracting public key"
 run_check_status $p15tool --read-public-key 45 -o $p
@@ -28,7 +29,7 @@ run_check_status $p15tool --read-public-key 45 -o $p
 msg "Encrypting message (pkcs1 padding)"
 echo lalla > $o
 run_check_status openssl rsautl -pubin -inkey $p -encrypt -in $o -out $e
-run_check_status $p15crypt -c --pkcs1 -i $e -o $d
+p15_crypt -c --pkcs1 -i $e -o $d
 cmp $o $d || fail "Decrypted file does not match plain text file"
 success
 
diff --git a/src/tests/regression/crypt0003 b/src/tests/regression/crypt0003
index f3077305..26c75258 100755
--- a/src/tests/regression/crypt0003
+++ b/src/tests/regression/crypt0003
@@ -28,21 +28,22 @@ run_check_status openssl genrsa -out $k -f4 512
 run_check_status openssl rsa -in $k -out $p -pubout
 
 p15_init --no-so-pin
-p15_store_key $k --insecure
+p15_set_pin -a 01
+p15_store_key $k -a 01
 
 # Set up message file
 echo lalla > $m
 
 msg "Signing and verifying using MD5"
 run_check_status openssl dgst -md5 -binary -out $d < $m
-run_check_status $p15crypt -s --md5 --pkcs1 -i $d -o $s
+p15_crypt -s --md5 --pkcs1 -i $d -o $s
 run_check_output "Verified OK" \
 	openssl dgst -verify $p -md5 -signature $s < $m
 success
 
 msg "Signing and verifying using SHA1"
 run_check_status openssl dgst -sha1 -binary -out $d < $m
-run_check_status $p15crypt -s --sha-1 --pkcs1 -i $d -o $s
+p15_crypt -s --sha-1 --pkcs1 -i $d -o $s
 run_check_output "Verified OK" \
 	openssl dgst -verify $p -sha1 -signature $s < $m
 success
diff --git a/src/tests/regression/crypt0004 b/src/tests/regression/crypt0004
index 0a4bcddf..7f288ff0 100755
--- a/src/tests/regression/crypt0004
+++ b/src/tests/regression/crypt0004
@@ -23,7 +23,8 @@ s=$p15temp/signed
 p=$p15temp/public.pem
 
 p15_init --no-so-pin
-p15_gen_key rsa/1024 --insecure --id 45
+p15_set_pin -a 01
+p15_gen_key rsa/1024 --id 45 -a 01
 
 msg "Extracting public key"
 run_display_output $p15tool --read-public-key 45 -o $p
@@ -33,14 +34,14 @@ echo lalla > $m
 
 msg "Signing and verifying using MD5"
 run_check_status openssl dgst -md5 -binary -out $d < $m
-run_check_status $p15crypt -s --md5 --pkcs1 -i $d -o $s
+p15_crypt -s --md5 --pkcs1 -i $d -o $s
 run_check_output "Verified OK" \
 	openssl dgst -verify $p -md5 -signature $s < $m
 success
 
 msg "Signing and verifying using SHA1"
 run_check_status openssl dgst -sha1 -binary -out $d < $m
-run_check_status $p15crypt -s --sha-1 --pkcs1 -i $d -o $s
+p15_crypt -s --sha-1 --pkcs1 -i $d -o $s
 run_check_output "Verified OK" \
 	openssl dgst -verify $p -sha1 -signature $s < $m
 success
diff --git a/src/tests/regression/functions b/src/tests/regression/functions
index cec68c0a..284e6c93 100755
--- a/src/tests/regression/functions
+++ b/src/tests/regression/functions
@@ -261,6 +261,13 @@ function p15_store_key {
 	success
 }
 
+function p15_crypt {
+
+	run_check_status $p15crypt \
+		--pin 0000 \
+		"$@"
+}
+
 function p15_validate {
 
 	msg "Validating card using pkcs11-tool"
@@ -268,4 +275,3 @@ function p15_validate {
 		--slot-label "OpenSC Test Card" $* < /dev/null
 	success
 }
-