tests: cert-tests: moved all data files in separate subdir

78 files changed, 129 insertions, 127 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 778e88e499..e1608b1007 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -236,7 +236,7 @@ TESTS = $(ctests) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT =						\
 	LC_ALL="C"						\
-	CAFILE=$(srcdir)/cert-tests/ca-certs.pem		\
+	CAFILE=$(srcdir)/cert-tests/data/ca-certs.pem		\
 	P11MOCKLIB1=$(abs_builddir)/.libs/libpkcs11mock1.so	\
 	PKCS12_MANY_CERTS_FILE=$(srcdir)/pkcs12-decode/pkcs12_5certs.p12	\
 	PKCS12FILE=$(srcdir)/pkcs12-decode/client.p12		\
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 551ff86953..1eb4f3255a 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -19,32 +19,34 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-EXTRA_DIST = ca-no-pathlen.pem no-ca-or-pathlen.pem aki-cert.pem \
-	template-test.key template-test.pem templates/template-test.tmpl \
-	funny-spacing.pem ca-certs.pem dane-test.rr cert-ecc256.pem \
-	bmpstring.pem template-utf8.pem templates/template-utf8.tmpl \
-	templates/template-dn.tmpl template-dn.pem complex-cert.pem template-overflow.pem \
-	templates/template-overflow.tmpl template-overflow2.pem \
+EXTRA_DIST = data/ca-no-pathlen.pem data/no-ca-or-pathlen.pem data/aki-cert.pem \
+	data/template-test.key data/template-test.pem data/templates/template-test.tmpl \
+	data/funny-spacing.pem data/ca-certs.pem data/dane-test.rr data/cert-ecc256.pem \
+	data/bmpstring.pem data/template-utf8.pem templates/template-utf8.tmpl \
+	templates/template-dn.tmpl data/template-dn.pem data/complex-cert.pem \
+	data/template-overflow.pem templates/template-overflow.tmpl data/template-overflow2.pem \
 	templates/template-overflow2.tmpl \
-	templates/template-date.tmpl template-date.pem templates/template-dn-err.tmpl \
-	templates/template-nc.tmpl template-nc.pem xmpp-othername.pem \
-	suppressions.valgrind csr-invalid.der invalid-sig2.pem invalid-sig3.pem \
-	invalid-sig.pem email-certs/chain.exclude.test.example.com email-certs/chain.test.example.com \
-	email-certs/chain.invalid.example.com email-certs/chain.test.example.com-2 \
-	single-ca.p7b single-ca.p7b.out full.p7b full.p7b.out detached.p7b \
-	pkcs7-detached.txt p7-combined.out template-generalized.pem \
-	templates/template-generalized.tmpl privkey1.pem privkey2.pem privkey3.pem \
-	name-constraints-ip.pem cert-invalid-utf8.der very-long-dn.pem \
-	provable3072.pem provable2048.pem provable-dsa2048.pem provable-dsa2048-fips.pem \
-	templates/template-unique.tmpl template-unique.pem \
-	templates/template-othername.tmpl template-othername.pem \
-	templates/template-othername-xmpp.tmpl template-othername-xmpp.pem \
+	templates/template-date.tmpl data/template-date.pem templates/template-dn-err.tmpl \
+	templates/template-nc.tmpl data/template-nc.pem data/xmpp-othername.pem \
+	suppressions.valgrind data/csr-invalid.der data/invalid-sig2.pem data/invalid-sig3.pem \
+	data/invalid-sig.pem email-data/chain.exclude.test.example.com email-data/chain.test.example.com \
+	email-data/chain.invalid.example.com email-data/chain.test.example.com-2 \
+	data/single-ca.p7b data/single-ca.p7b.out data/full.p7b data/full.p7b.out data/detached.p7b \
+	data/pkcs7-detached.txt data/p7-combined.out data/template-generalized.pem \
+	templates/template-generalized.tmpl data/privkey1.pem data/privkey2.pem data/privkey3.pem \
+	data/name-constraints-ip.pem data/cert-invalid-utf8.der data/very-long-dn.pem \
+	data/provable3072.pem data/provable2048.pem data/provable-dsa2048.pem \
+	data/provable-dsa2048-fips.pem \
+	templates/template-unique.tmpl data/template-unique.pem \
+	templates/template-othername.tmpl data/template-othername.pem \
+	templates/template-othername-xmpp.tmpl data/template-othername-xmpp.pem \
 	templates/template-krb5name.tmpl \
-	template-krb5name.pem template-krb5name-full.pem template-test-ecc.key \
-	template-rsa-sha3-256.pem template-rsa-sha3-512.pem template-rsa-sha3-224.pem template-rsa-sha3-384.pem \
-	name-constraints-ip2.pem chain-md5.pem gost-cert.pem \
+	data/template-krb5name.pem data/template-krb5name-full.pem data/template-test-ecc.key \
+	data/template-rsa-sha3-256.pem data/template-rsa-sha3-512.pem data/template-rsa-sha3-224.pem \
+	data/template-rsa-sha3-384.pem \
+	data/name-constraints-ip2.pem data/chain-md5.pem data/gost-cert.pem \
 	templates/template-tlsfeature.tmpl \
-	template-tlsfeature.pem template-tlsfeature.csr \
+	data/template-tlsfeature.pem data/template-tlsfeature.csr \
 	templates/template-tlsfeature-crq.tmpl
 
 dist_check_SCRIPTS = pathlen aki certtool invalid-sig email \
diff --git a/tests/cert-tests/aki b/tests/cert-tests/aki
index b66cba5743..5b2b2bf565 100755
--- a/tests/cert-tests/aki
+++ b/tests/cert-tests/aki
@@ -29,7 +29,7 @@ if ! test -z "${VALGRIND}"; then
 	VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
 fi
 
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/aki-cert.pem" \
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/aki-cert.pem" \
 	|grep -v "Algorithm Security Level" > tmp-aki.pem
 rc=$?
 
@@ -39,7 +39,7 @@ if test "${rc}" != "0"; then
 fi
 
 
-${DIFF} "${srcdir}/aki-cert.pem" tmp-aki.pem
+${DIFF} "${srcdir}/data/aki-cert.pem" tmp-aki.pem
 rc=$?
 
 # We're done.
diff --git a/tests/cert-tests/certtool b/tests/cert-tests/certtool
index c814de7002..b5d69dae09 100755
--- a/tests/cert-tests/certtool
+++ b/tests/cert-tests/certtool
@@ -28,7 +28,7 @@ if ! test -z "${VALGRIND}"; then
 fi
 
 #check whether "funny" spaces can be interpreted
-id=`${VALGRIND} "${CERTTOOL}" --key-id --infile "${srcdir}/funny-spacing.pem" --hash sha1| tr -d '\r'`
+id=`${VALGRIND} "${CERTTOOL}" --key-id --infile "${srcdir}/data/funny-spacing.pem" --hash sha1| tr -d '\r'`
 rc=$?
 
 if test "${id}" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3"; then
@@ -36,7 +36,7 @@ if test "${id}" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3"; then
 	exit 1
 fi
 
-id=`${VALGRIND} "${CERTTOOL}" --key-id --infile "${srcdir}/funny-spacing.pem"| tr -d '\r'`
+id=`${VALGRIND} "${CERTTOOL}" --key-id --infile "${srcdir}/data/funny-spacing.pem"| tr -d '\r'`
 rc=$?
 
 if test "${id}" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3"; then
