diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index ed3d7eaac4d88a59d64c618f7c242621ca9253ad..1c04cb7b6177c96355b458f664293fc8d9132e10 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -295,7 +295,7 @@ int main(int argc, char *argv[])
     }
 
     if (!num_failed) {
-        fprintf(stdout, "ok (ran %d tests)\n", num_all);
+        fprintf(stdout, "success (ran %d tests)\n", num_all);
         return EXIT_SUCCESS;
     } else {
         fprintf(stdout, "%d of %d tests failed!\n", num_failed, num_all);
diff --git a/test/recipes/90-test_constant_time.t b/test/recipes/90-test_constant_time.t
new file mode 100644
index 0000000000000000000000000000000000000000..4bdd0a08d0e28058a690973d3652d3de47bf2599
--- /dev/null
+++ b/test/recipes/90-test_constant_time.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_constant_time");
+
+plan tests => 1;
+ok(run(test(["constant_time_test"])), "running constant_time_test");
diff --git a/test/recipes/90-test_gost2814789.t b/test/recipes/90-test_gost2814789.t
new file mode 100644
index 0000000000000000000000000000000000000000..b09e062cc7b62d1415b75a9771cba9bbabeddd80
--- /dev/null
+++ b/test/recipes/90-test_gost2814789.t
@@ -0,0 +1,14 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+use Test::More;
+use OpenSSL::Test qw/:DEFAULT top_dir/;
+
+setup("test_gost2814789");
+
+$ENV{OPENSSL_ENGINES} =
+    $ENV{BIN_D} ? top_dir($ENV{BIN_D}) : top_dir("engines", "ccgost");
+
+plan tests => 1;
+ok(run(test(["gost2814789test"])), 'running gost2814789test');
diff --git a/test/recipes/90-test_heartbeat.t b/test/recipes/90-test_heartbeat.t
new file mode 100644
index 0000000000000000000000000000000000000000..5e226703a3841d0073a2cb3967fa8db0cd8868c1
--- /dev/null
+++ b/test/recipes/90-test_heartbeat.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_heartbeat");
+
+plan tests => 1;
+ok(run(test(["heartbeat_test"])), "running heartbeat_test");
diff --git a/test/recipes/90-test_ige.t b/test/recipes/90-test_ige.t
new file mode 100644
index 0000000000000000000000000000000000000000..6c991472c998c0713d95eae3900d152b98d7a34b
--- /dev/null
+++ b/test/recipes/90-test_ige.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_ige");
+
+plan tests => 1;
+ok(run(test(["igetest"])), "running igetest");
diff --git a/test/recipes/90-test_jpake.t b/test/recipes/90-test_jpake.t
new file mode 100644
index 0000000000000000000000000000000000000000..5b83df77077e446c40c1fe1b988a29797cfe863b
--- /dev/null
+++ b/test/recipes/90-test_jpake.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_jpake");
+
+plan tests => 1;
+ok(run(test(["jpaketest"])), "running jpaketest");
diff --git a/test/recipes/90-test_p5_crpt2.t b/test/recipes/90-test_p5_crpt2.t
new file mode 100644
index 0000000000000000000000000000000000000000..e03c5b67bee16f3e916e1180194886b8461d816b
--- /dev/null
+++ b/test/recipes/90-test_p5_crpt2.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_p5_crpt2");
+
+plan tests => 1;
+ok(run(test(["p5_crpt2_test"])), "running p5_crpt2_test");
diff --git a/test/recipes/90-test_srp.t b/test/recipes/90-test_srp.t
new file mode 100644
index 0000000000000000000000000000000000000000..962402043c7c0723c7905b772c9a16700874b5cc
--- /dev/null
+++ b/test/recipes/90-test_srp.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_srp");
+
+plan tests => 1;
+ok(run(test(["srptest"])), "running srptest");
diff --git a/test/recipes/90-test_v3name.t b/test/recipes/90-test_v3name.t
new file mode 100644
index 0000000000000000000000000000000000000000..17ac8b33841c244c8a4ea04984cfdb5db7e6ded7
--- /dev/null
+++ b/test/recipes/90-test_v3name.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_v3name");
+
+plan tests => 1;
+ok(run(test(["v3nametest"])), "running v3nametest");