diff --git a/src/tests/p11test/runtest.sh b/src/tests/p11test/runtest.sh
index 5e6742b1..5041ad10 100755
--- a/src/tests/p11test/runtest.sh
+++ b/src/tests/p11test/runtest.sh
@@ -29,6 +29,7 @@ function generate_cert() {
 	TYPE="$1"
 	ID="$2"
 	LABEL="$3"
+	CERT="$4" # whether to generate certificate too
 
 	# Generate key pair
 	$PKCS11_TOOL --keypairgen --key-type="$TYPE" --login --pin=$PIN \
@@ -39,104 +40,116 @@ function generate_cert() {
 		return 1
 	fi
 
-	# check type value for the PKCS#11 URI (RHEL7 is using old "object-type")
-	TYPE_KEY="type"
-	p11tool --list-all --provider="$P11LIB" --login | grep "object-type" && \
-		TYPE_KEY="object-type"
+	# We can not do this with EdDSA keys as they are not supported in certtool
+	# We can not do this with curve25519 keys as they do not need to support signatures at all
+	if [[ "$CERT" -ne 0 ]]; then
+		# check type value for the PKCS#11 URI (RHEL7 is using old "object-type")
+		TYPE_KEY="type"
+		p11tool --list-all --provider="$P11LIB" --login | grep "object-type" && \
+			TYPE_KEY="object-type"
 
-	# Generate certificate
-	certtool --generate-self-signed --outfile="$TYPE.cert" --template=cert.cfg \
-		--provider="$P11LIB" --load-privkey "pkcs11:object=$LABEL;$TYPE_KEY=private" \
-		--load-pubkey "pkcs11:object=$LABEL;$TYPE_KEY=public"
-	# convert to DER:
-	openssl x509 -inform PEM -outform DER -in "$TYPE.cert" -out "$TYPE.cert.der"
-	# Write certificate
-	#p11tool --login --write --load-certificate="$TYPE.cert" --label="$LABEL" \
-	#	--provider="$P11LIB"
-	$PKCS11_TOOL --write-object "$TYPE.cert.der" --type=cert --id=$ID \
-		--label="$LABEL" --module="$P11LIB"
+		# Generate certificate
+		certtool --generate-self-signed --outfile="$TYPE.cert" --template=cert.cfg \
+			--provider="$P11LIB" --load-privkey "pkcs11:object=$LABEL;$TYPE_KEY=private" \
+			--load-pubkey "pkcs11:object=$LABEL;$TYPE_KEY=public"
+		# convert to DER:
+		openssl x509 -inform PEM -outform DER -in "$TYPE.cert" -out "$TYPE.cert.der"
+		# Write certificate
+		#p11tool --login --write --load-certificate="$TYPE.cert" --label="$LABEL" \
+		#	--provider="$P11LIB"
+		$PKCS11_TOOL --write-object "$TYPE.cert.der" --type=cert --id=$ID \
+			--label="$LABEL" --module="$P11LIB"
 
-	rm "$TYPE.cert" "$TYPE.cert.der"
+		rm "$TYPE.cert" "$TYPE.cert.der"
+	fi
 
 	p11tool --login --provider="$P11LIB" --list-all
 }
 
 function card_setup() {
-		ECC_KEYS=1
-		case $1 in
-			"softhsm")
-				P11LIB="/usr/lib64/pkcs11/libsofthsm2.so"
-				echo "directories.tokendir = .tokens/" > .softhsm2.conf
-				mkdir ".tokens"
-				export SOFTHSM2_CONF=".softhsm2.conf"
-				# Init token
-				softhsm2-util --init-token --slot 0 --label "SC test" --so-pin="$SOPIN" --pin="$PIN"
-				;;
-			"opencryptoki")
-				# Supports only RSA mechanisms
-				ECC_KEYS=0
-				P11LIB="/usr/lib64/pkcs11/libopencryptoki.so"
-				SO_PIN=87654321
-				SLOT_ID=3 # swtok slot
-				systemctl is-active pkcsslotd > /dev/null
-				if [[ "$?" -ne "0" ]]; then
-					echo "Opencryptoki needs pkcsslotd running"
-					exit 1
-				fi
-				groups | grep pkcs11 > /dev/null
-				if [[ "$?" -ne "0" ]]; then
-					echo "Opencryptoki requires the user to be in pkcs11 group"
-					exit 1
-				fi
-				echo "test_swtok" | /usr/sbin/pkcsconf -I -c $SLOT_ID -S $SO_PIN
-				/usr/sbin/pkcsconf -u -c $SLOT_ID -S $SO_PIN -n $PIN
-				;;
-			"readonly")
-				GENERATE_KEYS=0
-				if [[ ! -z "$2" && -f "$2" ]]; then
-					P11LIB="$2"
-				else
-					P11LIB="/usr/lib64/pkcs11/opensc-pkcs11.so"
-					P11LIB="../pkcs11/.libs/opensc-pkcs11.so"
-				fi
-				;;
-			*)
-				echo "Error: Missing argument."
-				echo "    Usage:"
-				echo "        runtest.sh [softhsm|opencryptoki|readonly [pkcs-library.so]]"
-				exit 1;
-				;;
-		esac
-
-		if [[ $GENERATE_KEYS -eq 1 ]]; then
-			# Generate 1024b RSA Key pair
-			generate_cert "RSA:1024" "01" "RSA_auth"
-			# Generate 2048b RSA Key pair
-			generate_cert "RSA:2048" "02" "RSA2048"
-			if [[ $ECC_KEYS -eq 1 ]]; then
-				# Generate 256b ECC Key pair
-				generate_cert "EC:secp256r1" "03" "ECC_auth"
-				# Generate 521b ECC Key pair
-				generate_cert "EC:secp521r1" "04" "ECC521"
+	ECC_KEYS=1
+	EDDSA=1
+	case $1 in
+		"softhsm")
+			P11LIB="/usr/lib64/pkcs11/libsofthsm2.so"
+			echo "directories.tokendir = .tokens/" > .softhsm2.conf
+			mkdir ".tokens"
+			export SOFTHSM2_CONF=".softhsm2.conf"
+			# Init token
+			softhsm2-util --init-token --slot 0 --label "SC test" --so-pin="$SOPIN" --pin="$PIN"
+			;;
+		"opencryptoki")
+			# Supports only RSA mechanisms
+			ECC_KEYS=0
+			EDDSA=0
+			P11LIB="/usr/lib64/pkcs11/libopencryptoki.so"
+			SO_PIN=87654321
+			SLOT_ID=3 # swtok slot
+			systemctl is-active pkcsslotd > /dev/null
+			if [[ "$?" -ne "0" ]]; then
+				echo "Opencryptoki needs pkcsslotd running"
+				exit 1
 			fi