@@ -44,7 +44,7 @@ if test "${id}" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3"; then
 	exit 1
 fi
 
-id=`"${CERTTOOL}" --pubkey-info <"${srcdir}/funny-spacing.pem"|"${CERTTOOL}" --key-id --hash sha1| tr -d '\r'`
+id=`"${CERTTOOL}" --pubkey-info <"${srcdir}/data/funny-spacing.pem"|"${CERTTOOL}" --key-id --hash sha1| tr -d '\r'`
 rc=$?
 
 if test "${id}" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3"; then
@@ -52,7 +52,7 @@ if test "${id}" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3"; then
 	exit 1
 fi
 
-id=`"${CERTTOOL}" --pubkey-info <"${srcdir}/funny-spacing.pem"|"${CERTTOOL}" --key-id --hash sha256| tr -d '\r'`
+id=`"${CERTTOOL}" --pubkey-info <"${srcdir}/data/funny-spacing.pem"|"${CERTTOOL}" --key-id --hash sha256| tr -d '\r'`
 rc=$?
 
 if test "${id}" != "118e72e3655150c895ecbd19b3634179fb4a87c7a25abefcb11f5d66661d5a4d"; then
@@ -61,7 +61,7 @@ if test "${id}" != "118e72e3655150c895ecbd19b3634179fb4a87c7a25abefcb11f5d66661d
 fi
 
 #fingerprint
-id=`${VALGRIND} "${CERTTOOL}" --fingerprint --infile "${srcdir}/funny-spacing.pem"| tr -d '\r'`
+id=`${VALGRIND} "${CERTTOOL}" --fingerprint --infile "${srcdir}/data/funny-spacing.pem"| tr -d '\r'`
 rc=$?
 
 if test "${id}" != "8f735c5ddefd723f59b6a3bb2ac0522470c0182f"; then
@@ -69,7 +69,7 @@ if test "${id}" != "8f735c5ddefd723f59b6a3bb2ac0522470c0182f"; then
 	exit 1
 fi
 
-id=`${VALGRIND} "${CERTTOOL}" --fingerprint --hash sha256 --infile "${srcdir}/funny-spacing.pem"| tr -d '\r'`
+id=`${VALGRIND} "${CERTTOOL}" --fingerprint --hash sha256 --infile "${srcdir}/data/funny-spacing.pem"| tr -d '\r'`
 rc=$?
 
 if test "${id}" != "fc5b45b20c489393a457f177572920ac40bacba9d25cea51200822271eaf7d1f"; then
diff --git a/tests/cert-tests/certtool-long-cn b/tests/cert-tests/certtool-long-cn
index 23654233ad..df430a2626 100755
--- a/tests/cert-tests/certtool-long-cn
+++ b/tests/cert-tests/certtool-long-cn
@@ -31,7 +31,7 @@ if ! test -z "${VALGRIND}"; then
 	VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=3"
 fi
 
-${VALGRIND} "${CERTTOOL}" -i --infile "${srcdir}/very-long-dn.pem" >$outfile
+${VALGRIND} "${CERTTOOL}" -i --infile "${srcdir}/data/very-long-dn.pem" >$outfile
 rc=$?
 
 if test "${rc}" = 3;then
@@ -44,7 +44,7 @@ if test "${rc}" != 0;then
 	exit 1
 fi
 
-$DIFF $outfile "${srcdir}/very-long-dn.pem"
+$DIFF $outfile "${srcdir}/data/very-long-dn.pem"
 if test $? != 0;then
 	echo "Error in parsing cert with long CN"
 	exit 1
diff --git a/tests/cert-tests/certtool-utf8 b/tests/cert-tests/certtool-utf8
index ce5141a39a..a814c08e12 100755
--- a/tests/cert-tests/certtool-utf8
+++ b/tests/cert-tests/certtool-utf8
@@ -29,7 +29,7 @@ if ! test -z "${VALGRIND}"; then
 	VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
 
 	# Check improper UTF8 errors
-	${VALGRIND} --error-exitcode=3 "${CERTTOOL}" -i --inder --infile "${srcdir}/cert-invalid-utf8.der"
+	${VALGRIND} --error-exitcode=3 "${CERTTOOL}" -i --inder --infile "${srcdir}/data/cert-invalid-utf8.der"
 	rc=$?
 
 	if test "${rc}" = 3;then
diff --git a/tests/cert-tests/crl b/tests/cert-tests/crl
index 4bea0779db..220c65660e 100755
--- a/tests/cert-tests/crl
+++ b/tests/cert-tests/crl
@@ -36,8 +36,8 @@ TMPFILE=crl.$$.tmpl
 echo "crl_next_update = 43" >$TMPFILE
 echo "crl_number = 7" >>$TMPFILE
 
-${VALGRIND} "${CERTTOOL}" --generate-crl --load-ca-privkey "${srcdir}/template-test.key"  --load-ca-certificate \
-	"${srcdir}/template-test.pem" --load-certificate "${srcdir}/ca-certs.pem" --template \
+${VALGRIND} "${CERTTOOL}" --generate-crl --load-ca-privkey "${srcdir}/data/template-test.key"  --load-ca-certificate \
+	"${srcdir}/data/template-test.pem" --load-certificate "${srcdir}/data/ca-certs.pem" --template \
 	"${TMPFILE}" >${OUTFILE} 2>${INFOFILE}
 rc=$?
 
@@ -55,8 +55,8 @@ fi
 
 # check appending a certificate
 
-${VALGRIND} "${CERTTOOL}" --generate-crl --load-ca-privkey "${srcdir}/template-test.key"  --load-ca-certificate \
-	"${srcdir}/template-test.pem" --load-crl "${OUTFILE}" --load-certificate "${srcdir}/cert-ecc256.pem" --template \
+${VALGRIND} "${CERTTOOL}" --generate-crl --load-ca-privkey "${srcdir}/data/template-test.key"  --load-ca-certificate \
+	"${srcdir}/data/template-test.pem" --load-crl "${OUTFILE}" --load-certificate "${srcdir}/data/cert-ecc256.pem" --template \
 	"${TMPFILE}" -d 9 >${OUTFILE2} 2>${INFOFILE}
 rc=$?
 
@@ -85,8 +85,8 @@ echo "crl_next_update_date = \"2006-03-29 13:21:42\"" >>$TMPFILE
 echo "crl_number = 8" >>$TMPFILE
 echo "crl_revocation_date = \"2003-02-01 10:00:00\"" >>$TMPFILE
 
-${VALGRIND} "${CERTTOOL}" --generate-crl --load-ca-privkey "${srcdir}/template-test.key"  --load-ca-certificate \
-	"${srcdir}/template-test.pem" --load-certificate "${srcdir}/cert-ecc256.pem" --template \
+${VALGRIND} "${CERTTOOL}" --generate-crl --load-ca-privkey "${srcdir}/data/template-test.key"  --load-ca-certificate \
+	"${srcdir}/data/template-test.pem" --load-certificate "${srcdir}/data/cert-ecc256.pem" --template \
 	"${TMPFILE}" -d 9 >${OUTFILE2} 2>${INFOFILE}
 rc=$?
 
diff --git a/tests/cert-tests/crq b/tests/cert-tests/crq
index 50b78c85c7..c87933be41 100755
--- a/tests/cert-tests/crq
+++ b/tests/cert-tests/crq
@@ -30,7 +30,7 @@ if ! test -z "${VALGRIND}"; then
 fi
 OUTFILE=out.tmp
 
