diff --git a/.gitignore b/.gitignore
index 41edb1d..c88695e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,5 +59,5 @@ test/ca/rootca.pki
 test/ca/rootca.vars
 test/ca/subca.pki
 test/ca/subca.vars
-test/ca/vars
+test/ca/ca-vars
 versioninfo.rc
diff --git a/configure.ac b/configure.ac
index 1e21404..8d2d0ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -376,7 +376,7 @@ AC_CONFIG_FILES([
 	test/ca/Makefile
 	test/ca/rootca.vars
 	test/ca/subca.vars
-	test/ca/vars
+	test/ca/ca-vars
 	test/mycms-tool/Makefile
 	test/mycms-tool/encrypt/Makefile
 	test/mycms-tool/sign/Makefile
diff --git a/test/ca/Makefile.am b/test/ca/Makefile.am
index 36fa183..8e463b9 100644
--- a/test/ca/Makefile.am
+++ b/test/ca/Makefile.am
@@ -26,25 +26,27 @@ dist_noinst_DATA = \
 built.rootca:	\
 		oids.cnf \
 		$(NULL)
-	rm -f built.rootca init-pki
-	$(EASYRSA) --vars="./rootca.vars" init-pki
+	rm -rf built.rootca rootca.pki
+	$(EASYRSA) --pki-dir=rootca.pki init-pki
+	cp rootca.vars rootca.pki/vars
 	touch rootca.pki/.rnd
-	$(EASYRSA) --vars="./rootca.vars" build-ca nopass
+	$(EASYRSA) --pki-dir=rootca.pki build-ca nopass
 	touch built.rootca
 
 built.subca:	\
 		built.rootca \
 		oids.cnf \
 		$(NULL)
-	rm -f built.subca subca.pki
-	$(EASYRSA) --vars="./subca.vars" init-pki
+	rm -rf built.subca subca.pki
+	$(EASYRSA) --pki-dir=subca.pki init-pki
+	cp subca.vars subca.pki/vars
 	touch subca.pki/.rnd
 
 	cat "$(srcdir)/oids.cnf" >> subca.pki/openssl-easyrsa.cnf
 	sed -i '1i oid_section = oids' subca.pki/openssl-easyrsa.cnf
 
-	$(EASYRSA) --vars="./subca.vars" build-ca nopass subca
-	$(EASYRSA) --vars="./rootca.vars" import-req ./subca.pki/reqs/ca.req subca
-	$(EASYRSA) --vars="./rootca.vars" sign-req ca subca
+	$(EASYRSA) --pki-dir=subca.pki build-ca nopass subca
+	$(EASYRSA) --pki-dir=rootca.pki import-req ./subca.pki/reqs/ca.req subca
+	$(EASYRSA) --pki-dir=rootca.pki sign-req ca subca
 	cp ./rootca.pki/issued/subca.crt ./subca.pki/ca.crt
 	touch built.subca
diff --git a/test/ca/vars.in b/test/ca/ca-vars.in
similarity index 100%
rename from test/ca/vars.in
rename to test/ca/ca-vars.in
diff --git a/test/ca/issue.sh b/test/ca/issue.sh
index 6ea7d06..12a15b0 100755
--- a/test/ca/issue.sh
+++ b/test/ca/issue.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 abs_builddir="${abs_builddir:-$(dirname "$0")}"
-. "${abs_builddir}/vars"
+. "${abs_builddir}/ca-vars"
 
 die() {
 	local m="$1"
@@ -14,8 +14,8 @@ NAME="$1"; shift
 CERT="$1"; shift
 KEY="$1"; shift
 
-"${EASYRSA}" --vars="${abs_builddir}/subca.vars" gen-req "${NAME}" nopass || die "req"
-"${EASYRSA}" --vars="${abs_builddir}/subca.vars"  --subject-alt-name="URI:test:${NAME}" sign-req "${TEMPLATE}" "${NAME}" nopass || die "sign"
+"${EASYRSA}" --pki-dir="${abs_builddir}/subca.pki" gen-req "${NAME}" nopass || die "req"
+"${EASYRSA}" --pki-dir="${abs_builddir}/subca.pki" --subject-alt-name="URI:test:${NAME}" sign-req "${TEMPLATE}" "${NAME}" nopass || die "sign"
 
 "${OPENSSL}" x509 -in "${abs_builddir}/subca.pki/issued/${NAME}.crt" -inform PEM -out "${CERT}" -outform DER || die "export.cert"
 "${OPENSSL}" pkcs8 -in "${abs_builddir}/subca.pki/private/${NAME}.key" -inform PEM -out "${KEY}" -outform DER -nocrypt || die "export.key"
diff --git a/test/mycms-tool/encrypt/Makefile.am b/test/mycms-tool/encrypt/Makefile.am
index 7a87290..fe576b0 100644
--- a/test/mycms-tool/encrypt/Makefile.am
+++ b/test/mycms-tool/encrypt/Makefile.am
@@ -46,6 +46,6 @@ built.pki:	Makefile
 	rm -fr gen
 	mkdir gen
 	for i in 1 2 3 4 5; do \
-		abs_builddir="$(abs_top_builddir)/test/ca" "$(top_srcdir)/test/ca/issue.sh" encrypt test$$i gen/test$$i.crt gen/test$$i.key; \
+		abs_builddir="$(abs_top_builddir)/test/ca" "$(top_srcdir)/test/ca/issue.sh" encrypt tool-encrypt-test$$i gen/test$$i.crt gen/test$$i.key; \
 	done
 	touch built.pki
diff --git a/test/mycms-tool/sign/Makefile.am b/test/mycms-tool/sign/Makefile.am
index 9fad9ee..856a0e9 100644
--- a/test/mycms-tool/sign/Makefile.am
+++ b/test/mycms-tool/sign/Makefile.am
@@ -46,6 +46,6 @@ built.pki:	Makefile
 	rm -fr gen
 	mkdir gen
 	for i in 1 2 3; do \
-		abs_builddir="$(abs_top_builddir)/test/ca" "$(top_srcdir)/test/ca/issue.sh" sign test$$i gen/test$$i.crt gen/test$$i.key; \
+		abs_builddir="$(abs_top_builddir)/test/ca" "$(top_srcdir)/test/ca/issue.sh" sign tool-sign-test$$i gen/test$$i.crt gen/test$$i.key; \
 	done
 	touch built.pki