+			groups | grep pkcs11 > /dev/null
+			if [[ "$?" -ne "0" ]]; then
+				echo "Opencryptoki requires the user to be in pkcs11 group"
+				exit 1
+			fi
+			echo "test_swtok" | /usr/sbin/pkcsconf -I -c $SLOT_ID -S $SO_PIN
+			/usr/sbin/pkcsconf -u -c $SLOT_ID -S $SO_PIN -n $PIN
+			;;
+		"readonly")
+			GENERATE_KEYS=0
+			if [[ ! -z "$2" && -f "$2" ]]; then
+				P11LIB="$2"
+			else
+				P11LIB="/usr/lib64/pkcs11/opensc-pkcs11.so"
+				P11LIB="../pkcs11/.libs/opensc-pkcs11.so"
+			fi
+			;;
+		*)
+			echo "Error: Missing argument."
+			echo "    Usage:"
+			echo "        runtest.sh [softhsm|opencryptoki|readonly [pkcs-library.so]]"
+			exit 1;
+			;;
+	esac
+
+	if [[ $GENERATE_KEYS -eq 1 ]]; then
+		# Generate 1024b RSA Key pair
+		generate_cert "RSA:1024" "01" "RSA_auth" 1
+		# Generate 2048b RSA Key pair
+		generate_cert "RSA:2048" "02" "RSA2048" 1
+		if [[ $ECC_KEYS -eq 1 ]]; then
+			# Generate 256b ECC Key pair
+			generate_cert "EC:secp256r1" "03" "ECC_auth" 1
+			# Generate 521b ECC Key pair
+			generate_cert "EC:secp521r1" "04" "ECC521" 1
 		fi
+		if [[ $EDDSA -eq 1 ]]; then
+			# Generate Ed25519
+			generate_cert "EC:edwards25519" "05" "EDDSA" 0
+			# Generate curve25519
+			#generate_cert "EC:curve25519" "06" "Curve25519" 0
+			# not supported by softhsm either
+		fi
+	fi
 }
 
 function card_cleanup() {
-		case $1 in
-			"softhsm")
-				rm .softhsm2.conf
-				rm -rf ".tokens"
-				;;
-		esac
+	case $1 in
+		"softhsm")
+			rm .softhsm2.conf
+			rm -rf ".tokens"
+			;;
+	esac
 }
 
 card_setup "$@"
-
 make p11test || exit
-if [[ "$PKCS11SPY" -ne "" ]]; then
+if [[ "$PKCS11SPY" != "" ]]; then
 	export PKCS11SPY="$P11LIB"
-	$VALGRIND ./p11test -m /usr/lib64/pkcs11/pkcs11-spy.so -p $PIN
+	$VALGRIND ./p11test -m ../../pkcs11/.libs/pkcs11-spy.so -p $PIN &> /tmp/spy.log
 else
 	#bash
 	$VALGRIND ./p11test -m "$P11LIB" -o test.json -p $PIN