-${VALGRIND} "${CERTTOOL}" --inder --crq-info --infile "${srcdir}/csr-invalid.der" >"${OUTFILE}" 2>&1
+${VALGRIND} "${CERTTOOL}" --inder --crq-info --infile "${srcdir}/data/csr-invalid.der" >"${OUTFILE}" 2>&1
 rc=$?
 
 # We're done.
diff --git a/tests/cert-tests/dane b/tests/cert-tests/dane
index f2aa341f2f..66a1f30817 100755
--- a/tests/cert-tests/dane
+++ b/tests/cert-tests/dane
@@ -28,9 +28,9 @@ DIFF="${DIFF:-diff}"
 
 test -e "${DANETOOL}" || exit 77
 
-"${DANETOOL}" --tlsa-rr --load-certificate "${srcdir}/cert-ecc256.pem" --host www.example.com --outfile tmp-dane.rr 2>/dev/null
+"${DANETOOL}" --tlsa-rr --load-certificate "${srcdir}/data/cert-ecc256.pem" --host www.example.com --outfile tmp-dane.rr 2>/dev/null
 
-${DIFF} "${srcdir}/dane-test.rr" tmp-dane.rr
+${DIFF} "${srcdir}/data/dane-test.rr" tmp-dane.rr
 rc=$?
 
 rm -f tmp-dane.rr
