diff --git a/dev/easytls-unit-tests.sh b/dev/easytls-unit-tests.sh
index e3dfb4c..ca0c791 100755
--- a/dev/easytls-unit-tests.sh
+++ b/dev/easytls-unit-tests.sh
@@ -615,8 +615,7 @@ elif [ -n "${EASYTLS_REMOTE_CI}" ]; then
 
 	# Update safessl-easyrsa.cnf
 	print "*** Update safessl-easyrsa.cnf - easyrsa init-pki"
-	"${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch init-pki
-	"${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch make-safe-ssl
+	"${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch init-pki || fail "init-pki"
 
 	cp -vf "${WORK_DIR}/et-tdir${loops}/safessl-easyrsa.cnf" ./safessl-easyrsa.cnf || \
 		fail "(1) cp ${WORK_DIR}/et-tdir${loops}/safessl-easyrsa.cnf ./safessl-easyrsa.cnf"