diff --git a/test/ca/Makefile.am b/test/ca/Makefile.am
index 8e463b9..a9b2ef2 100644
--- a/test/ca/Makefile.am
+++ b/test/ca/Makefile.am
@@ -17,8 +17,6 @@ dist_noinst_SCRIPTS = \
 
 dist_noinst_DATA = \
 	oids.cnf \
-	x509-types/COMMON \
-	x509-types/ca \
 	x509-types/encrypt \
 	x509-types/sign \
 	$(NULL)
@@ -42,6 +40,7 @@ built.subca:	\
 	cp subca.vars subca.pki/vars
 	touch subca.pki/.rnd
 
+	cat "$$(dirname "$(EASYRSA)")/openssl-easyrsa.cnf" > subca.pki/openssl-easyrsa.cnf
 	cat "$(srcdir)/oids.cnf" >> subca.pki/openssl-easyrsa.cnf
 	sed -i '1i oid_section = oids' subca.pki/openssl-easyrsa.cnf
 
diff --git a/test/ca/x509-types/COMMON b/test/ca/x509-types/COMMON
deleted file mode 100644
index 3e9b633..0000000
--- a/test/ca/x509-types/COMMON
+++ /dev/null
@@ -1,7 +0,0 @@
-# X509 extensions added to every signed cert
-
-# This file is included for every cert signed, and by default does nothing.
-# It could be used to add values every cert should have, such as a CDP as
-# demonstrated in the following example:
-
-#crlDistributionPoints = URI:http://example.net/pki/my_ca.crl
diff --git a/test/ca/x509-types/ca b/test/ca/x509-types/ca
deleted file mode 100644
index ef525b6..0000000
--- a/test/ca/x509-types/ca
+++ /dev/null
@@ -1,13 +0,0 @@
-# X509 extensions for a ca
-
-# Note that basicConstraints will be overridden by Easy-RSA when defining a
-# CA_PATH_LEN for CA path length limits. You could also do this here
-# manually as in the following example in place of the existing line:
-#
-# basicConstraints = CA:TRUE, pathlen:1
-
-basicConstraints = CA:TRUE
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer:always
-keyUsage = cRLSign, keyCertSign
-