diff --git a/tests/cert-tests/aki-cert.pem b/tests/cert-tests/data/aki-cert.pem
index 86375a999b..86375a999b 100644
--- a/tests/cert-tests/aki-cert.pem
+++ b/tests/cert-tests/data/aki-cert.pem
diff --git a/tests/cert-tests/bmpstring.pem b/tests/cert-tests/data/bmpstring.pem
index 0661e1f7f8..0661e1f7f8 100644
--- a/tests/cert-tests/bmpstring.pem
+++ b/tests/cert-tests/data/bmpstring.pem
diff --git a/tests/cert-tests/ca-certs.pem b/tests/cert-tests/data/ca-certs.pem
index 76f13777a7..76f13777a7 100644
--- a/tests/cert-tests/ca-certs.pem
+++ b/tests/cert-tests/data/ca-certs.pem
diff --git a/tests/cert-tests/ca-no-pathlen.pem b/tests/cert-tests/data/ca-no-pathlen.pem
index ab0373f199..ab0373f199 100644
--- a/tests/cert-tests/ca-no-pathlen.pem
+++ b/tests/cert-tests/data/ca-no-pathlen.pem
diff --git a/tests/cert-tests/cert-ecc256.pem b/tests/cert-tests/data/cert-ecc256.pem
index 3f5cbc1fc2..3f5cbc1fc2 100644
--- a/tests/cert-tests/cert-ecc256.pem
+++ b/tests/cert-tests/data/cert-ecc256.pem
diff --git a/tests/cert-tests/cert-invalid-utf8.der b/tests/cert-tests/data/cert-invalid-utf8.der
index b6b45e320b..b6b45e320b 100644
--- a/tests/cert-tests/cert-invalid-utf8.der
+++ b/tests/cert-tests/data/cert-invalid-utf8.der
diff --git a/tests/cert-tests/chain-md5.pem b/tests/cert-tests/data/chain-md5.pem
index e5cbd0eabf..e5cbd0eabf 100644
--- a/tests/cert-tests/chain-md5.pem
+++ b/tests/cert-tests/data/chain-md5.pem
diff --git a/tests/cert-tests/complex-cert.pem b/tests/cert-tests/data/complex-cert.pem
index 1ec8acab20..1ec8acab20 100644
--- a/tests/cert-tests/complex-cert.pem
+++ b/tests/cert-tests/data/complex-cert.pem
diff --git a/tests/cert-tests/csr-invalid.der b/tests/cert-tests/data/csr-invalid.der
index fb1e744ce9..fb1e744ce9 100644
--- a/tests/cert-tests/csr-invalid.der
+++ b/tests/cert-tests/data/csr-invalid.der
diff --git a/tests/cert-tests/dane-test.rr b/tests/cert-tests/data/dane-test.rr
index b39b413b28..b39b413b28 100644
--- a/tests/cert-tests/dane-test.rr
+++ b/tests/cert-tests/data/dane-test.rr
diff --git a/tests/cert-tests/detached.p7b b/tests/cert-tests/data/detached.p7b
index d2a5602dcd..d2a5602dcd 100644
--- a/tests/cert-tests/detached.p7b
+++ b/tests/cert-tests/data/detached.p7b
diff --git a/tests/cert-tests/full.p7b b/tests/cert-tests/data/full.p7b
index 5438ca7695..5438ca7695 100644
--- a/tests/cert-tests/full.p7b
+++ b/tests/cert-tests/data/full.p7b
diff --git a/tests/cert-tests/full.p7b.out b/tests/cert-tests/data/full.p7b.out
index d65e3f1653..d65e3f1653 100644
--- a/tests/cert-tests/full.p7b.out
+++ b/tests/cert-tests/data/full.p7b.out
diff --git a/tests/cert-tests/funny-spacing.pem b/tests/cert-tests/data/funny-spacing.pem
index 98e4a75aa8..98e4a75aa8 100644
--- a/tests/cert-tests/funny-spacing.pem
+++ b/tests/cert-tests/data/funny-spacing.pem
diff --git a/tests/cert-tests/gost-cert.pem b/tests/cert-tests/data/gost-cert.pem
index 887702393d..887702393d 100644
--- a/tests/cert-tests/gost-cert.pem
+++ b/tests/cert-tests/data/gost-cert.pem
diff --git a/tests/cert-tests/invalid-sig.pem b/tests/cert-tests/data/invalid-sig.pem
index bfc59413de..bfc59413de 100644
--- a/tests/cert-tests/invalid-sig.pem
+++ b/tests/cert-tests/data/invalid-sig.pem
diff --git a/tests/cert-tests/invalid-sig2.pem b/tests/cert-tests/data/invalid-sig2.pem
index 69163e2590..69163e2590 100644
--- a/tests/cert-tests/invalid-sig2.pem
+++ b/tests/cert-tests/data/invalid-sig2.pem
diff --git a/tests/cert-tests/invalid-sig3.pem b/tests/cert-tests/data/invalid-sig3.pem
index 40c610fe93..40c610fe93 100644
--- a/tests/cert-tests/invalid-sig3.pem
+++ b/tests/cert-tests/data/invalid-sig3.pem
diff --git a/tests/cert-tests/name-constraints-ip.pem b/tests/cert-tests/data/name-constraints-ip.pem
index 0201035e6f..0201035e6f 100644
--- a/tests/cert-tests/name-constraints-ip.pem
+++ b/tests/cert-tests/data/name-constraints-ip.pem
diff --git a/tests/cert-tests/name-constraints-ip2.pem b/tests/cert-tests/data/name-constraints-ip2.pem
index ce626dea45..ce626dea45 100644
--- a/tests/cert-tests/name-constraints-ip2.pem
+++ b/tests/cert-tests/data/name-constraints-ip2.pem
diff --git a/tests/cert-tests/no-ca-or-pathlen.pem b/tests/cert-tests/data/no-ca-or-pathlen.pem
index 95f7c62f63..95f7c62f63 100644
--- a/tests/cert-tests/no-ca-or-pathlen.pem
+++ b/tests/cert-tests/data/no-ca-or-pathlen.pem
diff --git a/tests/cert-tests/p7-combined.out b/tests/cert-tests/data/p7-combined.out
index 0b1fcaddfd..0b1fcaddfd 100644
--- a/tests/cert-tests/p7-combined.out
+++ b/tests/cert-tests/data/p7-combined.out
diff --git a/tests/cert-tests/pkcs7-detached.txt b/tests/cert-tests/data/pkcs7-detached.txt
index 54fb2b85da..54fb2b85da 100644
--- a/tests/cert-tests/pkcs7-detached.txt
+++ b/tests/cert-tests/data/pkcs7-detached.txt
diff --git a/tests/cert-tests/privkey1.pem b/tests/cert-tests/data/privkey1.pem
index ceaf3136b0..ceaf3136b0 100644
--- a/tests/cert-tests/privkey1.pem
+++ b/tests/cert-tests/data/privkey1.pem
diff --git a/tests/cert-tests/privkey2.pem b/tests/cert-tests/data/privkey2.pem
index f631662f2d..f631662f2d 100644
--- a/tests/cert-tests/privkey2.pem
+++ b/tests/cert-tests/data/privkey2.pem
diff --git a/tests/cert-tests/privkey3.pem b/tests/cert-tests/data/privkey3.pem
index 8b49731c13..8b49731c13 100644
--- a/tests/cert-tests/privkey3.pem
+++ b/tests/cert-tests/data/privkey3.pem
diff --git a/tests/cert-tests/provable-dsa2048-fips.pem b/tests/cert-tests/data/provable-dsa2048-fips.pem
index 8a1721b49f..8a1721b49f 100644
--- a/tests/cert-tests/provable-dsa2048-fips.pem
+++ b/tests/cert-tests/data/provable-dsa2048-fips.pem
diff --git a/tests/cert-tests/provable-dsa2048.pem b/tests/cert-tests/data/provable-dsa2048.pem
index 0b0857b0b4..0b0857b0b4 100644
--- a/tests/cert-tests/provable-dsa2048.pem
+++ b/tests/cert-tests/data/provable-dsa2048.pem
diff --git a/tests/cert-tests/provable2048.pem b/tests/cert-tests/data/provable2048.pem
index 41fb3ee109..41fb3ee109 100644
--- a/tests/cert-tests/provable2048.pem
+++ b/tests/cert-tests/data/provable2048.pem
diff --git a/tests/cert-tests/provable3072.pem b/tests/cert-tests/data/provable3072.pem
index d68bf45f69..d68bf45f69 100644
--- a/tests/cert-tests/provable3072.pem
+++ b/tests/cert-tests/data/provable3072.pem
diff --git a/tests/cert-tests/single-ca.p7b b/tests/cert-tests/data/single-ca.p7b
index d0508c0c2d..d0508c0c2d 100644
--- a/tests/cert-tests/single-ca.p7b
+++ b/tests/cert-tests/data/single-ca.p7b
diff --git a/tests/cert-tests/single-ca.p7b.out b/tests/cert-tests/data/single-ca.p7b.out
index 88ec9e0d21..88ec9e0d21 100644
--- a/tests/cert-tests/single-ca.p7b.out
+++ b/tests/cert-tests/data/single-ca.p7b.out
diff --git a/tests/cert-tests/template-date.pem b/tests/cert-tests/data/template-date.pem
index c1613ca680..c1613ca680 100644
--- a/tests/cert-tests/template-date.pem
+++ b/tests/cert-tests/data/template-date.pem
diff --git a/tests/cert-tests/template-dn.pem b/tests/cert-tests/data/template-dn.pem
index 5ebc8eb9a0..5ebc8eb9a0 100644
--- a/tests/cert-tests/template-dn.pem
+++ b/tests/cert-tests/data/template-dn.pem
diff --git a/tests/cert-tests/template-generalized.pem b/tests/cert-tests/data/template-generalized.pem
index f7e9c4aaeb..f7e9c4aaeb 100644
--- a/tests/cert-tests/template-generalized.pem
+++ b/tests/cert-tests/data/template-generalized.pem
diff --git a/tests/cert-tests/template-krb5name-full.pem b/tests/cert-tests/data/template-krb5name-full.pem
index 1d4c0368d5..1d4c0368d5 100644
--- a/tests/cert-tests/template-krb5name-full.pem
+++ b/tests/cert-tests/data/template-krb5name-full.pem
diff --git a/tests/cert-tests/template-krb5name.pem b/tests/cert-tests/data/template-krb5name.pem
index d69e86f30b..d69e86f30b 100644
--- a/tests/cert-tests/template-krb5name.pem
+++ b/tests/cert-tests/data/template-krb5name.pem
diff --git a/tests/cert-tests/template-nc.pem b/tests/cert-tests/data/template-nc.pem
index 680fce1642..680fce1642 100644
--- a/tests/cert-tests/template-nc.pem
+++ b/tests/cert-tests/data/template-nc.pem
diff --git a/tests/cert-tests/template-othername-xmpp.pem b/tests/cert-tests/data/template-othername-xmpp.pem
index b81716b774..b81716b774 100644
--- a/tests/cert-tests/template-othername-xmpp.pem
+++ b/tests/cert-tests/data/template-othername-xmpp.pem
diff --git a/tests/cert-tests/template-othername.pem b/tests/cert-tests/data/template-othername.pem
index 540bd81547..540bd81547 100644
--- a/tests/cert-tests/template-othername.pem
+++ b/tests/cert-tests/data/template-othername.pem
diff --git a/tests/cert-tests/template-overflow.pem b/tests/cert-tests/data/template-overflow.pem
index c0b025070c..c0b025070c 100644
--- a/tests/cert-tests/template-overflow.pem
+++ b/tests/cert-tests/data/template-overflow.pem
diff --git a/tests/cert-tests/template-overflow2.pem b/tests/cert-tests/data/template-overflow2.pem
index 43e8efadc6..43e8efadc6 100644
--- a/tests/cert-tests/template-overflow2.pem
+++ b/tests/cert-tests/data/template-overflow2.pem
diff --git a/tests/cert-tests/template-rsa-sha3-224.pem b/tests/cert-tests/data/template-rsa-sha3-224.pem
index 8b2a0fb903..8b2a0fb903 100644
--- a/tests/cert-tests/template-rsa-sha3-224.pem
+++ b/tests/cert-tests/data/template-rsa-sha3-224.pem
diff --git a/tests/cert-tests/template-rsa-sha3-256.pem b/tests/cert-tests/data/template-rsa-sha3-256.pem
index 35a083ac3c..35a083ac3c 100644
--- a/tests/cert-tests/template-rsa-sha3-256.pem
+++ b/tests/cert-tests/data/template-rsa-sha3-256.pem
diff --git a/tests/cert-tests/template-rsa-sha3-384.pem b/tests/cert-tests/data/template-rsa-sha3-384.pem
index b6de699f96..b6de699f96 100644
--- a/tests/cert-tests/template-rsa-sha3-384.pem
+++ b/tests/cert-tests/data/template-rsa-sha3-384.pem
diff --git a/tests/cert-tests/template-rsa-sha3-512.pem b/tests/cert-tests/data/template-rsa-sha3-512.pem
index 05a24766a0..05a24766a0 100644
--- a/tests/cert-tests/template-rsa-sha3-512.pem
+++ b/tests/cert-tests/data/template-rsa-sha3-512.pem
diff --git a/tests/cert-tests/template-test-ecc.key b/tests/cert-tests/data/template-test-ecc.key
index a3cd7c7be8..a3cd7c7be8 100644
--- a/tests/cert-tests/template-test-ecc.key
+++ b/tests/cert-tests/data/template-test-ecc.key
diff --git a/tests/cert-tests/template-test.key b/tests/cert-tests/data/template-test.key
index 3b5886d5c6..3b5886d5c6 100644
--- a/tests/cert-tests/template-test.key
+++ b/tests/cert-tests/data/template-test.key
diff --git a/tests/cert-tests/template-test.pem b/tests/cert-tests/data/template-test.pem
index 1acd2fe0ae..1acd2fe0ae 100644
--- a/tests/cert-tests/template-test.pem
+++ b/tests/cert-tests/data/template-test.pem
diff --git a/tests/cert-tests/template-tlsfeature.csr b/tests/cert-tests/data/template-tlsfeature.csr
index d0bfee75d0..d0bfee75d0 100644
--- a/tests/cert-tests/template-tlsfeature.csr
+++ b/tests/cert-tests/data/template-tlsfeature.csr
diff --git a/tests/cert-tests/template-tlsfeature.pem b/tests/cert-tests/data/template-tlsfeature.pem
index 23ba2886a1..23ba2886a1 100644
--- a/tests/cert-tests/template-tlsfeature.pem
+++ b/tests/cert-tests/data/template-tlsfeature.pem
diff --git a/tests/cert-tests/template-unique.pem b/tests/cert-tests/data/template-unique.pem
index e08e5b53ec..e08e5b53ec 100644
--- a/tests/cert-tests/template-unique.pem
+++ b/tests/cert-tests/data/template-unique.pem
diff --git a/tests/cert-tests/template-utf8.pem b/tests/cert-tests/data/template-utf8.pem
index 410e6ae44d..410e6ae44d 100644
--- a/tests/cert-tests/template-utf8.pem
+++ b/tests/cert-tests/data/template-utf8.pem
diff --git a/tests/cert-tests/very-long-dn.pem b/tests/cert-tests/data/very-long-dn.pem
index 9bb240aaee..9bb240aaee 100644
--- a/tests/cert-tests/very-long-dn.pem
+++ b/tests/cert-tests/data/very-long-dn.pem
diff --git a/tests/cert-tests/xmpp-othername.pem b/tests/cert-tests/data/xmpp-othername.pem
index 2b093f6dc1..2b093f6dc1 100644
--- a/tests/cert-tests/xmpp-othername.pem
+++ b/tests/cert-tests/data/xmpp-othername.pem
diff --git a/tests/cert-tests/invalid-sig b/tests/cert-tests/invalid-sig
index dacdc61683..eaa75c7543 100755
--- a/tests/cert-tests/invalid-sig
+++ b/tests/cert-tests/invalid-sig
@@ -30,7 +30,7 @@ if ! test -z "${VALGRIND}"; then
 fi
 
 #check whether a different PKCS #1 signature than the advertized in certificate is tolerated
