diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index afce770b9e..8ee1c79591 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -107,7 +107,7 @@ TESTS +=			\
 	eddsa			\
 	ednscompliance		\
 	emptyzones		\
-	engine_pkcs11		\
+	enginepkcs11		\
 	filter-aaaa		\
 	formerr			\
 	geoip2			\
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 4ae4836b91..3969495821 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -103,7 +103,7 @@ cookie
 dlzexternal
 dnssec
 dyndb
-engine_pkcs11
+enginepkcs11
 filter-aaaa
 kasp
 keyfromlabel
diff --git a/bin/tests/system/engine_pkcs11/ns1/named.args b/bin/tests/system/engine_pkcs11/ns1/named.args
deleted file mode 100644
index 0382a63ccd..0000000000
--- a/bin/tests/system/engine_pkcs11/ns1/named.args
+++ /dev/null
@@ -1 +0,0 @@
--E pkcs11 -D engine_pkcs11-ns1 -X named.lock -m record -c named.conf -d 99 -U 4 -T maxcachesize=2097152
diff --git a/bin/tests/system/engine_pkcs11/2037-pk11_numbits-crash-test.pkt b/bin/tests/system/enginepkcs11/2037-pk11_numbits-crash-test.pkt
similarity index 100%
rename from bin/tests/system/engine_pkcs11/2037-pk11_numbits-crash-test.pkt
rename to bin/tests/system/enginepkcs11/2037-pk11_numbits-crash-test.pkt
diff --git a/bin/tests/system/engine_pkcs11/clean.sh b/bin/tests/system/enginepkcs11/clean.sh
similarity index 86%
rename from bin/tests/system/engine_pkcs11/clean.sh
rename to bin/tests/system/enginepkcs11/clean.sh
index 6190bd2ebb..789666e7c9 100644
--- a/bin/tests/system/engine_pkcs11/clean.sh
+++ b/bin/tests/system/enginepkcs11/clean.sh
@@ -32,4 +32,4 @@ rm -f ns1/update.log.*
 rm -f ns1/verify.out.*
 rm -f ns1/zone.*.signed.jnl ns1/zone.*.signed.jbk
 
-softhsm2-util --delete-token --token "softhsm2-engine_pkcs11" >/dev/null 2>&1 || echo_i "softhsm2-engine_pkcs11 token not found for cleaning"
+softhsm2-util --delete-token --token "softhsm2-enginepkcs11" >/dev/null 2>&1 || echo_i "softhsm2-enginepkcs11 token not found for cleaning"
diff --git a/bin/tests/system/enginepkcs11/ns1/named.args b/bin/tests/system/enginepkcs11/ns1/named.args
new file mode 100644
index 0000000000..0568fa981c
--- /dev/null
+++ b/bin/tests/system/enginepkcs11/ns1/named.args
@@ -0,0 +1 @@
+-E pkcs11 -D enginepkcs11-ns1 -X named.lock -m record -c named.conf -d 99 -U 4 -T maxcachesize=2097152
diff --git a/bin/tests/system/engine_pkcs11/ns1/named.conf.in b/bin/tests/system/enginepkcs11/ns1/named.conf.in
similarity index 100%
rename from bin/tests/system/engine_pkcs11/ns1/named.conf.in
rename to bin/tests/system/enginepkcs11/ns1/named.conf.in
diff --git a/bin/tests/system/engine_pkcs11/ns1/template.db.in b/bin/tests/system/enginepkcs11/ns1/template.db.in
similarity index 100%
rename from bin/tests/system/engine_pkcs11/ns1/template.db.in
rename to bin/tests/system/enginepkcs11/ns1/template.db.in
diff --git a/bin/tests/system/engine_pkcs11/prereq.sh b/bin/tests/system/enginepkcs11/prereq.sh
similarity index 100%
rename from bin/tests/system/engine_pkcs11/prereq.sh
rename to bin/tests/system/enginepkcs11/prereq.sh
diff --git a/bin/tests/system/engine_pkcs11/setup.sh b/bin/tests/system/enginepkcs11/setup.sh
similarity index 87%
rename from bin/tests/system/engine_pkcs11/setup.sh
rename to bin/tests/system/enginepkcs11/setup.sh
index 5c764746c2..49988ad66c 100644
--- a/bin/tests/system/engine_pkcs11/setup.sh
+++ b/bin/tests/system/enginepkcs11/setup.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-softhsm2-util --init-token --free --pin 1234 --so-pin 1234 --label "softhsm2-engine_pkcs11" | awk '/^The token has been initialized and is reassigned to slot/ { print $NF }'
+softhsm2-util --init-token --free --pin 1234 --so-pin 1234 --label "softhsm2-enginepkcs11" | awk '/^The token has been initialized and is reassigned to slot/ { print $NF }'
 
 printf '%s' "${HSMPIN:-1234}" > pin
 PWD=$(pwd)
@@ -31,7 +31,7 @@ keygen() {
 
 	label="${id}-${zone}"
 	p11id=$(echo "${label}" | openssl sha1 -r | awk '{print $1}')
-	pkcs11-tool --module $SOFTHSM2_MODULE --token-label "softhsm2-engine_pkcs11" -l -k --key-type $type:$bits --label "${label}" --id "${p11id}" --pin $(cat $PWD/pin) > pkcs11-tool.out.$zone.$id 2> pkcs11-tool.err.$zone.$id || return 1
+	pkcs11-tool --module $SOFTHSM2_MODULE --token-label "softhsm2-enginepkcs11" -l -k --key-type $type:$bits --label "${label}" --id "${p11id}" --pin $(cat $PWD/pin) > pkcs11-tool.out.$zone.$id 2> pkcs11-tool.err.$zone.$id || return 1
 }
 
 keyfromlabel() {
@@ -41,7 +41,7 @@ keyfromlabel() {
 	dir="$4"
         shift 4
 
-	$KEYFRLAB -K $dir -E pkcs11 -a $alg -l "token=softhsm2-engine_pkcs11;object=${id}-${zone};pin-source=$PWD/pin" "$@" $zone >> keyfromlabel.out.$zone.$id 2> keyfromlabel.err.$zone.$id || return 1
+	$KEYFRLAB -K $dir -E pkcs11 -a $alg -l "token=softhsm2-enginepkcs11;object=${id}-${zone};pin-source=$PWD/pin" "$@" $zone >> keyfromlabel.out.$zone.$id 2> keyfromlabel.err.$zone.$id || return 1
 	cat keyfromlabel.out.$zone.$id
 }
 
diff --git a/bin/tests/system/engine_pkcs11/tests.sh b/bin/tests/system/enginepkcs11/tests.sh
similarity index 100%
rename from bin/tests/system/engine_pkcs11/tests.sh
rename to bin/tests/system/enginepkcs11/tests.sh