tests: combined key and cert teststmp-simplify-tests

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

67 files changed, 29 insertions, 109 deletions

diff --git a/configure.ac b/configure.ac
index 05c58fe7b9..8536610b61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -963,7 +963,6 @@ AC_CONFIG_FILES([
   tests/Makefile
   tests/windows/Makefile
   tests/cert-tests/Makefile
-  tests/key-tests/Makefile
   tests/slow/Makefile
   tests/suite/Makefile
   fuzz/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 805f7ae77f..28db145c09 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,7 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-SUBDIRS = . cert-tests key-tests slow
+SUBDIRS = . cert-tests slow
 
 TESTS_ENVIRONMENT =
 
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index a5b5178626..6649838104 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -75,7 +75,21 @@ EXTRA_DIST = data/ca-no-pathlen.pem data/no-ca-or-pathlen.pem data/aki-cert.pem
 	data/mem-leak.p12 data/alt-chain-new-ca.pem data/alt-chain-old-ca.pem \
 	data/alt-chain.pem data/pkcs7-chain.pem data/pkcs7-chain-root.pem data/chain-eddsa.pem \
 	data/pkcs7-chain-endcert-key.pem data/cert-rsa-pss.pem data/openssl-invalid-time-format.pem \
-	data/cert-eddsa.pem data/pubkey-eddsa.pem data/pkcs7-eddsa-sig.p7s
+	data/cert-eddsa.pem data/pubkey-eddsa.pem data/pkcs7-eddsa-sig.p7s \
+	data/key-ca.pem data/key-user.pem \
+	data/ca-gnutls-keyid.pem data/ca-no-keyid.pem data/ca-weird-keyid.pem \
+	data/key-ca-1234.p8 data/key-ca-empty.p8 data/key-ca-null.p8 \
+	data/openssl-key-ecc.p8 data/key-ecc.p8 data/key-ecc.pem suppressions.valgrind \
+	data/encpkcs8.pem data/unencpkcs8.pem data/enc2pkcs8.pem \
+	data/openssl-3des.p8 data/openssl-3des.p8.txt data/openssl-aes128.p8 \
+	data/openssl-aes128.p8.txt data/openssl-aes256.p8 data/openssl-aes256.p8.txt \
+	data/cert.dsa.1024.pem data/cert.dsa.2048.pem data/cert.dsa.3072.pem \
+	data/dsa.1024.pem data/dsa.2048.pem data/dsa.3072.pem data/dsa-pubkey-1018.pem \
+	data/bad-key.pem data/p8key-illegal.pem data/key-illegal.pem data/pkcs8-pbes2-sha256.pem \
+	data/pkcs8-pbes1-des-md5.pem data/pkcs8-invalid8.der data/key-invalid1.der \
+	data/key-invalid4.der data/key-invalid5.der data/key-invalid6.der \
+	data data/pkcs8-invalid9.der data/key-invalid2.der data/pkcs8-invalid10.der \
+	data/key-invalid3.der data/pkcs8-eddsa.pem data/pkcs8-eddsa.pem.txt
 
 dist_check_SCRIPTS = pathlen aki certtool invalid-sig email \
 	pkcs7 pkcs7-broken-sigs privkey-import name-constraints certtool-long-cn crl provable-privkey \
@@ -83,17 +97,25 @@ dist_check_SCRIPTS = pathlen aki certtool invalid-sig email \
 	provable-privkey-rsa2048 provable-privkey-gen-default pkcs7-constraints \
 	pkcs7-constraints2 certtool-long-oids pkcs7-cat cert-sanity cert-critical \
 	pkcs12 certtool-crl-decoding pkcs12-encode pkcs12-corner-cases inhibit-anypolicy \
-	smime cert-time alt-chain pkcs7-list-sign pkcs7-eddsa
+	smime cert-time alt-chain pkcs7-list-sign pkcs7-eddsa \
+	key-id pkcs8 pkcs8-decode ecdsa illegal-rsa pkcs8-invalid key-invalid \
+	pkcs8-eddsa
+
+dist_check_SCRIPTS += key-id ecdsa pkcs8-invalid key-invalid pkcs8-decode pkcs8 pkcs8-eddsa \
+	certtool-utf8 crq
+
 
 if WANT_TEST_SUITE
 dist_check_SCRIPTS += provable-dh-default
 endif
 
-dist_check_SCRIPTS += certtool-utf8 crq
+if !WITH_OLD_NETTLE
+dist_check_SCRIPTS += illegal-rsa
+endif
 
 if !WINDOWS
 dist_check_SCRIPTS += template-test pem-decoding othername-test krb5-test sha3-test md5-test \
-	tlsfeature-test template-exts-test pkcs1-pad pkcs12-utf8 rsa-pss-pad
+	tlsfeature-test template-exts-test pkcs1-pad pkcs12-utf8 rsa-pss-pad dsa
 endif
 
 if ENABLE_DANE
diff --git a/tests/key-tests/data/bad-key.pem b/tests/cert-tests/data/bad-key.pem
index 6dfb622dab..6dfb622dab 100644
--- a/tests/key-tests/data/bad-key.pem
+++ b/tests/cert-tests/data/bad-key.pem
diff --git a/tests/key-tests/data/ca-gnutls-keyid.pem b/tests/cert-tests/data/ca-gnutls-keyid.pem
index fdb7520a48..fdb7520a48 100644
--- a/tests/key-tests/data/ca-gnutls-keyid.pem
+++ b/tests/cert-tests/data/ca-gnutls-keyid.pem
diff --git a/tests/key-tests/data/ca-no-keyid.pem b/tests/cert-tests/data/ca-no-keyid.pem
index 50675e420b..50675e420b 100644
--- a/tests/key-tests/data/ca-no-keyid.pem
+++ b/tests/cert-tests/data/ca-no-keyid.pem
diff --git a/tests/key-tests/data/ca-weird-keyid.pem b/tests/cert-tests/data/ca-weird-keyid.pem
index 6ecfef4231..6ecfef4231 100644
--- a/tests/key-tests/data/ca-weird-keyid.pem
+++ b/tests/cert-tests/data/ca-weird-keyid.pem
diff --git a/tests/key-tests/data/cert.dsa.1024.pem b/tests/cert-tests/data/cert.dsa.1024.pem
index ffde3b69e4..ffde3b69e4 100644
--- a/tests/key-tests/data/cert.dsa.1024.pem
+++ b/tests/cert-tests/data/cert.dsa.1024.pem
diff --git a/tests/key-tests/data/cert.dsa.2048.pem b/tests/cert-tests/data/cert.dsa.2048.pem
index 2fa5a5f404..2fa5a5f404 100644
--- a/tests/key-tests/data/cert.dsa.2048.pem
+++ b/tests/cert-tests/data/cert.dsa.2048.pem
diff --git a/tests/key-tests/data/cert.dsa.3072.pem b/tests/cert-tests/data/cert.dsa.3072.pem
index d7f89e6de3..d7f89e6de3 100644
--- a/tests/key-tests/data/cert.dsa.3072.pem
+++ b/tests/cert-tests/data/cert.dsa.3072.pem
diff --git a/tests/key-tests/data/dsa-pubkey-1018.pem b/tests/cert-tests/data/dsa-pubkey-1018.pem
index b0fafd6c55..b0fafd6c55 100644
--- a/tests/key-tests/data/dsa-pubkey-1018.pem
+++ b/tests/cert-tests/data/dsa-pubkey-1018.pem
diff --git a/tests/key-tests/data/dsa.1024.pem b/tests/cert-tests/data/dsa.1024.pem
index 3e0c103b95..3e0c103b95 100644
--- a/tests/key-tests/data/dsa.1024.pem
+++ b/tests/cert-tests/data/dsa.1024.pem
diff --git a/tests/key-tests/data/dsa.2048.pem b/tests/cert-tests/data/dsa.2048.pem
index 12d8e0e58a..12d8e0e58a 100644
--- a/tests/key-tests/data/dsa.2048.pem
+++ b/tests/cert-tests/data/dsa.2048.pem
diff --git a/tests/key-tests/data/dsa.3072.pem b/tests/cert-tests/data/dsa.3072.pem
index 103e4c11d5..103e4c11d5 100644
--- a/tests/key-tests/data/dsa.3072.pem
+++ b/tests/cert-tests/data/dsa.3072.pem
diff --git a/tests/key-tests/data/enc2pkcs8.pem b/tests/cert-tests/data/enc2pkcs8.pem
index 4ec8ddc10d..4ec8ddc10d 100644
--- a/tests/key-tests/data/enc2pkcs8.pem
+++ b/tests/cert-tests/data/enc2pkcs8.pem
diff --git a/tests/key-tests/data/encpkcs8.pem b/tests/cert-tests/data/encpkcs8.pem
index 69417b85d8..69417b85d8 100644
--- a/tests/key-tests/data/encpkcs8.pem
+++ b/tests/cert-tests/data/encpkcs8.pem
diff --git a/tests/key-tests/data/key-ca-1234.p8 b/tests/cert-tests/data/key-ca-1234.p8
index dc6b1daf9a..dc6b1daf9a 100644
--- a/tests/key-tests/data/key-ca-1234.p8
+++ b/tests/cert-tests/data/key-ca-1234.p8
diff --git a/tests/key-tests/data/key-ca-empty.p8 b/tests/cert-tests/data/key-ca-empty.p8
index f86433fa65..f86433fa65 100644
--- a/tests/key-tests/data/key-ca-empty.p8
+++ b/tests/cert-tests/data/key-ca-empty.p8
diff --git a/tests/key-tests/data/key-ca-null.p8 b/tests/cert-tests/data/key-ca-null.p8
index e58483e952..e58483e952 100644
--- a/tests/key-tests/data/key-ca-null.p8
+++ b/tests/cert-tests/data/key-ca-null.p8
diff --git a/tests/key-tests/data/key-ecc.p8 b/tests/cert-tests/data/key-ecc.p8
index 189ab0144f..189ab0144f 100644
--- a/tests/key-tests/data/key-ecc.p8
+++ b/tests/cert-tests/data/key-ecc.p8
diff --git a/tests/key-tests/data/key-ecc.pem b/tests/cert-tests/data/key-ecc.pem
index 57e40c7e5b..57e40c7e5b 100644
--- a/tests/key-tests/data/key-ecc.pem
+++ b/tests/cert-tests/data/key-ecc.pem
diff --git a/tests/key-tests/data/key-illegal-rsa-pss.pem b/tests/cert-tests/data/key-illegal-rsa-pss.pem
index 7fe2f1c55c..7fe2f1c55c 100644
--- a/tests/key-tests/data/key-illegal-rsa-pss.pem
+++ b/tests/cert-tests/data/key-illegal-rsa-pss.pem
diff --git a/tests/key-tests/data/key-illegal.pem b/tests/cert-tests/data/key-illegal.pem
index 75c7679d03..75c7679d03 100644
--- a/tests/key-tests/data/key-illegal.pem
+++ b/tests/cert-tests/data/key-illegal.pem
diff --git a/tests/key-tests/data/key-invalid1.der b/tests/cert-tests/data/key-invalid1.der
index 909ee82a7a..909ee82a7a 100644
--- a/tests/key-tests/data/key-invalid1.der
+++ b/tests/cert-tests/data/key-invalid1.der
diff --git a/tests/key-tests/data/key-invalid2.der b/tests/cert-tests/data/key-invalid2.der
index c4e90e2f7c..c4e90e2f7c 100644
--- a/tests/key-tests/data/key-invalid2.der
+++ b/tests/cert-tests/data/key-invalid2.der
diff --git a/tests/key-tests/data/key-invalid3.der b/tests/cert-tests/data/key-invalid3.der
index 2700ef03c4..2700ef03c4 100644
--- a/tests/key-tests/data/key-invalid3.der
+++ b/tests/cert-tests/data/key-invalid3.der
diff --git a/tests/key-tests/data/key-invalid4.der b/tests/cert-tests/data/key-invalid4.der
index e66c74d6c0..e66c74d6c0 100644
--- a/tests/key-tests/data/key-invalid4.der
+++ b/tests/cert-tests/data/key-invalid4.der
diff --git a/tests/key-tests/data/key-invalid5.der b/tests/cert-tests/data/key-invalid5.der
index e03829cb79..e03829cb79 100644
--- a/tests/key-tests/data/key-invalid5.der
+++ b/tests/cert-tests/data/key-invalid5.der
diff --git a/tests/key-tests/data/key-invalid6.der b/tests/cert-tests/data/key-invalid6.der
index d4efbcb1ca..d4efbcb1ca 100644
--- a/tests/key-tests/data/key-invalid6.der
+++ b/tests/cert-tests/data/key-invalid6.der
diff --git a/tests/key-tests/data/openssl-3des.p8 b/tests/cert-tests/data/openssl-3des.p8
index 4fdca7f29f..4fdca7f29f 100644
--- a/tests/key-tests/data/openssl-3des.p8
+++ b/tests/cert-tests/data/openssl-3des.p8
diff --git a/tests/key-tests/data/openssl-3des.p8.txt b/tests/cert-tests/data/openssl-3des.p8.txt
index b2f20fa3bc..b2f20fa3bc 100644
--- a/tests/key-tests/data/openssl-3des.p8.txt
+++ b/tests/cert-tests/data/openssl-3des.p8.txt
diff --git a/tests/key-tests/data/openssl-aes128.p8 b/tests/cert-tests/data/openssl-aes128.p8
index b138daa9d8..b138daa9d8 100644
--- a/tests/key-tests/data/openssl-aes128.p8
+++ b/tests/cert-tests/data/openssl-aes128.p8
diff --git a/tests/key-tests/data/openssl-aes128.p8.txt b/tests/cert-tests/data/openssl-aes128.p8.txt
index a7fa89c477..a7fa89c477 100644
--- a/tests/key-tests/data/openssl-aes128.p8.txt
+++ b/tests/cert-tests/data/openssl-aes128.p8.txt
diff --git a/tests/key-tests/data/openssl-aes256.p8 b/tests/cert-tests/data/openssl-aes256.p8
index 73653954e3..73653954e3 100644
--- a/tests/key-tests/data/openssl-aes256.p8
+++ b/tests/cert-tests/data/openssl-aes256.p8
diff --git a/tests/key-tests/data/openssl-aes256.p8.txt b/tests/cert-tests/data/openssl-aes256.p8.txt
index 5a1d3806f0..5a1d3806f0 100644
--- a/tests/key-tests/data/openssl-aes256.p8.txt
+++ b/tests/cert-tests/data/openssl-aes256.p8.txt
diff --git a/tests/key-tests/data/openssl-key-ecc.p8 b/tests/cert-tests/data/openssl-key-ecc.p8
index 4fc966f328..4fc966f328 100644
--- a/tests/key-tests/data/openssl-key-ecc.p8
+++ b/tests/cert-tests/data/openssl-key-ecc.p8
diff --git a/tests/key-tests/data/p8key-illegal.pem b/tests/cert-tests/data/p8key-illegal.pem
index a247c3c944..a247c3c944 100644
--- a/tests/key-tests/data/p8key-illegal.pem
+++ b/tests/cert-tests/data/p8key-illegal.pem
diff --git a/tests/key-tests/data/pkcs8-eddsa.pem b/tests/cert-tests/data/pkcs8-eddsa.pem
index e447080ae2..e447080ae2 100644
--- a/tests/key-tests/data/pkcs8-eddsa.pem
+++ b/tests/cert-tests/data/pkcs8-eddsa.pem
diff --git a/tests/key-tests/data/pkcs8-eddsa.pem.txt b/tests/cert-tests/data/pkcs8-eddsa.pem.txt
index 665124de2c..665124de2c 100644
--- a/tests/key-tests/data/pkcs8-eddsa.pem.txt
+++ b/tests/cert-tests/data/pkcs8-eddsa.pem.txt
diff --git a/tests/key-tests/data/pkcs8-invalid1.der b/tests/cert-tests/data/pkcs8-invalid1.der
index 8d05984ddf..8d05984ddf 100644
--- a/tests/key-tests/data/pkcs8-invalid1.der
+++ b/tests/cert-tests/data/pkcs8-invalid1.der
diff --git a/tests/key-tests/data/pkcs8-invalid10.der b/tests/cert-tests/data/pkcs8-invalid10.der
index eb9c173eb0..eb9c173eb0 100644
--- a/tests/key-tests/data/pkcs8-invalid10.der
+++ b/tests/cert-tests/data/pkcs8-invalid10.der
diff --git a/tests/key-tests/data/pkcs8-invalid11.der b/tests/cert-tests/data/pkcs8-invalid11.der
index 7f4fda8df0..7f4fda8df0 100644
--- a/tests/key-tests/data/pkcs8-invalid11.der
+++ b/tests/cert-tests/data/pkcs8-invalid11.der
diff --git a/tests/key-tests/data/pkcs8-invalid2.der b/tests/cert-tests/data/pkcs8-invalid2.der
index 086a6613cb..086a6613cb 100644
--- a/tests/key-tests/data/pkcs8-invalid2.der
+++ b/tests/cert-tests/data/pkcs8-invalid2.der
diff --git a/tests/key-tests/data/pkcs8-invalid3.der b/tests/cert-tests/data/pkcs8-invalid3.der
index 39b821fe04..39b821fe04 100644
--- a/tests/key-tests/data/pkcs8-invalid3.der
+++ b/tests/cert-tests/data/pkcs8-invalid3.der
diff --git a/tests/key-tests/data/pkcs8-invalid4.der b/tests/cert-tests/data/pkcs8-invalid4.der
index c8591a0b7c..c8591a0b7c 100644
--- a/tests/key-tests/data/pkcs8-invalid4.der
+++ b/tests/cert-tests/data/pkcs8-invalid4.der
diff --git a/tests/key-tests/data/pkcs8-invalid5.der b/tests/cert-tests/data/pkcs8-invalid5.der
index 3f234599f2..3f234599f2 100644
--- a/tests/key-tests/data/pkcs8-invalid5.der
+++ b/tests/cert-tests/data/pkcs8-invalid5.der
diff --git a/tests/key-tests/data/pkcs8-invalid6.der b/tests/cert-tests/data/pkcs8-invalid6.der
index f1519feb84..f1519feb84 100644
--- a/tests/key-tests/data/pkcs8-invalid6.der
+++ b/tests/cert-tests/data/pkcs8-invalid6.der
diff --git a/tests/key-tests/data/pkcs8-invalid7.der b/tests/cert-tests/data/pkcs8-invalid7.der
index 85e1357962..85e1357962 100644
--- a/tests/key-tests/data/pkcs8-invalid7.der
+++ b/tests/cert-tests/data/pkcs8-invalid7.der
diff --git a/tests/key-tests/data/pkcs8-invalid8.der b/tests/cert-tests/data/pkcs8-invalid8.der
index 4caa5281ed..4caa5281ed 100644
--- a/tests/key-tests/data/pkcs8-invalid8.der
+++ b/tests/cert-tests/data/pkcs8-invalid8.der
diff --git a/tests/key-tests/data/pkcs8-invalid9.der b/tests/cert-tests/data/pkcs8-invalid9.der
index ea3c772f0a..ea3c772f0a 100644
--- a/tests/key-tests/data/pkcs8-invalid9.der
+++ b/tests/cert-tests/data/pkcs8-invalid9.der
diff --git a/tests/key-tests/data/pkcs8-pbes1-des-md5.pem b/tests/cert-tests/data/pkcs8-pbes1-des-md5.pem
index b37ea472fe..b37ea472fe 100644
--- a/tests/key-tests/data/pkcs8-pbes1-des-md5.pem
+++ b/tests/cert-tests/data/pkcs8-pbes1-des-md5.pem
diff --git a/tests/key-tests/data/pkcs8-pbes2-sha256.pem b/tests/cert-tests/data/pkcs8-pbes2-sha256.pem
index ba88d8eea3..ba88d8eea3 100644
--- a/tests/key-tests/data/pkcs8-pbes2-sha256.pem
+++ b/tests/cert-tests/data/pkcs8-pbes2-sha256.pem
diff --git a/tests/key-tests/data/unencpkcs8.pem b/tests/cert-tests/data/unencpkcs8.pem
index 794dfd7e7a..794dfd7e7a 100644
--- a/tests/key-tests/data/unencpkcs8.pem
+++ b/tests/cert-tests/data/unencpkcs8.pem
diff --git a/tests/key-tests/dsa b/tests/cert-tests/dsa
index f8901c8c3e..f8901c8c3e 100755
--- a/tests/key-tests/dsa
+++ b/tests/cert-tests/dsa
diff --git a/tests/key-tests/ecdsa b/tests/cert-tests/ecdsa
index c593351b57..c593351b57 100755
--- a/tests/key-tests/ecdsa
+++ b/tests/cert-tests/ecdsa
diff --git a/tests/key-tests/illegal-rsa b/tests/cert-tests/illegal-rsa
index 1b9a162779..1b9a162779 100755
--- a/tests/key-tests/illegal-rsa
+++ b/tests/cert-tests/illegal-rsa
diff --git a/tests/key-tests/key-id b/tests/cert-tests/key-id
index 2e59593a3f..2e59593a3f 100755
--- a/tests/key-tests/key-id
+++ b/tests/cert-tests/key-id
diff --git a/tests/key-tests/key-invalid b/tests/cert-tests/key-invalid
index eeb94ee976..eeb94ee976 100755
--- a/tests/key-tests/key-invalid
+++ b/tests/cert-tests/key-invalid
diff --git a/tests/key-tests/pkcs8 b/tests/cert-tests/pkcs8
index d23aad94b4..d23aad94b4 100755
--- a/tests/key-tests/pkcs8
+++ b/tests/cert-tests/pkcs8
diff --git a/tests/key-tests/pkcs8-decode b/tests/cert-tests/pkcs8-decode
index 2fb8696626..2fb8696626 100755
--- a/tests/key-tests/pkcs8-decode
+++ b/tests/cert-tests/pkcs8-decode
diff --git a/tests/key-tests/pkcs8-eddsa b/tests/cert-tests/pkcs8-eddsa
index 7474078ff6..7474078ff6 100755
--- a/tests/key-tests/pkcs8-eddsa
+++ b/tests/cert-tests/pkcs8-eddsa
diff --git a/tests/key-tests/pkcs8-invalid b/tests/cert-tests/pkcs8-invalid
index a9e8beac21..a9e8beac21 100755
--- a/tests/key-tests/pkcs8-invalid
+++ b/tests/cert-tests/pkcs8-invalid
diff --git a/tests/key-tests/Makefile.am b/tests/key-tests/Makefile.am
deleted file mode 100644
index 90c8f5472e..0000000000
--- a/tests/key-tests/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007-2008, 2010, 2012 Free Software Foundation, Inc.
-#
-# Author: Simon Josefsson
-#
-# This file is part of GnuTLS.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# 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 = data/key-ca.pem data/key-user.pem \
-	data/ca-gnutls-keyid.pem data/ca-no-keyid.pem data/ca-weird-keyid.pem \
-	data/key-ca-1234.p8 data/key-ca-empty.p8 data/key-ca-null.p8 \
-	data/openssl-key-ecc.p8 data/key-ecc.p8 data/key-ecc.pem suppressions.valgrind \
-	data/encpkcs8.pem data/unencpkcs8.pem data/enc2pkcs8.pem \
-	data/openssl-3des.p8 data/openssl-3des.p8.txt data/openssl-aes128.p8 \
-	data/openssl-aes128.p8.txt data/openssl-aes256.p8 data/openssl-aes256.p8.txt \
-	data/cert.dsa.1024.pem data/cert.dsa.2048.pem data/cert.dsa.3072.pem \
-	data/dsa.1024.pem data/dsa.2048.pem data/dsa.3072.pem data/dsa-pubkey-1018.pem \
-	data/bad-key.pem data/p8key-illegal.pem data/key-illegal.pem data/pkcs8-pbes2-sha256.pem \
-	data/pkcs8-pbes1-des-md5.pem data/pkcs8-invalid8.der data/key-invalid1.der \
-	data/key-invalid4.der data/key-invalid5.der data/key-invalid6.der \
-	data data/pkcs8-invalid9.der data/key-invalid2.der data/pkcs8-invalid10.der \
-	data/key-invalid3.der data/pkcs8-eddsa.pem data/pkcs8-eddsa.pem.txt
-
-dist_check_SCRIPTS = key-id pkcs8 pkcs8-decode dsa ecdsa illegal-rsa pkcs8-invalid key-invalid \
-	pkcs8-eddsa
-
-TESTS = key-id ecdsa pkcs8-invalid key-invalid pkcs8-decode pkcs8 pkcs8-eddsa
-
-if !WITH_OLD_NETTLE
-TESTS += illegal-rsa
-endif
-
-if !WINDOWS
-TESTS += dsa
-endif
-
-TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
-	ASAN_OPTIONS="detect_leaks=0:exitcode=6" \
-	LC_ALL="C"						\
-	VALGRIND="$(VALGRIND)"					\
-	top_builddir="$(top_builddir)"				\
-	srcdir="$(srcdir)"
-
-if WANT_TEST_SUITE
-LOG_COMPILER = $(VALGRIND)
-endif
diff --git a/tests/key-tests/data/key-ca.pem b/tests/key-tests/data/key-ca.pem
deleted file mode 100644
index 88e775c78c..0000000000
--- a/tests/key-tests/data/key-ca.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBAMaUBiinUSQ5sVoBVJtQ1BcMTd+sQgAH5XIw3IgtghaA2iNHqEZ8
-yIhPD2rStIaX25SHhTUvUeccM35rHAAHG7sCAwEAAQJAP/UlFqrtI3HBgW+0RGIA
-LXw1CLl+eGwSpni+Ts35fC1qEYCsjSwAzeNucV5urXnTTmsboHNIig54MnwbL1Sn
-YQIhAMtdpCtbFilcdidYBegCa3AMrkxQfNsi8k1fuhYXEYZlAiEA+fksjyNHytun
-RjnwW6EIRNCWfiynfPWoiZhbYOCqZ58CIQCkC/ucRbPQ1ZcyEZ1iFGGaV4Baayrs
-knom1CuGGkG2yQIhAKnTKv6jzWZ4DBCd1DmsEV4PB+74j2FJ1BKGu635dEupAiEA
-trFNqR7VOm9kt+mjcsenUzJXaarFnRog/E9qAjguU/U=
------END RSA PRIVATE KEY-----
diff --git a/tests/key-tests/data/key-user.pem b/tests/key-tests/data/key-user.pem
deleted file mode 100644
index e375860987..0000000000
--- a/tests/key-tests/data/key-user.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAPNKtqHQHldXWXn+jhOb9GY0inTHrlwpJ0Odjv58nVj7b5L6bvWH
-OeSseVevdOg6ZeBeCr6WY/41i5u3u5hHykECAwEAAQJAUM4k4JOmMC4z6r/wYnTu
-9K9IuUbFE5kbkGqZXs721+FtQrgFk/qZqs9fTSKX17l+gG0G9I6VkdYtCMHM5iAj
-nQIhAPmJceliytoZXGNVPbY9gj9kfi5JYRRmUOQVSFkpkRr/AiEA+ZfcU5zfJMXn
-ADXpTnzJ+itvbxwT34S/2B8/KDF5Wr8CIDRrOgGj3ib4ot6+/kq1GxJEAvmoMnt9
-jsqK6frI75FzAiEAjhPODaKMu2gUOOB3cIBEkS3MfxkijugINMSEtSKEjA0CIQCY
-BFmcfpV0GQyLySiglPgCxqjhoKvgBB3NVz4BdxUFmw==
------END RSA PRIVATE KEY-----
diff --git a/tests/key-tests/suppressions.valgrind b/tests/key-tests/suppressions.valgrind
deleted file mode 100644
index 12b43e651d..0000000000
--- a/tests/key-tests/suppressions.valgrind
+++ /dev/null
@@ -1,24 +0,0 @@
-# suppressions -- Valgrind suppresion file for libgcrypt
-
-# Copyright (C) 2015 Red Hat, Inc.
-
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:idna_to_ascii_4z
-   fun:idna_to_ascii_8z
-   fun:gnutls_x509_crt_check_email
-   ...
-}
-{
-   ld-uncond-jump
-   Memcheck:Cond
-   fun:index
-   fun:expand_dynamic_string_token
-   fun:fillin_rpath
-   ...
-}
diff --git a/tests/suite/testcompat-common b/tests/suite/testcompat-common
index d689467644..9028b4a400 100644
--- a/tests/suite/testcompat-common
+++ b/tests/suite/testcompat-common
@@ -27,8 +27,8 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 # WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-DSA_CERT="${srcdir}/../key-tests/data/cert.dsa.1024.pem"
-DSA_KEY="${srcdir}/../key-tests/data/dsa.1024.pem"
+DSA_CERT="${srcdir}/../cert-tests/data/cert.dsa.1024.pem"
+DSA_KEY="${srcdir}/../cert-tests/data/dsa.1024.pem"
 
 RSA_CERT="${srcdir}/../certs/cert-rsa-2432.pem"
 RSA_KEY="${srcdir}/../certs/rsa-2432.pem"