-${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/invalid-sig.pem"
+${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/data/invalid-sig.pem"
 rc=$?
 
 # We're done.
@@ -40,7 +40,7 @@ if test "${rc}" = "0"; then
 fi
 
 #check whether a different tbsCertificate than the outer signature algorithm is tolerated
-${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/invalid-sig2.pem"
+${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/data/invalid-sig2.pem"
 rc=$?
 
 # We're done.
@@ -50,7 +50,7 @@ if test "${rc}" = "0"; then
 fi
 
 #check whether a different tbsCertificate than the outer signature algorithm is tolerated
-${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/invalid-sig3.pem"
+${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/data/invalid-sig3.pem"
 rc=$?
 
 # We're done.
diff --git a/tests/cert-tests/krb5-test b/tests/cert-tests/krb5-test
index e6e731e93d..57ea4757f7 100755
--- a/tests/cert-tests/krb5-test
+++ b/tests/cert-tests/krb5-test
@@ -46,11 +46,11 @@ fi
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-krb5name.tmpl" \
 		--outfile ${OUTFILE} 2>/dev/null
 
-${DIFF} "${srcdir}/template-krb5name.pem" ${OUTFILE} >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-krb5name.pem" ${OUTFILE} >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -65,7 +65,7 @@ echo "krb5_principal = 'xxxxxxxxxxxxxx'" >>${TMPLFILE}
 
 datefudge -s "2007-04-22" \
 ${VALGRIND} "${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template ${TMPLFILE} \
 		--outfile ${OUTFILE} 2>/dev/null
 
@@ -82,7 +82,7 @@ echo "krb5_principal = 'comp1/comp2/comp3/comp4/comp5/comp6/comp7/comp8/comp9/co
 
 datefudge -s "2007-04-22" \
 ${VALGRIND} "${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template ${TMPLFILE} \
 		--outfile ${OUTFILE} 2>/dev/null
 
diff --git a/tests/cert-tests/md5-test b/tests/cert-tests/md5-test
index a904b2911e..f4a2046248 100755
--- a/tests/cert-tests/md5-test
+++ b/tests/cert-tests/md5-test
@@ -38,7 +38,7 @@ fi
 # Test MD5 signatures
 
 datefudge -s "2016-04-15" \
-	"${CERTTOOL}" --verify-chain --infile "${srcdir}/chain-md5.pem" >/dev/null 2>&1
+	"${CERTTOOL}" --verify-chain --infile "${srcdir}/data/chain-md5.pem" >/dev/null 2>&1
 rc=$?
 if test "${rc}" != "1"; then
 	echo "Test 1 (verification of RSA-MD5) failed"
@@ -46,7 +46,7 @@ if test "${rc}" != "1"; then
 fi
 
 datefudge -s "2016-04-15" \
-	"${CERTTOOL}" --verify-allow-broken --verify-chain --infile "${srcdir}/chain-md5.pem" >/dev/null 2>&1
+	"${CERTTOOL}" --verify-allow-broken --verify-chain --infile "${srcdir}/data/chain-md5.pem" >/dev/null 2>&1
 rc=$?
 if test "${rc}" != "0"; then
 	echo "Test 2 (verification of RSA-MD5 with allow-broken) failed"
diff --git a/tests/cert-tests/name-constraints b/tests/cert-tests/name-constraints
index 05d6e9b3ab..c818f59f6d 100755
--- a/tests/cert-tests/name-constraints
+++ b/tests/cert-tests/name-constraints
@@ -28,7 +28,7 @@ if ! test -z "${VALGRIND}"; then
 fi
 TMPFILE=tmp.$$.pem
 
-${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/name-constraints-ip.pem"
+${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/data/name-constraints-ip.pem"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -36,7 +36,7 @@ if test "${rc}" != "0"; then
 	exit 1
 fi
 
-${VALGRIND} "${CERTTOOL}" -i --infile "${srcdir}/name-constraints-ip2.pem" --outfile "${TMPFILE}"
+${VALGRIND} "${CERTTOOL}" -i --infile "${srcdir}/data/name-constraints-ip2.pem" --outfile "${TMPFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -44,7 +44,7 @@ if test "${rc}" != "0"; then
 	exit 1
 fi
 
-${DIFF} "${TMPFILE}" "${srcdir}/name-constraints-ip2.pem" >/dev/null 2>&1
+${DIFF} "${TMPFILE}" "${srcdir}/data/name-constraints-ip2.pem" >/dev/null 2>&1
 rc=$?
 
 if test "${rc}" != "0"; then
diff --git a/tests/cert-tests/othername-test b/tests/cert-tests/othername-test
index 1acb072942..603db3696f 100755
--- a/tests/cert-tests/othername-test
+++ b/tests/cert-tests/othername-test
@@ -41,11 +41,11 @@ fi
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-othername.tmpl" \
 		--outfile ${OUTFILE} 2>/dev/null
 
-${DIFF} "${srcdir}/template-othername.pem" ${OUTFILE} >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-othername.pem" ${OUTFILE} >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -56,11 +56,11 @@ fi
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-othername-xmpp.tmpl" \
 		--outfile ${OUTFILE} 2>/dev/null
 
-${DIFF} "${srcdir}/template-othername-xmpp.pem" ${OUTFILE} >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-othername-xmpp.pem" ${OUTFILE} >/dev/null 2>&1
 rc=$?
 
 # We're done.
diff --git a/tests/cert-tests/pathlen b/tests/cert-tests/pathlen
index 074b0b91eb..cdac5d726d 100755
--- a/tests/cert-tests/pathlen
+++ b/tests/cert-tests/pathlen
@@ -29,7 +29,7 @@ if ! test -z "${VALGRIND}"; then
 	VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
 fi
 
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/ca-no-pathlen.pem" \
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/ca-no-pathlen.pem" \
 	|grep -v "Algorithm Security Level" > new-ca-no-pathlen.pem
 rc=$?
 
@@ -38,7 +38,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/no-ca-or-pathlen.pem" \
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/no-ca-or-pathlen.pem" \
 	|grep -v "Algorithm Security Level" > new-no-ca-or-pathlen.pem
 rc=$?
 
@@ -47,9 +47,9 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${DIFF} "${srcdir}/ca-no-pathlen.pem" new-ca-no-pathlen.pem
+${DIFF} "${srcdir}/data/ca-no-pathlen.pem" new-ca-no-pathlen.pem
 rc1=$?
-${DIFF} "${srcdir}/no-ca-or-pathlen.pem" new-no-ca-or-pathlen.pem
+${DIFF} "${srcdir}/data/no-ca-or-pathlen.pem" new-no-ca-or-pathlen.pem
 rc2=$?
 
 
diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
index defe1de894..bdc29d670e 100755
--- a/tests/cert-tests/pem-decoding
+++ b/tests/cert-tests/pem-decoding
@@ -34,7 +34,7 @@ TMPFILE1=tmp1-$$.pem.tmp
 TMPFILE2=tmp2-$$.pem.tmp
 
 #check whether "funny" spaces can be interpreted
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/funny-spacing.pem" >/dev/null 2>&1
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/funny-spacing.pem" >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -44,7 +44,7 @@ if test "${rc}" != "0"; then
 fi
 
 #check whether a BMPString attribute can be properly decoded
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/bmpstring.pem" >${TMPFILE}
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/bmpstring.pem" >${TMPFILE}
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -53,7 +53,7 @@ if test "${rc}" != "0"; then
 fi
 
 #FIXME: the output string differs in windows and linux on the last char.
-${DIFF} "${srcdir}/bmpstring.pem" ${TMPFILE} || ${DIFF} --strip-trailing-cr "${srcdir}/bmpstring.pem" ${TMPFILE}
+${DIFF} "${srcdir}/data/bmpstring.pem" ${TMPFILE} || ${DIFF} --strip-trailing-cr "${srcdir}/data/bmpstring.pem" ${TMPFILE}
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -62,7 +62,7 @@ if test "${rc}" != "0"; then
 fi
 
 #check whether complex-cert is decoded as expected
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/complex-cert.pem" >${TMPFILE}
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/complex-cert.pem" >${TMPFILE}
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -70,7 +70,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-cat "${srcdir}/complex-cert.pem" |grep -v "Not After:" >${TMPFILE1}
+cat "${srcdir}/data/complex-cert.pem" |grep -v "Not After:" >${TMPFILE1}
 cat ${TMPFILE} |grep -v "Not After:" >${TMPFILE2}
 ${DIFF} ${TMPFILE1} ${TMPFILE2} || ${DIFF} --strip-trailing-cr ${TMPFILE1} ${TMPFILE2}
 rc=$?
@@ -81,7 +81,7 @@ if test "${rc}" != "0"; then
 fi
 
 #check whether the cert with many othernames is decoded as expected
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/xmpp-othername.pem" >${TMPFILE}
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/xmpp-othername.pem" >${TMPFILE}
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -89,7 +89,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-cat "${srcdir}/xmpp-othername.pem" |grep -v "Not After:" >${TMPFILE1}
+cat "${srcdir}/data/xmpp-othername.pem" |grep -v "Not After:" >${TMPFILE1}
 cat ${TMPFILE} |grep -v "Not After:" >${TMPFILE2}
 ${DIFF} ${TMPFILE1} ${TMPFILE2} || ${DIFF} --strip-trailing-cr ${TMPFILE1} ${TMPFILE2}
 rc=$?
@@ -99,7 +99,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/template-krb5name.pem" >${TMPFILE}
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/template-krb5name.pem" >${TMPFILE}
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -108,7 +108,7 @@ if test "${rc}" != "0"; then
 fi
 
 cat ${TMPFILE} |grep "KRB5Principal:" >${TMPFILE1}
-cat "${srcdir}/template-krb5name-full.pem" |grep "KRB5Principal:" >${TMPFILE2}
+cat "${srcdir}/data/template-krb5name-full.pem" |grep "KRB5Principal:" >${TMPFILE2}
 ${DIFF} -u ${TMPFILE1} ${TMPFILE2} || ${DIFF} -u --strip-trailing-cr ${TMPFILE1} ${TMPFILE2}
 rc=$?
 
@@ -119,7 +119,7 @@ fi
 
 
 #check whether the cert with GOST parameters is decoded as expected
-${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/gost-cert.pem" >${TMPFILE}
+${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/gost-cert.pem" >${TMPFILE}
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -127,7 +127,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${DIFF} ${TMPFILE} "${srcdir}/gost-cert.pem" || ${DIFF} --strip-trailing-cr "${TMPFILE}" "${srcdir}/gost-cert.pem"
+${DIFF} ${TMPFILE} "${srcdir}/data/gost-cert.pem" || ${DIFF} --strip-trailing-cr "${TMPFILE}" "${srcdir}/data/gost-cert.pem"
 rc=$?
 
 if test "${rc}" != "0"; then
diff --git a/tests/cert-tests/pkcs7 b/tests/cert-tests/pkcs7
index c2fbdeea71..31a8eb9998 100755
--- a/tests/cert-tests/pkcs7
+++ b/tests/cert-tests/pkcs7
@@ -30,7 +30,7 @@ OUTFILE=out-pkcs7.tmp
 OUTFILE2=out2-pkcs7.tmp
 
 for FILE in single-ca.p7b full.p7b; do
-${VALGRIND} "${CERTTOOL}" --inder --p7-info --infile "${srcdir}/${FILE}"|grep -v "Signing time" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --inder --p7-info --infile "${srcdir}/data/${FILE}"|grep -v "Signing time" >"${OUTFILE}"
 rc=$?
 
 # We're done.
@@ -39,7 +39,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${DIFF} "${OUTFILE}" "${srcdir}/${FILE}.out" >/dev/null
+${DIFF} "${OUTFILE}" "${srcdir}/data/${FILE}.out" >/dev/null
 if test "$?" != "0"; then
 	echo "${FILE}: PKCS7 decoding didn't produce the correct file"
 	exit 1
@@ -49,7 +49,7 @@ done
 # check signatures
 
 for FILE in full.p7b; do
-${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/data/${FILE}" >"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -57,7 +57,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${VALGRIND} "${CERTTOOL}" --verify-purpose=1.3.6.1.5.5.7.3.1 --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --verify-purpose=1.3.6.1.5.5.7.3.1 --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/data/${FILE}" >"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -65,7 +65,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${VALGRIND} "${CERTTOOL}" --verify-purpose=1.3.6.1.5.5.7.3.3 --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --verify-purpose=1.3.6.1.5.5.7.3.3 --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/data/${FILE}" >"${OUTFILE}"
 rc=$?
 
 if test "${rc}" = "0"; then
@@ -78,7 +78,7 @@ done
 # check signature with detached data
 
 FILE="detached.p7b"
-${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}"
+${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/data/${FILE}"
 rc=$?
 
 if test "${rc}" = "0"; then
@@ -86,7 +86,7 @@ if test "${rc}" = "0"; then
 	exit 2
 fi
 
-${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-data "${srcdir}/pkcs7-detached.txt" --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}"
+${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-data "${srcdir}/data/pkcs7-detached.txt" --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/data/${FILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -106,7 +106,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${DIFF} "${OUTFILE}" "${srcdir}/p7-combined.out" >/dev/null
+${DIFF} "${OUTFILE}" "${srcdir}/data/p7-combined.out" >/dev/null
 if test "$?" != "0"; then
 	echo "${FILE}: PKCS7 generation didn't produce the correct file"
 	exit 1
@@ -114,7 +114,7 @@ fi
 
 # Test signing
 FILE="signing"
-${VALGRIND} "${CERTTOOL}" --p7-sign --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/pkcs7-detached.txt" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --p7-sign --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/data/pkcs7-detached.txt" >"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -141,7 +141,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-cmp "${OUTFILE2}" "${srcdir}/pkcs7-detached.txt"
+cmp "${OUTFILE2}" "${srcdir}/data/pkcs7-detached.txt"
 rc=$?
 if test "${rc}" != "0"; then
 	echo "${FILE}: PKCS7 data detaching failed"
@@ -149,7 +149,7 @@ if test "${rc}" != "0"; then
 fi
 
 FILE="signing-detached"
-${VALGRIND} "${CERTTOOL}" --p7-detached-sign --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/pkcs7-detached.txt" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --p7-detached-sign --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/data/pkcs7-detached.txt" >"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -158,7 +158,7 @@ if test "${rc}" != "0"; then
 fi
 
 FILE="signing-detached-verify"
-${VALGRIND} "${CERTTOOL}" --p7-verify --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --load-data "${srcdir}/pkcs7-detached.txt" <"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --p7-verify --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --load-data "${srcdir}/data/pkcs7-detached.txt" <"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -168,7 +168,7 @@ fi
 
 # Test signing with broken algorithms
 FILE="signing-broken"
-${VALGRIND} "${CERTTOOL}" --hash md5 --p7-sign --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/pkcs7-detached.txt" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --hash md5 --p7-sign --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/data/pkcs7-detached.txt" >"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -186,7 +186,7 @@ if test "${rc}" = "0"; then
 fi
 
 FILE="signing-time"
-${VALGRIND} "${CERTTOOL}" --p7-detached-sign --p7-time --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/pkcs7-detached.txt" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --p7-detached-sign --p7-time --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/data/pkcs7-detached.txt" >"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -208,7 +208,7 @@ if test "${rc}" != "0"; then
 fi
 
 FILE="signing-time-verify"
-${VALGRIND} "${CERTTOOL}" --p7-verify --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --load-data "${srcdir}/pkcs7-detached.txt" <"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --p7-verify --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --load-data "${srcdir}/data/pkcs7-detached.txt" <"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
diff --git a/tests/cert-tests/pkcs7-broken-sigs b/tests/cert-tests/pkcs7-broken-sigs
index 159cb5cbd3..913b2aa6eb 100755
--- a/tests/cert-tests/pkcs7-broken-sigs
+++ b/tests/cert-tests/pkcs7-broken-sigs
@@ -31,7 +31,7 @@ OUTFILE2=out2-pkcs7.$$.tmp
 
 # Test signing with MD5
 FILE="signing"
-${VALGRIND} "${CERTTOOL}" --p7-sign --hash md5 --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/pkcs7-detached.txt" >"${OUTFILE}"
+${VALGRIND} "${CERTTOOL}" --p7-sign --hash md5 --load-privkey  "${srcdir}/../../doc/credentials/x509/key-rsa.pem" --load-certificate "${srcdir}/../../doc/credentials/x509/cert-rsa.pem" --infile "${srcdir}/data/pkcs7-detached.txt" >"${OUTFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
diff --git a/tests/cert-tests/privkey-import b/tests/cert-tests/privkey-import
index 930a874d29..084094c0f2 100755
--- a/tests/cert-tests/privkey-import
+++ b/tests/cert-tests/privkey-import
@@ -29,7 +29,7 @@ fi
 
 for i in privkey1.pem privkey2.pem privkey3.pem;do
 #check whether "funny" spaces can be interpreted
-${VALGRIND} "${CERTTOOL}" -k --infile "${srcdir}/${i}"
+${VALGRIND} "${CERTTOOL}" -k --infile "${srcdir}/data/${i}"
 rc=$?
 
 if test "${rc}" != "0";then
diff --git a/tests/cert-tests/provable-privkey b/tests/cert-tests/provable-privkey
index dc9770d0db..bf23a82f90 100755
--- a/tests/cert-tests/provable-privkey
+++ b/tests/cert-tests/provable-privkey
@@ -30,7 +30,7 @@ if ! test -z "${VALGRIND}"; then
 fi
 
 #RSA keys
-${VALGRIND} "${CERTTOOL}" --verify-provable-privkey --load-privkey "${srcdir}/provable2048.pem"
+${VALGRIND} "${CERTTOOL}" --verify-provable-privkey --load-privkey "${srcdir}/data/provable2048.pem"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -38,7 +38,7 @@ if test "${rc}" != "0"; then
 	exit 1
 fi
 
-${VALGRIND} "${CERTTOOL}" --verify-provable-privkey --load-privkey "${srcdir}/provable3072.pem"
+${VALGRIND} "${CERTTOOL}" --verify-provable-privkey --load-privkey "${srcdir}/data/provable3072.pem"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -87,7 +87,7 @@ DSAFILE=provable-dsa2048.pem
 fi
 
 #DSA keys
-${VALGRIND} "${CERTTOOL}" --verify-provable-privkey --load-privkey "${srcdir}/${DSAFILE}"
+${VALGRIND} "${CERTTOOL}" --verify-provable-privkey --load-privkey "${srcdir}/data/${DSAFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
diff --git a/tests/cert-tests/sha3-test b/tests/cert-tests/sha3-test
index d6ac8a9518..40f2912306 100755
--- a/tests/cert-tests/sha3-test
+++ b/tests/cert-tests/sha3-test
@@ -43,13 +43,13 @@ fi
 for i in sha3-224 sha3-256 sha3-384 sha3-512;do
 datefudge -s "2007-04-22" \
 "${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-test.tmpl" \
 		--outfile "${TMPFILE}" --hash $i 2>/dev/null
 rc=$?
 
-if test -f "${srcdir}/template-rsa-$i.pem";then
-${DIFF} "${srcdir}/template-rsa-$i.pem" "${TMPFILE}" >/dev/null 2>&1
+if test -f "${srcdir}/data/template-rsa-$i.pem";then
+${DIFF} "${srcdir}/data/template-rsa-$i.pem" "${TMPFILE}" >/dev/null 2>&1
 rc=$?
 fi
 
@@ -73,7 +73,7 @@ done
 for i in sha3-224 sha3-256 sha3-384 sha3-512;do
 datefudge -s "2007-04-22" \
 "${CERTTOOL}" --generate-self-signed \
-	--load-privkey "${srcdir}/template-test-ecc.key" \
+	--load-privkey "${srcdir}/data/template-test-ecc.key" \
 	--template "${srcdir}/templates/template-test.tmpl" \
 	--outfile "${TMPFILE}" --hash $i 2>/dev/null
 rc=$?
diff --git a/tests/cert-tests/template-test b/tests/cert-tests/template-test
index 14588af149..976df045bf 100755
--- a/tests/cert-tests/template-test
+++ b/tests/cert-tests/template-test
@@ -40,11 +40,11 @@ fi
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-test.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 
-${DIFF} "${srcdir}/template-test.pem" tmp-tt.pem >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-test.pem" tmp-tt.pem >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -57,11 +57,11 @@ rm -f tmp-tt.pem
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-utf8.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 
-${DIFF} "${srcdir}/template-utf8.pem" tmp-tt.pem >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-utf8.pem" tmp-tt.pem >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -74,11 +74,11 @@ rm -f tmp-tt.pem
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-dn.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 
-${DIFF} "${srcdir}/template-dn.pem" tmp-tt.pem >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-dn.pem" tmp-tt.pem >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -91,7 +91,7 @@ rm -f tmp-tt.pem
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-dn-err.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 rc=$?
@@ -105,11 +105,11 @@ rm -f tmp-tt.pem
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-overflow.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 
-${DIFF} "${srcdir}/template-overflow.pem" tmp-tt.pem >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-overflow.pem" tmp-tt.pem >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -125,11 +125,11 @@ if echo __SIZEOF_POINTER__ | cpp -E - - | grep '^8$' >/dev/null; then
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-overflow2.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 
-${DIFF} "${srcdir}/template-overflow2.pem" tmp-tt.pem >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-overflow2.pem" tmp-tt.pem >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -143,11 +143,11 @@ fi
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-date.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 
-${DIFF} "${srcdir}/template-date.pem" tmp-tt.pem >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-date.pem" tmp-tt.pem >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -162,11 +162,11 @@ rm -f tmp-tt.pem
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-nc.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 
-${DIFF} "${srcdir}/template-nc.pem" tmp-tt.pem >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-nc.pem" tmp-tt.pem >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -183,11 +183,11 @@ if test "$(getconf LONG_BIT)" = "64"; then
 	# we should test that on systems which have 64-bit time_t.
 	datefudge -s "2051-04-22" \
 			"${CERTTOOL}" --generate-self-signed \
-				--load-privkey "${srcdir}/template-test.key" \
+				--load-privkey "${srcdir}/data/template-test.key" \
 				--template "${srcdir}/templates/template-generalized.tmpl" \
 				--outfile tmp-tt.pem 2>/dev/null
 
-	${DIFF} "${srcdir}/template-generalized.pem" tmp-tt.pem >/dev/null 2>&1
+	${DIFF} "${srcdir}/data/template-generalized.pem" tmp-tt.pem >/dev/null 2>&1
 	rc=$?
 
 	# We're done.
@@ -203,11 +203,11 @@ rm -f tmp-tt.pem
 
 datefudge -s "2007-04-22" \
 	"${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-unique.tmpl" \
 		--outfile tmp-tt.pem 2>/dev/null
 
-${DIFF} "${srcdir}/template-unique.pem" tmp-tt.pem >/dev/null 2>&1
+${DIFF} "${srcdir}/data/template-unique.pem" tmp-tt.pem >/dev/null 2>&1
 rc=$?
 
 # We're done.
diff --git a/tests/cert-tests/tlsfeature-test b/tests/cert-tests/tlsfeature-test
index 4df27ef0b9..0070ea8627 100755
--- a/tests/cert-tests/tlsfeature-test
+++ b/tests/cert-tests/tlsfeature-test
@@ -40,12 +40,12 @@ fi
 #
 datefudge -s "2007-04-22" \
 "${CERTTOOL}" --generate-self-signed \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-tlsfeature.tmpl" \
 		--outfile "${TMPFILE}" 2>/dev/null
 rc=$?
 
-${DIFF} --ignore-matching-lines "Algorithm Security Level" "${srcdir}/template-tlsfeature.pem" "${TMPFILE}" >/dev/null 2>&1
+${DIFF} --ignore-matching-lines "Algorithm Security Level" "${srcdir}/data/template-tlsfeature.pem" "${TMPFILE}" >/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -60,7 +60,7 @@ fi
 rm -f "${TMPFILE}"
 rm -f "${TMPFILE2}"
 "${CERTTOOL}" -i \
-		--infile "${srcdir}/template-tlsfeature.pem" --outfile "${TMPFILE}"
+		--infile "${srcdir}/data/template-tlsfeature.pem" --outfile "${TMPFILE}"
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -99,7 +99,7 @@ fi
 
 datefudge -s "2007-04-22" \
 "${CERTTOOL}" --generate-request \
-		--load-privkey "${srcdir}/template-test.key" \
+		--load-privkey "${srcdir}/data/template-test.key" \
 		--template "${srcdir}/templates/template-tlsfeature.tmpl" \
 		--outfile "${TMPFILE}" -d 4 #2>/dev/null
 rc=$?
@@ -108,7 +108,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${DIFF} --ignore-matching-lines "Algorithm Security Level" "${srcdir}/template-tlsfeature.csr" "${TMPFILE}" #>/dev/null 2>&1
+${DIFF} --ignore-matching-lines "Algorithm Security Level" "${srcdir}/data/template-tlsfeature.csr" "${TMPFILE}" #>/dev/null 2>&1
 rc=$?
 
 # We're done.
@@ -123,7 +123,7 @@ fi
 rm -f "${TMPFILE}"
 rm -f "${TMPFILE2}"
 "${CERTTOOL}" --crq-info \
-		--infile "${srcdir}/template-tlsfeature.csr" --outfile "${TMPFILE}" >/dev/null 2>&1
+		--infile "${srcdir}/data/template-tlsfeature.csr" --outfile "${TMPFILE}" >/dev/null 2>&1
 rc=$?
 
 if test "${rc}" != "0"; then
@@ -160,9 +160,9 @@ fi
 #
 datefudge -s "2007-04-22" \
 "${CERTTOOL}" --generate-certificate \
-		--load-privkey "${srcdir}/template-test.key" \
-		--load-ca-privkey "${srcdir}/template-test.key" \
-		--load-ca-certificate "${srcdir}/template-tlsfeature.pem" \
+		--load-privkey "${srcdir}/data/template-test.key" \
+		--load-ca-privkey "${srcdir}/data/template-test.key" \
+		--load-ca-certificate "${srcdir}/data/template-tlsfeature.pem" \
 		--template "${srcdir}/templates/template-tlsfeature-crq.tmpl" \
 		--load-request "${TMPFILE}" >"${TMPFILE2}" 2>&1