TEST: Cleanup test recipes

Name mixups cleared, and a few more test case result files that
arent't removed, making forensics on failed tests easier.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14505)

70 files changed, 19 insertions, 15 deletions

diff --git a/test/recipes/02-test_internal_keymgmt.t b/test/recipes/02-test_internal_keymgmt.t
index f7b2eb3f1c..2f78ed5ae4 100644
--- a/test/recipes/02-test_internal_keymgmt.t
+++ b/test/recipes/02-test_internal_keymgmt.t
@@ -11,7 +11,7 @@ use OpenSSL::Test qw(:DEFAULT bldtop_dir);
 use OpenSSL::Test::Simple;
 use OpenSSL::Test::Utils;
 
-setup("test_internal_provider");
+setup("test_internal_keymgmt");
 
 $ENV{OPENSSL_MODULES} = bldtop_dir("test");
 
diff --git a/test/recipes/04-test_pem.t b/test/recipes/04-test_pem_reading.t
index b7b28ea7d3..b7b28ea7d3 100644
--- a/test/recipes/04-test_pem.t
+++ b/test/recipes/04-test_pem_reading.t
diff --git a/test/recipes/04-test_pem_data/NOTES.txt b/test/recipes/04-test_pem_reading_data/NOTES.txt
index baafd1560c..baafd1560c 100644
--- a/test/recipes/04-test_pem_data/NOTES.txt
+++ b/test/recipes/04-test_pem_reading_data/NOTES.txt
diff --git a/test/recipes/04-test_pem_data/beermug.pem b/test/recipes/04-test_pem_reading_data/beermug.pem
index 98b04b7325..98b04b7325 100644
--- a/test/recipes/04-test_pem_data/beermug.pem
+++ b/test/recipes/04-test_pem_reading_data/beermug.pem
diff --git a/test/recipes/04-test_pem_data/cert-1023line.pem b/test/recipes/04-test_pem_reading_data/cert-1023line.pem
index 7ad3103e30..7ad3103e30 100644
--- a/test/recipes/04-test_pem_data/cert-1023line.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-1023line.pem
diff --git a/test/recipes/04-test_pem_data/cert-1024line.pem b/test/recipes/04-test_pem_reading_data/cert-1024line.pem
index fd501c2dd1..fd501c2dd1 100644
--- a/test/recipes/04-test_pem_data/cert-1024line.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-1024line.pem
diff --git a/test/recipes/04-test_pem_data/cert-1025line.pem b/test/recipes/04-test_pem_reading_data/cert-1025line.pem
index 236922931e..236922931e 100644
--- a/test/recipes/04-test_pem_data/cert-1025line.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-1025line.pem
diff --git a/test/recipes/04-test_pem_data/cert-254-chars-at-the-end.pem b/test/recipes/04-test_pem_reading_data/cert-254-chars-at-the-end.pem
index 0b6a3ba3ba..0b6a3ba3ba 100644
--- a/test/recipes/04-test_pem_data/cert-254-chars-at-the-end.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-254-chars-at-the-end.pem
diff --git a/test/recipes/04-test_pem_data/cert-254-chars-in-the-middle.pem b/test/recipes/04-test_pem_reading_data/cert-254-chars-in-the-middle.pem
index cc9076b49f..cc9076b49f 100644
--- a/test/recipes/04-test_pem_data/cert-254-chars-in-the-middle.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-254-chars-in-the-middle.pem
diff --git a/test/recipes/04-test_pem_data/cert-255line.pem b/test/recipes/04-test_pem_reading_data/cert-255line.pem
index d7fd1f1313..d7fd1f1313 100644
--- a/test/recipes/04-test_pem_data/cert-255line.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-255line.pem
diff --git a/test/recipes/04-test_pem_data/cert-256line.pem b/test/recipes/04-test_pem_reading_data/cert-256line.pem
index 225bdb6f6f..225bdb6f6f 100644
--- a/test/recipes/04-test_pem_data/cert-256line.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-256line.pem
diff --git a/test/recipes/04-test_pem_data/cert-257line.pem b/test/recipes/04-test_pem_reading_data/cert-257line.pem
index 414b03684c..414b03684c 100644
--- a/test/recipes/04-test_pem_data/cert-257line.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-257line.pem
diff --git a/test/recipes/04-test_pem_data/cert-blankline.pem b/test/recipes/04-test_pem_reading_data/cert-blankline.pem
index 3f252886f6..3f252886f6 100644
--- a/test/recipes/04-test_pem_data/cert-blankline.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-blankline.pem
diff --git a/test/recipes/04-test_pem_data/cert-bom.pem b/test/recipes/04-test_pem_reading_data/cert-bom.pem
index 91fbaf4024..91fbaf4024 100644
--- a/test/recipes/04-test_pem_data/cert-bom.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-bom.pem
diff --git a/test/recipes/04-test_pem_data/cert-comment.pem b/test/recipes/04-test_pem_reading_data/cert-comment.pem
index a1a493e3b4..a1a493e3b4 100644
--- a/test/recipes/04-test_pem_data/cert-comment.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-comment.pem
diff --git a/test/recipes/04-test_pem_data/cert-earlypad.pem b/test/recipes/04-test_pem_reading_data/cert-earlypad.pem
index adb445ed23..adb445ed23 100644
--- a/test/recipes/04-test_pem_data/cert-earlypad.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-earlypad.pem
diff --git a/test/recipes/04-test_pem_data/cert-extrapad.pem b/test/recipes/04-test_pem_reading_data/cert-extrapad.pem
index 0b89aa2ebd..0b89aa2ebd 100644
--- a/test/recipes/04-test_pem_data/cert-extrapad.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-extrapad.pem
diff --git a/test/recipes/04-test_pem_data/cert-infixwhitespace.pem b/test/recipes/04-test_pem_reading_data/cert-infixwhitespace.pem
index f7e912ae16..f7e912ae16 100644
--- a/test/recipes/04-test_pem_data/cert-infixwhitespace.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-infixwhitespace.pem
diff --git a/test/recipes/04-test_pem_data/cert-junk.pem b/test/recipes/04-test_pem_reading_data/cert-junk.pem
index 5377e269c6..5377e269c6 100644
--- a/test/recipes/04-test_pem_data/cert-junk.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-junk.pem
diff --git a/test/recipes/04-test_pem_data/cert-leadingwhitespace.pem b/test/recipes/04-test_pem_reading_data/cert-leadingwhitespace.pem
index 6de4d48d4f..6de4d48d4f 100644
--- a/test/recipes/04-test_pem_data/cert-leadingwhitespace.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-leadingwhitespace.pem
diff --git a/test/recipes/04-test_pem_data/cert-longline.pem b/test/recipes/04-test_pem_reading_data/cert-longline.pem
index 7304481712..7304481712 100644
--- a/test/recipes/04-test_pem_data/cert-longline.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-longline.pem
diff --git a/test/recipes/04-test_pem_data/cert-misalignedpad.pem b/test/recipes/04-test_pem_reading_data/cert-misalignedpad.pem
index caca6e57d5..caca6e57d5 100644
--- a/test/recipes/04-test_pem_data/cert-misalignedpad.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-misalignedpad.pem
diff --git a/test/recipes/04-test_pem_data/cert-onecolumn.pem b/test/recipes/04-test_pem_reading_data/cert-onecolumn.pem
index 77eebbf603..77eebbf603 100644
--- a/test/recipes/04-test_pem_data/cert-onecolumn.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-onecolumn.pem
diff --git a/test/recipes/04-test_pem_data/cert-oneline-multiple-of-254.pem b/test/recipes/04-test_pem_reading_data/cert-oneline-multiple-of-254.pem
index e0af85959d..e0af85959d 100644
--- a/test/recipes/04-test_pem_data/cert-oneline-multiple-of-254.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-oneline-multiple-of-254.pem
diff --git a/test/recipes/04-test_pem_data/cert-oneline.pem b/test/recipes/04-test_pem_reading_data/cert-oneline.pem
index 70121fbbcb..70121fbbcb 100644
--- a/test/recipes/04-test_pem_data/cert-oneline.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-oneline.pem
diff --git a/test/recipes/04-test_pem_data/cert-shortandlongline.pem b/test/recipes/04-test_pem_reading_data/cert-shortandlongline.pem
index 1681e24096..1681e24096 100644
--- a/test/recipes/04-test_pem_data/cert-shortandlongline.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-shortandlongline.pem
diff --git a/test/recipes/04-test_pem_data/cert-shortline.pem b/test/recipes/04-test_pem_reading_data/cert-shortline.pem
index 3c5d2e5bd2..3c5d2e5bd2 100644
--- a/test/recipes/04-test_pem_data/cert-shortline.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-shortline.pem
diff --git a/test/recipes/04-test_pem_data/cert-threecolumn.pem b/test/recipes/04-test_pem_reading_data/cert-threecolumn.pem
index eb5503cd87..eb5503cd87 100644
--- a/test/recipes/04-test_pem_data/cert-threecolumn.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-threecolumn.pem
diff --git a/test/recipes/04-test_pem_data/cert-trailingwhitespace.pem b/test/recipes/04-test_pem_reading_data/cert-trailingwhitespace.pem
index ab0dfe85b7..ab0dfe85b7 100644
--- a/test/recipes/04-test_pem_data/cert-trailingwhitespace.pem
+++ b/test/recipes/04-test_pem_reading_data/cert-trailingwhitespace.pem
diff --git a/test/recipes/04-test_pem_data/cert.pem b/test/recipes/04-test_pem_reading_data/cert.pem
index 99ddf079a4..99ddf079a4 100644
--- a/test/recipes/04-test_pem_data/cert.pem
+++ b/test/recipes/04-test_pem_reading_data/cert.pem
diff --git a/test/recipes/04-test_pem_data/csr.pem b/test/recipes/04-test_pem_reading_data/csr.pem
index 02a966d3bd..02a966d3bd 100644
--- a/test/recipes/04-test_pem_data/csr.pem
+++ b/test/recipes/04-test_pem_reading_data/csr.pem
diff --git a/test/recipes/04-test_pem_data/dsa-1023line.pem b/test/recipes/04-test_pem_reading_data/dsa-1023line.pem
index 0e5c01a1fc..0e5c01a1fc 100644
--- a/test/recipes/04-test_pem_data/dsa-1023line.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-1023line.pem
diff --git a/test/recipes/04-test_pem_data/dsa-1024line.pem b/test/recipes/04-test_pem_reading_data/dsa-1024line.pem
index 185a029fb1..185a029fb1 100644
--- a/test/recipes/04-test_pem_data/dsa-1024line.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-1024line.pem
diff --git a/test/recipes/04-test_pem_data/dsa-1025line.pem b/test/recipes/04-test_pem_reading_data/dsa-1025line.pem
index fa449c9c35..fa449c9c35 100644
--- a/test/recipes/04-test_pem_data/dsa-1025line.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-1025line.pem
diff --git a/test/recipes/04-test_pem_data/dsa-255line.pem b/test/recipes/04-test_pem_reading_data/dsa-255line.pem
index 36a5b12375..36a5b12375 100644
--- a/test/recipes/04-test_pem_data/dsa-255line.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-255line.pem
diff --git a/test/recipes/04-test_pem_data/dsa-256line.pem b/test/recipes/04-test_pem_reading_data/dsa-256line.pem
index 6ba6c397ba..6ba6c397ba 100644
--- a/test/recipes/04-test_pem_data/dsa-256line.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-256line.pem
diff --git a/test/recipes/04-test_pem_data/dsa-257line.pem b/test/recipes/04-test_pem_reading_data/dsa-257line.pem
index a73d70054d..a73d70054d 100644
--- a/test/recipes/04-test_pem_data/dsa-257line.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-257line.pem
diff --git a/test/recipes/04-test_pem_data/dsa-blankline.pem b/test/recipes/04-test_pem_reading_data/dsa-blankline.pem
index 6f46e27df1..6f46e27df1 100644
--- a/test/recipes/04-test_pem_data/dsa-blankline.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-blankline.pem
diff --git a/test/recipes/04-test_pem_data/dsa-comment.pem b/test/recipes/04-test_pem_reading_data/dsa-comment.pem
index bb96ec4687..bb96ec4687 100644
--- a/test/recipes/04-test_pem_data/dsa-comment.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-comment.pem
diff --git a/test/recipes/04-test_pem_data/dsa-corruptedheader.pem b/test/recipes/04-test_pem_reading_data/dsa-corruptedheader.pem
index 7ed4261e86..7ed4261e86 100644
--- a/test/recipes/04-test_pem_data/dsa-corruptedheader.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-corruptedheader.pem
diff --git a/test/recipes/04-test_pem_data/dsa-corruptiv.pem b/test/recipes/04-test_pem_reading_data/dsa-corruptiv.pem
index 233e201d74..233e201d74 100644
--- a/test/recipes/04-test_pem_data/dsa-corruptiv.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-corruptiv.pem
diff --git a/test/recipes/04-test_pem_data/dsa-earlypad.pem b/test/recipes/04-test_pem_reading_data/dsa-earlypad.pem
index 9f14e3b92f..9f14e3b92f 100644
--- a/test/recipes/04-test_pem_data/dsa-earlypad.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-earlypad.pem
diff --git a/test/recipes/04-test_pem_data/dsa-extrapad.pem b/test/recipes/04-test_pem_reading_data/dsa-extrapad.pem
index 182397374e..182397374e 100644
--- a/test/recipes/04-test_pem_data/dsa-extrapad.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-extrapad.pem
diff --git a/test/recipes/04-test_pem_data/dsa-infixwhitespace.pem b/test/recipes/04-test_pem_reading_data/dsa-infixwhitespace.pem
index 5755265d79..5755265d79 100644
--- a/test/recipes/04-test_pem_data/dsa-infixwhitespace.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-infixwhitespace.pem
diff --git a/test/recipes/04-test_pem_data/dsa-junk.pem b/test/recipes/04-test_pem_reading_data/dsa-junk.pem
index 0836c45c1a..0836c45c1a 100644
--- a/test/recipes/04-test_pem_data/dsa-junk.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-junk.pem
diff --git a/test/recipes/04-test_pem_data/dsa-leadingwhitespace.pem b/test/recipes/04-test_pem_reading_data/dsa-leadingwhitespace.pem
index 8bbf26170b..8bbf26170b 100644
--- a/test/recipes/04-test_pem_data/dsa-leadingwhitespace.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-leadingwhitespace.pem
diff --git a/test/recipes/04-test_pem_data/dsa-longline.pem b/test/recipes/04-test_pem_reading_data/dsa-longline.pem
index 75973ef290..75973ef290 100644
--- a/test/recipes/04-test_pem_data/dsa-longline.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-longline.pem
diff --git a/test/recipes/04-test_pem_data/dsa-misalignedpad.pem b/test/recipes/04-test_pem_reading_data/dsa-misalignedpad.pem
index ad8c366d68..ad8c366d68 100644
--- a/test/recipes/04-test_pem_data/dsa-misalignedpad.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-misalignedpad.pem
diff --git a/test/recipes/04-test_pem_data/dsa-onecolumn.pem b/test/recipes/04-test_pem_reading_data/dsa-onecolumn.pem
index 61b8ed52c1..61b8ed52c1 100644
--- a/test/recipes/04-test_pem_data/dsa-onecolumn.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-onecolumn.pem
diff --git a/test/recipes/04-test_pem_data/dsa-oneline.pem b/test/recipes/04-test_pem_reading_data/dsa-oneline.pem
index 176f1e8035..176f1e8035 100644
--- a/test/recipes/04-test_pem_data/dsa-oneline.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-oneline.pem
diff --git a/test/recipes/04-test_pem_data/dsa-onelineheader.pem b/test/recipes/04-test_pem_reading_data/dsa-onelineheader.pem
index d07095b8e7..d07095b8e7 100644
--- a/test/recipes/04-test_pem_data/dsa-onelineheader.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-onelineheader.pem
diff --git a/test/recipes/04-test_pem_data/dsa-shortandlongline.pem b/test/recipes/04-test_pem_reading_data/dsa-shortandlongline.pem
index b9a8333d84..b9a8333d84 100644
--- a/test/recipes/04-test_pem_data/dsa-shortandlongline.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-shortandlongline.pem
diff --git a/test/recipes/04-test_pem_data/dsa-shortline.pem b/test/recipes/04-test_pem_reading_data/dsa-shortline.pem
index 6da1ab7c61..6da1ab7c61 100644
--- a/test/recipes/04-test_pem_data/dsa-shortline.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-shortline.pem
diff --git a/test/recipes/04-test_pem_data/dsa-threecolumn.pem b/test/recipes/04-test_pem_reading_data/dsa-threecolumn.pem
index e6fcc535cf..e6fcc535cf 100644
--- a/test/recipes/04-test_pem_data/dsa-threecolumn.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-threecolumn.pem
diff --git a/test/recipes/04-test_pem_data/dsa-trailingwhitespace.pem b/test/recipes/04-test_pem_reading_data/dsa-trailingwhitespace.pem
index 0b5de58c4c..0b5de58c4c 100644
--- a/test/recipes/04-test_pem_data/dsa-trailingwhitespace.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa-trailingwhitespace.pem
diff --git a/test/recipes/04-test_pem_data/dsa.pem b/test/recipes/04-test_pem_reading_data/dsa.pem
index 78ebd1b702..78ebd1b702 100644
--- a/test/recipes/04-test_pem_data/dsa.pem
+++ b/test/recipes/04-test_pem_reading_data/dsa.pem
diff --git a/test/recipes/04-test_pem_data/dsaparam.pem b/test/recipes/04-test_pem_reading_data/dsaparam.pem
index 60563cbb03..60563cbb03 100644
--- a/test/recipes/04-test_pem_data/dsaparam.pem
+++ b/test/recipes/04-test_pem_reading_data/dsaparam.pem
diff --git a/test/recipes/04-test_pem_data/key.pem b/test/recipes/04-test_pem_reading_data/key.pem
index 8de7e65a6d..8de7e65a6d 100644
--- a/test/recipes/04-test_pem_data/key.pem
+++ b/test/recipes/04-test_pem_reading_data/key.pem
diff --git a/test/recipes/04-test_pem_data/wellknown b/test/recipes/04-test_pem_reading_data/wellknown
index 632e28f36d..632e28f36d 100644
--- a/test/recipes/04-test_pem_data/wellknown
+++ b/test/recipes/04-test_pem_reading_data/wellknown
diff --git a/test/recipes/06-test-rdrand.t b/test/recipes/06-test_rdrand_sanity.t
index 4425a87df2..4425a87df2 100644
--- a/test/recipes/06-test-rdrand.t
+++ b/test/recipes/06-test_rdrand_sanity.t
diff --git a/test/recipes/20-test_mac.t b/test/recipes/20-test_mac.t
index b6a8078763..ee5f77d361 100644
--- a/test/recipes/20-test_mac.t
+++ b/test/recipes/20-test_mac.t
@@ -190,10 +190,9 @@ sub comparefile {
     my $buffer;
     my $BUFSIZE = 1024;
     read($out, $buffer, $BUFSIZE) or die "unable to read";
-    # Not unlinking $outfile
-
     my $line = uc unpack("H*", $buffer);
     close($out);
+    # Not unlinking $outfile
 
     if ($line eq $expect) {
         return 1;
diff --git a/test/recipes/25-test_eai_data.t b/test/recipes/25-test_eai_data.t
index 9b42229e94..a314538e85 100644
--- a/test/recipes/25-test_eai_data.t
+++ b/test/recipes/25-test_eai_data.t
@@ -32,16 +32,21 @@ my $utf8_pem  = srctop_file($folder, "utf8_leaf.pem");
 my $ascii_chain_pem = srctop_file($folder, "ascii_chain.pem");
 my $utf8_chain_pem  = srctop_file($folder, "utf8_chain.pem");
 
-my $out = "san.tmp";
-
+my $out;
+my $outcnt = 0;
+sub outname {
+    $outcnt++;
+    return "sanout-$outcnt.tmp";
+}
+
+$out = outname();
 ok(run(app(["openssl", "x509", "-ext", "subjectAltName", "-in", $ascii_pem, "-noout", "-out", $out])));
 is(cmp_text($out, srctop_file($folder, "san.ascii")), 0, 'Comparing othername for ASCII domain');
 
+$out = outname();
 ok(run(app(["openssl", "x509", "-ext", "subjectAltName", "-in", $utf8_pem, "-noout", "-out", $out])));
 is(cmp_text($out, srctop_file($folder, "san.utf8")), 0, 'Comparing othername for IDN domain');
 
-unlink $out;
-
 ok(run(app(["openssl", "verify", "-nameopt", "utf8", "-no_check_time", "-verify_email", "学生\@elementary.school.example.com", "-CAfile", $ascii_chain_pem, $ascii_pem])));
 ok(run(app(["openssl", "verify", "-nameopt", "utf8", "-no_check_time", "-verify_email", "医生\@大学.example.com", "-CAfile", $utf8_chain_pem, $utf8_pem])));
 
diff --git a/test/recipes/65-test_cmp_hdr.t b/test/recipes/65-test_cmp_hdr.t
index e013a6d820..9acb784d7e 100644
--- a/test/recipes/65-test_cmp_hdr.t
+++ b/test/recipes/65-test_cmp_hdr.t
@@ -12,7 +12,7 @@ use strict;
 use OpenSSL::Test qw/:DEFAULT data_file/;
 use OpenSSL::Test::Utils;
 
-setup("test_cmp_lib");
+setup("test_cmp_hdr");
 
 plan skip_all => "This test is not supported in a no-cmp build"
     if disabled("cmp");
diff --git a/test/recipes/65-test_cmp_status.t b/test/recipes/65-test_cmp_status.t
index 6a0a0c06b6..23f833f695 100644
--- a/test/recipes/65-test_cmp_status.t
+++ b/test/recipes/65-test_cmp_status.t
@@ -12,7 +12,7 @@ use strict;
 use OpenSSL::Test qw/:DEFAULT data_file/;
 use OpenSSL::Test::Utils;
 
-setup("test_cmp_lib");
+setup("test_cmp_status");
 
 plan skip_all => "This test is not supported in a no-cmp build"
     if disabled("cmp");
diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t
index 775cf6df67..b254597c31 100644
--- a/test/recipes/70-test_sslvertol.t
+++ b/test/recipes/70-test_sslvertol.t
@@ -11,7 +11,7 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/;
 use OpenSSL::Test::Utils;
 use TLSProxy::Proxy;
 
-my $test_name = "test_sslextension";
+my $test_name = "test_sslvertol";
 setup($test_name);
 
 plan skip_all => "TLSProxy isn't usable on $^O"
diff --git a/test/recipes/71-test_ssl_ctx.t b/test/recipes/71-test_ssl_ctx.t
index 6d5fc7a338..a9af0ac078 100644
--- a/test/recipes/71-test_ssl_ctx.t
+++ b/test/recipes/71-test_ssl_ctx.t
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 use OpenSSL::Test;
 
-setup("ssl_ctx_test");
+setup("test_ssl_ctx");
 
 plan tests => 1;
 ok(run(test(["ssl_ctx_test"])));
diff --git a/test/recipes/90-test_tls13encryption.t b/test/recipes/90-test_tls13encryption.t
index 7e4037e508..06b33229d4 100644
--- a/test/recipes/90-test_tls13encryption.t
+++ b/test/recipes/90-test_tls13encryption.t
@@ -9,7 +9,7 @@
 use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 
-my $test_name = "tls13encryption";
+my $test_name = "test_tls13encryption";
 setup($test_name);
 
 plan skip_all => "$test_name is not supported in this build"
diff --git a/test/recipes/90-test_tls13secrets.t b/test/recipes/90-test_tls13secrets.t
index 0adef9a9f5..72bb60fdb1 100644
--- a/test/recipes/90-test_tls13secrets.t
+++ b/test/recipes/90-test_tls13secrets.t
@@ -9,7 +9,7 @@
 use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 
-my $test_name = "tls13secrets";
+my $test_name = "test_tls13secrets";
 setup($test_name);
 
 plan skip_all => "$test_name is not supported in this build"
diff --git a/test/recipes/95-test_external_gost_engine.t b/test/recipes/95-test_external_gost_engine.t
index 204f78a928..07097d3ef9 100644
--- a/test/recipes/95-test_external_gost_engine.t
+++ b/test/recipes/95-test_external_gost_engine.t
@@ -11,7 +11,7 @@ use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 use OpenSSL::Test qw/:DEFAULT bldtop_file data_file srctop_file cmdstr/;
 
-setup("test_external");
+setup("test_external_gost_engine");
 
 plan skip_all => "No external tests in this configuration"
     if disabled("external-tests");
diff --git a/test/recipes/95-test_external_pyca.t b/test/recipes/95-test_external_pyca.t
index 1eae23557f..5460d4987e 100644
--- a/test/recipes/95-test_external_pyca.t
+++ b/test/recipes/95-test_external_pyca.t
@@ -11,7 +11,7 @@ use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 use OpenSSL::Test qw/:DEFAULT bldtop_file data_file srctop_file cmdstr/;
 
-setup("test_external");
+setup("test_external_pyca");
 
 plan skip_all => "No external tests in this configuration"
     if disabled("external-tests");