Adapt all test programs

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3243)

70 files changed, 151 insertions, 244 deletions

diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c
index a24b284866..7d762ae3c2 100644
--- a/test/asn1_encode_test.c
+++ b/test/asn1_encode_test.c
@@ -13,7 +13,6 @@
 #include <openssl/rand.h>
 #include <openssl/asn1t.h>
 #include "internal/numbers.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #ifdef __GNUC__
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index f936098cd9..f9fdeefed9 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -15,7 +15,6 @@
 #include <openssl/asn1.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-#include "test_main.h"
 #include "testutil.h"
 #include "e_os.h"
 
diff --git a/test/asynciotest.c b/test/asynciotest.c
index f78b86f2a7..ee450dafd3 100644
--- a/test/asynciotest.c
+++ b/test/asynciotest.c
@@ -17,7 +17,6 @@
 
 #include "ssltestlib.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 /* Should we fragment records or not? 0 = no, !0 = yes*/
 static int fragment = 0;
diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c
index 0bfbebf7e1..9745ff8720 100644
--- a/test/bad_dtls_test.c
+++ b/test/bad_dtls_test.c
@@ -41,7 +41,6 @@
 #include "../ssl/packet_locl.h"
 #include "../e_os.h" /* for OSSL_NELEM() */
 
-#include "test_main.h"
 #include "testutil.h"
 
 /* For DTLS1_BAD_VER packets the MAC doesn't include the handshake header */
diff --git a/test/bftest.c b/test/bftest.c
index eea9fcb7b9..a7e0bf1cd1 100644
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
 
-#include "test_main_custom.h"
 #include "testutil.h"
 
 #include "../e_os.h"
diff --git a/test/bio_enc_test.c b/test/bio_enc_test.c
index 9b0dd6def1..bc49a7992a 100644
--- a/test/bio_enc_test.c
+++ b/test/bio_enc_test.c
@@ -12,7 +12,6 @@
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 #define ENCRYPT  1
diff --git a/test/bioprinttest.c b/test/bioprinttest.c
index ca0f1aadf6..418d6e4c8d 100644
--- a/test/bioprinttest.c
+++ b/test/bioprinttest.c
@@ -12,8 +12,6 @@
 #include <openssl/bio.h>
 #include "internal/numbers.h"
 #include "testutil.h"
-#include "test_main.h"
-#include "test_main_custom.h"
 
 #define nelem(x) (int)(sizeof(x) / sizeof((x)[0]))
 
diff --git a/test/bntest.c b/test/bntest.c
index 449b3a4fd2..0410e07d08 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -19,7 +19,6 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include "testutil.h"
-#include "test_main_custom.h"
 
 /*
  * In bn_lcl.h, bn_expand() is defined as a static ossl_inline function.
diff --git a/test/build.info b/test/build.info
index d17a4b087b..83a83c4497 100644
--- a/test/build.info
+++ b/test/build.info
@@ -47,270 +47,270 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
   INCLUDE[aborttest]=../include
   DEPEND[aborttest]=../libcrypto
 
-  SOURCE[sanitytest]=sanitytest.c testutil.c test_main.c
+  SOURCE[sanitytest]=sanitytest.c
   INCLUDE[sanitytest]=../include
-  DEPEND[sanitytest]=../libcrypto
+  DEPEND[sanitytest]=../libcrypto libtestutil.a
 
-  SOURCE[test_test]=test_test.c testutil.c test_main.c
+  SOURCE[test_test]=test_test.c
   INCLUDE[test_test]=.. ../include
-  DEPEND[test_test]=../libcrypto
+  DEPEND[test_test]=../libcrypto libtestutil.a
 
-  SOURCE[exdatatest]=exdatatest.c testutil.c test_main.c
+  SOURCE[exdatatest]=exdatatest.c
   INCLUDE[exdatatest]=../include
-  DEPEND[exdatatest]=../libcrypto
+  DEPEND[exdatatest]=../libcrypto libtestutil.a
 
-  SOURCE[bntest]=bntest.c testutil.c test_main_custom.c
+  SOURCE[bntest]=bntest.c
   INCLUDE[bntest]=.. ../crypto/include ../include
-  DEPEND[bntest]=../libcrypto
+  DEPEND[bntest]=../libcrypto libtestutil.a
 
   SOURCE[ectest]=ectest.c
   INCLUDE[ectest]=.. ../include
   DEPEND[ectest]=../libcrypto
 
-  SOURCE[ecdsatest]=ecdsatest.c testutil.c test_main.c
+  SOURCE[ecdsatest]=ecdsatest.c
   INCLUDE[ecdsatest]=../include
-  DEPEND[ecdsatest]=../libcrypto
+  DEPEND[ecdsatest]=../libcrypto libtestutil.a
 
-  SOURCE[gmdifftest]=gmdifftest.c testutil.c test_main.c
+  SOURCE[gmdifftest]=gmdifftest.c
   INCLUDE[gmdifftest]=../include
-  DEPEND[gmdifftest]=../libcrypto
+  DEPEND[gmdifftest]=../libcrypto libtestutil.a
 
-  SOURCE[pbelutest]=pbelutest.c testutil.c test_main.c
+  SOURCE[pbelutest]=pbelutest.c
   INCLUDE[pbelutest]=../include
-  DEPEND[pbelutest]=../libcrypto
+  DEPEND[pbelutest]=../libcrypto libtestutil.a
 
-  SOURCE[ideatest]=ideatest.c testutil.c test_main.c
+  SOURCE[ideatest]=ideatest.c
   INCLUDE[ideatest]=../include
-  DEPEND[ideatest]=../libcrypto
+  DEPEND[ideatest]=../libcrypto libtestutil.a
 
-  SOURCE[md2test]=md2test.c testutil.c test_main.c
+  SOURCE[md2test]=md2test.c
   INCLUDE[md2test]=../include
-  DEPEND[md2test]=../libcrypto
+  DEPEND[md2test]=../libcrypto libtestutil.a
 
-  SOURCE[hmactest]=hmactest.c testutil.c test_main.c
+  SOURCE[hmactest]=hmactest.c
   INCLUDE[hmactest]=../include
-  DEPEND[hmactest]=../libcrypto
+  DEPEND[hmactest]=../libcrypto libtestutil.a
 
-  SOURCE[rc2test]=rc2test.c testutil.c test_main.c
+  SOURCE[rc2test]=rc2test.c
   INCLUDE[rc2test]=../include
-  DEPEND[rc2test]=../libcrypto
+  DEPEND[rc2test]=../libcrypto libtestutil.a
 
-  SOURCE[rc4test]=rc4test.c testutil.c test_main.c
+  SOURCE[rc4test]=rc4test.c
   INCLUDE[rc4test]=../include
-  DEPEND[rc4test]=../libcrypto
+  DEPEND[rc4test]=../libcrypto libtestutil.a
 
-  SOURCE[rc5test]=rc5test.c testutil.c test_main.c
+  SOURCE[rc5test]=rc5test.c
   INCLUDE[rc5test]=../include
-  DEPEND[rc5test]=../libcrypto
+  DEPEND[rc5test]=../libcrypto libtestutil.a
 
-  SOURCE[destest]=destest.c testutil.c test_main.c
+  SOURCE[destest]=destest.c
   INCLUDE[destest]=../include
-  DEPEND[destest]=../libcrypto
+  DEPEND[destest]=../libcrypto libtestutil.a
 
-  SOURCE[sha1test]=sha1test.c testutil.c test_main.c
+  SOURCE[sha1test]=sha1test.c
   INCLUDE[sha1test]=../include
-  DEPEND[sha1test]=../libcrypto
+  DEPEND[sha1test]=../libcrypto libtestutil.a
 
-  SOURCE[sha256t]=sha256t.c testutil.c test_main.c
+  SOURCE[sha256t]=sha256t.c
   INCLUDE[sha256t]=../include
-  DEPEND[sha256t]=../libcrypto
+  DEPEND[sha256t]=../libcrypto libtestutil.a
 
-  SOURCE[sha512t]=sha512t.c testutil.c test_main.c
+  SOURCE[sha512t]=sha512t.c
   INCLUDE[sha512t]=../include
-  DEPEND[sha512t]=../libcrypto
+  DEPEND[sha512t]=../libcrypto libtestutil.a
 
-  SOURCE[mdc2test]=mdc2test.c testutil.c test_main.c
+  SOURCE[mdc2test]=mdc2test.c
   INCLUDE[mdc2test]=../include
-  DEPEND[mdc2test]=../libcrypto
+  DEPEND[mdc2test]=../libcrypto libtestutil.a
 
-  SOURCE[randtest]=randtest.c testutil.c test_main.c
+  SOURCE[randtest]=randtest.c
   INCLUDE[randtest]=../include
-  DEPEND[randtest]=../libcrypto
+  DEPEND[randtest]=../libcrypto libtestutil.a
 
-  SOURCE[dhtest]=dhtest.c testutil.c test_main.c
+  SOURCE[dhtest]=dhtest.c
   INCLUDE[dhtest]=.. ../include
-  DEPEND[dhtest]=../libcrypto
+  DEPEND[dhtest]=../libcrypto libtestutil.a
 
-  SOURCE[enginetest]=enginetest.c testutil.c test_main.c
+  SOURCE[enginetest]=enginetest.c
   INCLUDE[enginetest]=../include
-  DEPEND[enginetest]=../libcrypto
+  DEPEND[enginetest]=../libcrypto libtestutil.a
 
-  SOURCE[casttest]=casttest.c testutil.c test_main.c
+  SOURCE[casttest]=casttest.c
   INCLUDE[casttest]=.. ../include
-  DEPEND[casttest]=../libcrypto
+  DEPEND[casttest]=../libcrypto libtestutil.a
 
-  SOURCE[bftest]=bftest.c testutil.c test_main_custom.c
+  SOURCE[bftest]=bftest.c
   INCLUDE[bftest]=../include
-  DEPEND[bftest]=../libcrypto
+  DEPEND[bftest]=../libcrypto libtestutil.a
 
   SOURCE[ssltest_old]=ssltest_old.c
   INCLUDE[ssltest_old]=.. ../include
   DEPEND[ssltest_old]=../libcrypto ../libssl
 
-  SOURCE[dsatest]=dsatest.c testutil.c test_main.c
+  SOURCE[dsatest]=dsatest.c
   INCLUDE[dsatest]=.. ../include
-  DEPEND[dsatest]=../libcrypto
+  DEPEND[dsatest]=../libcrypto libtestutil.a
 
   SOURCE[exptest]=exptest.c
   INCLUDE[exptest]=../include
   DEPEND[exptest]=../libcrypto
 
-  SOURCE[rsa_test]=rsa_test.c testutil.c test_main.c
+  SOURCE[rsa_test]=rsa_test.c
   INCLUDE[rsa_test]=.. ../include
-  DEPEND[rsa_test]=../libcrypto
+  DEPEND[rsa_test]=../libcrypto libtestutil.a
 
   SOURCE[evp_test]=evp_test.c
   INCLUDE[evp_test]=../include
   DEPEND[evp_test]=../libcrypto
 
-  SOURCE[evp_extra_test]=evp_extra_test.c testutil.c test_main.c
+  SOURCE[evp_extra_test]=evp_extra_test.c
   INCLUDE[evp_extra_test]=../include
-  DEPEND[evp_extra_test]=../libcrypto
+  DEPEND[evp_extra_test]=../libcrypto libtestutil.a
 
   SOURCE[igetest]=igetest.c
   INCLUDE[igetest]=.. ../include
   DEPEND[igetest]=../libcrypto
 
-  SOURCE[v3nametest]=v3nametest.c testutil.c test_main.c
+  SOURCE[v3nametest]=v3nametest.c
   INCLUDE[v3nametest]=.. ../include
-  DEPEND[v3nametest]=../libcrypto
+  DEPEND[v3nametest]=../libcrypto libtestutil.a
 
-  SOURCE[crltest]=crltest.c testutil.c test_main.c
+  SOURCE[crltest]=crltest.c
   INCLUDE[crltest]=../include
-  DEPEND[crltest]=../libcrypto
+  DEPEND[crltest]=../libcrypto libtestutil.a
 
-  SOURCE[v3ext]=v3ext.c testutil.c test_main_custom.c
+  SOURCE[v3ext]=v3ext.c
   INCLUDE[v3ext]=../include
-  DEPEND[v3ext]=../libcrypto
+  DEPEND[v3ext]=../libcrypto libtestutil.a
 
   SOURCE[danetest]=danetest.c
   INCLUDE[danetest]=../include
   DEPEND[danetest]=../libcrypto ../libssl
 
-  SOURCE[constant_time_test]=constant_time_test.c testutil.c test_main.c
+  SOURCE[constant_time_test]=constant_time_test.c
   INCLUDE[constant_time_test]=.. ../include
-  DEPEND[constant_time_test]=../libcrypto
+  DEPEND[constant_time_test]=../libcrypto libtestutil.a
 
-  SOURCE[verify_extra_test]=verify_extra_test.c testutil.c test_main_custom.c
+  SOURCE[verify_extra_test]=verify_extra_test.c
   INCLUDE[verify_extra_test]=../include
-  DEPEND[verify_extra_test]=../libcrypto
+  DEPEND[verify_extra_test]=../libcrypto libtestutil.a
 
-  SOURCE[clienthellotest]=clienthellotest.c testutil.c test_main_custom.c
+  SOURCE[clienthellotest]=clienthellotest.c
   INCLUDE[clienthellotest]=../include
-  DEPEND[clienthellotest]=../libcrypto ../libssl
+  DEPEND[clienthellotest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[bad_dtls_test]=bad_dtls_test.c testutil.c test_main.c
+  SOURCE[bad_dtls_test]=bad_dtls_test.c
   INCLUDE[bad_dtls_test]=../include
-  DEPEND[bad_dtls_test]=../libcrypto ../libssl
+  DEPEND[bad_dtls_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[packettest]=packettest.c testutil.c test_main.c
+  SOURCE[packettest]=packettest.c
   INCLUDE[packettest]=../include
-  DEPEND[packettest]=../libcrypto
+  DEPEND[packettest]=../libcrypto libtestutil.a
 
   SOURCE[asynctest]=asynctest.c
   INCLUDE[asynctest]=.. ../include
   DEPEND[asynctest]=../libcrypto
 
-  SOURCE[secmemtest]=secmemtest.c testutil.c test_main.c
+  SOURCE[secmemtest]=secmemtest.c
   INCLUDE[secmemtest]=../include
-  DEPEND[secmemtest]=../libcrypto
+  DEPEND[secmemtest]=../libcrypto libtestutil.a
 
-  SOURCE[srptest]=srptest.c testutil.c test_main.c
+  SOURCE[srptest]=srptest.c
   INCLUDE[srptest]=../include
-  DEPEND[srptest]=../libcrypto
+  DEPEND[srptest]=../libcrypto libtestutil.a
 
-  SOURCE[memleaktest]=memleaktest.c testutil.c
+  SOURCE[memleaktest]=memleaktest.c
   INCLUDE[memleaktest]=../include
-  DEPEND[memleaktest]=../libcrypto
+  DEPEND[memleaktest]=../libcrypto libtestutil.a
 
-  SOURCE[stack_test]=stack_test.c testutil.c test_main.c
+  SOURCE[stack_test]=stack_test.c
   INCLUDE[stack_test]=.. ../include
-  DEPEND[stack_test]=../libcrypto
+  DEPEND[stack_test]=../libcrypto libtestutil.a
 
-  SOURCE[lhash_test]=lhash_test.c testutil.c test_main.c
+  SOURCE[lhash_test]=lhash_test.c
   INCLUDE[lhash_test]=.. ../include
-  DEPEND[lhash_test]=../libcrypto
+  DEPEND[lhash_test]=../libcrypto libtestutil.a
 
   SOURCE[dtlsv1listentest]=dtlsv1listentest.c
   INCLUDE[dtlsv1listentest]=.. ../include
   DEPEND[dtlsv1listentest]=../libssl
 
-  SOURCE[ct_test]=ct_test.c testutil.c test_main_custom.c
+  SOURCE[ct_test]=ct_test.c
   INCLUDE[ct_test]=../crypto/include ../include
-  DEPEND[ct_test]=../libcrypto
+  DEPEND[ct_test]=../libcrypto libtestutil.a
 
-  SOURCE[threadstest]=threadstest.c testutil.c test_main.c
+  SOURCE[threadstest]=threadstest.c
   INCLUDE[threadstest]=.. ../include
-  DEPEND[threadstest]=../libcrypto
+  DEPEND[threadstest]=../libcrypto libtestutil.a
 
-  SOURCE[afalgtest]=afalgtest.c testutil.c
+  SOURCE[afalgtest]=afalgtest.c
   INCLUDE[afalgtest]=.. ../include
-  DEPEND[afalgtest]=../libcrypto
+  DEPEND[afalgtest]=../libcrypto libtestutil.a
 
-  SOURCE[d2i_test]=d2i_test.c testutil.c test_main_custom.c
+  SOURCE[d2i_test]=d2i_test.c
   INCLUDE[d2i_test]=.. ../include
-  DEPEND[d2i_test]=../libcrypto
+  DEPEND[d2i_test]=../libcrypto libtestutil.a
 
-  SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c testutil.c test_main_custom.c
+  SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c
   INCLUDE[ssl_test_ctx_test]=.. ../include
-  DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl
+  DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c testutil.c handshake_helper.c test_main_custom.c
+  SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c handshake_helper.c
   INCLUDE[ssl_test]=.. ../include
-  DEPEND[ssl_test]=../libcrypto ../libssl
+  DEPEND[ssl_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[cipherlist_test]=cipherlist_test.c testutil.c test_main.c
+  SOURCE[cipherlist_test]=cipherlist_test.c
   INCLUDE[cipherlist_test]=.. ../include
-  DEPEND[cipherlist_test]=../libcrypto ../libssl
+  DEPEND[cipherlist_test]=../libcrypto ../libssl libtestutil.a
 
   INCLUDE[testutil.o]=..
   INCLUDE[ssl_test_ctx.o]=../include
   INCLUDE[handshake_helper.o]=../include
   INCLUDE[ssltestlib.o]=.. ../include
 
-  SOURCE[x509aux]=x509aux.c testutil.c test_main_custom.c
+  SOURCE[x509aux]=x509aux.c
   INCLUDE[x509aux]=.. ../include
-  DEPEND[x509aux]=../libcrypto
+  DEPEND[x509aux]=../libcrypto libtestutil.a
 
-  SOURCE[asynciotest]=asynciotest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[asynciotest]=asynciotest.c ssltestlib.c
   INCLUDE[asynciotest]=../include
-  DEPEND[asynciotest]=../libcrypto ../libssl
+  DEPEND[asynciotest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[bioprinttest]=bioprinttest.c testutil.c test_main_custom.c
+  SOURCE[bioprinttest]=bioprinttest.c
   INCLUDE[bioprinttest]=../ ../include
-  DEPEND[bioprinttest]=../libcrypto
+  DEPEND[bioprinttest]=../libcrypto libtestutil.a
 
-  SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[sslapitest]=sslapitest.c ssltestlib.c
   INCLUDE[sslapitest]=../include ..
-  DEPEND[sslapitest]=../libcrypto ../libssl
+  DEPEND[sslapitest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[dtlstest]=dtlstest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[dtlstest]=dtlstest.c ssltestlib.c
   INCLUDE[dtlstest]=../include .
-  DEPEND[dtlstest]=../libcrypto ../libssl
+  DEPEND[dtlstest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c
   INCLUDE[sslcorrupttest]=../include .
-  DEPEND[sslcorrupttest]=../libcrypto ../libssl
+  DEPEND[sslcorrupttest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[bio_enc_test]=bio_enc_test.c testutil.c test_main.c
+  SOURCE[bio_enc_test]=bio_enc_test.c
   INCLUDE[bio_enc_test]=../include
-  DEPEND[bio_enc_test]=../libcrypto
+  DEPEND[bio_enc_test]=../libcrypto libtestutil.a
 
-  SOURCE[pkey_meth_test]=pkey_meth_test.c testutil.c test_main.c
+  SOURCE[pkey_meth_test]=pkey_meth_test.c
   INCLUDE[pkey_meth_test]=../include
-  DEPEND[pkey_meth_test]=../libcrypto
+  DEPEND[pkey_meth_test]=../libcrypto libtestutil.a
 
-  SOURCE[x509_time_test]=x509_time_test.c testutil.c test_main.c
+  SOURCE[x509_time_test]=x509_time_test.c
   INCLUDE[x509_time_test]=.. ../include
-  DEPEND[x509_time_test]=../libcrypto
+  DEPEND[x509_time_test]=../libcrypto libtestutil.a
 
-  SOURCE[recordlentest]=recordlentest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[recordlentest]=recordlentest.c ssltestlib.c
   INCLUDE[recordlentest]=../include .
-  DEPEND[recordlentest]=../libcrypto ../libssl
+  DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c testutil.c test_main_custom.c
+  SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c
   INCLUDE[x509_dup_cert_test]=../include
-  DEPEND[x509_dup_cert_test]=../libcrypto
+  DEPEND[x509_dup_cert_test]=../libcrypto libtestutil.a
 
   IF[{- !$disabled{psk} -}]
     PROGRAMS_NO_INST=dtls_mtu_test
@@ -327,23 +327,22 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
 
   IF[{- $disabled{shared} -}]
     PROGRAMS_NO_INST=cipher_overhead_test
-    SOURCE[cipher_overhead_test]=cipher_overhead_test.c testutil.c test_main.c
+    SOURCE[cipher_overhead_test]=cipher_overhead_test.c
     INCLUDE[cipher_overhead_test]=.. ../include
-    DEPEND[cipher_overhead_test]=../libcrypto ../libssl
+    DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
-  SOURCE[uitest]=uitest.c testutil.c test_main_custom.c \
-    ../apps/apps.c ../apps/opt.c {- $apps_extra -}
+  SOURCE[uitest]=uitest.c ../apps/apps.c ../apps/opt.c
   INCLUDE[uitest]=.. ../include
-  DEPEND[uitest]=../libcrypto ../libssl
+  DEPEND[uitest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[cipherbytes_test]=cipherbytes_test.c testutil.c test_main_custom.c
+  SOURCE[cipherbytes_test]=cipherbytes_test.c
   INCLUDE[cipherbytes_test]=.. ../include
-  DEPEND[cipherbytes_test]=../libcrypto ../libssl
+  DEPEND[cipherbytes_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[asn1_encode_test]=asn1_encode_test.c testutil.c test_main.c
+  SOURCE[asn1_encode_test]=asn1_encode_test.c
   INCLUDE[asn1_encode_test]=../include
-  DEPEND[asn1_encode_test]=../libcrypto
+  DEPEND[asn1_encode_test]=../libcrypto libtestutil.a
 
   # Internal test programs.  These are essentially a collection of internal
   # test routines.  Some of them need to reach internal symbols that aren't
@@ -366,56 +365,56 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
       PROGRAMS_NO_INST=siphash_internal_test
     ENDIF
 
-    SOURCE[poly1305_internal_test]=poly1305_internal_test.c testutil.c test_main_custom.c
+    SOURCE[poly1305_internal_test]=poly1305_internal_test.c
     INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
-    DEPEND[poly1305_internal_test]=../libcrypto.a
+    DEPEND[poly1305_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[chacha_internal_test]=chacha_internal_test.c testutil.c test_main.c
+    SOURCE[chacha_internal_test]=chacha_internal_test.c
     INCLUDE[chacha_internal_test]=.. ../include ../crypto/include
-    DEPEND[chacha_internal_test]=../libcrypto.a
+    DEPEND[chacha_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[asn1_internal_test]=asn1_internal_test.c testutil.c test_main.c
+    SOURCE[asn1_internal_test]=asn1_internal_test.c
     INCLUDE[asn1_internal_test]=.. ../include ../crypto/include
-    DEPEND[asn1_internal_test]=../libcrypto.a
+    DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[modes_internal_test]=modes_internal_test.c testutil.c test_main_custom.c
+    SOURCE[modes_internal_test]=modes_internal_test.c
     INCLUDE[modes_internal_test]=.. ../include
-    DEPEND[modes_internal_test]=../libcrypto.a
+    DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[x509_internal_test]=x509_internal_test.c testutil.c test_main.c
+    SOURCE[x509_internal_test]=x509_internal_test.c
     INCLUDE[x509_internal_test]=.. ../include
-    DEPEND[x509_internal_test]=../libcrypto.a
+    DEPEND[x509_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[tls13encryptiontest]=tls13encryptiontest.c testutil.c test_main.c
+    SOURCE[tls13encryptiontest]=tls13encryptiontest.c
     INCLUDE[tls13encryptiontest]=.. ../include
-    DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a
+    DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a libtestutil.a
 
-    SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
+    SOURCE[wpackettest]=wpackettest.c
     INCLUDE[wpackettest]=../include
-    DEPEND[wpackettest]=../libcrypto ../libssl.a
+    DEPEND[wpackettest]=../libcrypto ../libssl.a libtestutil.a
 
-    SOURCE[siphash_internal_test]=siphash_internal_test.c testutil.c test_main_custom.c
+    SOURCE[siphash_internal_test]=siphash_internal_test.c
     INCLUDE[siphash_internal_test]=.. ../include ../crypto/include
-    DEPEND[siphash_internal_test]=../libcrypto.a
+    DEPEND[siphash_internal_test]=../libcrypto.a libtestutil.a
   ENDIF
 
   IF[{- !$disabled{mdc2} -}]
     PROGRAMS_NO_INST=mdc2_internal_test
   ENDIF
 
-  SOURCE[mdc2_internal_test]=mdc2_internal_test.c testutil.c test_main.c
+  SOURCE[mdc2_internal_test]=mdc2_internal_test.c
   INCLUDE[mdc2_internal_test]=.. ../include
-  DEPEND[mdc2_internal_test]=../libcrypto
+  DEPEND[mdc2_internal_test]=../libcrypto libtestutil.a
 
   # We disable this test completely in a shared build because it deliberately
   # redefines some internal libssl symbols. This doesn't work in a non-shared
   # build
   IF[{- !$disabled{shared} -}]
     PROGRAMS_NO_INST=tls13secretstest
-    SOURCE[tls13secretstest]=tls13secretstest.c testutil.c test_main.c
+    SOURCE[tls13secretstest]=tls13secretstest.c
     SOURCE[tls13secretstest]= ../ssl/tls13_enc.c ../ssl/packet.c
     INCLUDE[tls13secretstest]=.. ../include
-    DEPEND[tls13secretstest]=../libcrypto ../libssl
+    DEPEND[tls13secretstest]=../libcrypto ../libssl libtestutil.a
   ENDIF
 ENDIF
 
diff --git a/test/casttest.c b/test/casttest.c
index fc0c700b47..24cfbfd455 100644
--- a/test/casttest.c
+++ b/test/casttest.c
@@ -13,7 +13,6 @@
 
 #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_CAST is defined */
 #include "e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_CAST
diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c
index 0c0be9b387..de8e4b2d8b 100644
--- a/test/chacha_internal_test.c
+++ b/test/chacha_internal_test.c
@@ -14,7 +14,6 @@
 
 #include <string.h>
 #include <openssl/opensslconf.h>
-#include "test_main.h"
 #include "testutil.h"
 #include "internal/chacha.h"
 
diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c
index 98d44bd7f5..6bf74a5a76 100644
--- a/test/cipher_overhead_test.c
+++ b/test/cipher_overhead_test.c
@@ -9,7 +9,6 @@
 
 #include "e_os.h"
 #include "testutil.h"
-#include "test_main.h"
 
 #ifdef __VMS
 # pragma names save
@@ -36,7 +35,7 @@ static int cipher_overhead(void)
             TEST_info("Failed getting %s", ciph->name);
             ret = 0;
         } else {
-            TEST_info("Cipher %s: %"OSSLzu" %"OSSLzu" %"OSSLzu" %"OSSLzu,
+            TEST_info("Cipher %s: %zu %zu %zu %zu",
                       ciph->name, mac, in, blk, ex);
         }
     }
diff --git a/test/cipherbytes_test.c b/test/cipherbytes_test.c
index 00e361b73f..bc3051ed34 100644
--- a/test/cipherbytes_test.c
+++ b/test/cipherbytes_test.c
@@ -20,7 +20,6 @@
 
 #include "e_os.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 static SSL_CTX *ctx;
 static SSL *s;
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c
index 31063e6a44..61551d9223 100644
--- a/test/cipherlist_test.c
+++ b/test/cipherlist_test.c
@@ -18,7 +18,6 @@
 #include <openssl/tls1.h>
 
 #include "e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 typedef struct cipherlist_test_fixture {
diff --git a/test/clienthellotest.c b/test/clienthellotest.c
index a5d3ad300e..2de85128e3 100644
--- a/test/clienthellotest.c
+++ b/test/clienthellotest.c
@@ -20,7 +20,6 @@
 #include "../ssl/packet_locl.h"
 
 #include "testutil.h"
-#include "test_main_custom.h"
 
 #define CLIENT_VERSION_LEN      2
 
diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index d34e386a8d..3e3542e864 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -13,7 +13,6 @@
 #include "e_os.h"
 #include "internal/constant_time_locl.h"
 #include "testutil.h"
-#include "test_main.h"
 #include "internal/numbers.h"
 
 static const unsigned int CONSTTIME_TRUE = (unsigned)(~0);
diff --git a/test/crltest.c b/test/crltest.c
index e633fd355c..790fc5f4a7 100644
--- a/test/crltest.c
+++ b/test/crltest.c
@@ -17,7 +17,6 @@
 #include <openssl/x509.h>
 
 #include "testutil.h"
-#include "test_main.h"
 
 #define PARAM_TIME 1474934400 /* Sep 27th, 2016 */
 
diff --git a/test/ct_test.c b/test/ct_test.c
index e96eab0a7a..583db4437e 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -19,7 +19,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "testutil.h"
-#include "test_main_custom.h"
 
 #ifndef OPENSSL_NO_CT
 /* Used when declaring buffers to read text files into */
diff --git a/test/d2i_test.c b/test/d2i_test.c
index 0413ceb237..8126ace914 100644
--- a/test/d2i_test.c
+++ b/test/d2i_test.c
@@ -13,7 +13,6 @@
 #include <string.h>
 
 #include "testutil.h"
-#include "test_main_custom.h"
 
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
diff --git a/test/destest.c b/test/destest.c
index b863ee8275..2aae1ca79a 100644
--- a/test/destest.c
+++ b/test/destest.c
@@ -10,7 +10,6 @@
 #include <openssl/e_os2.h>
 #include <string.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_DES
diff --git a/test/dhtest.c b/test/dhtest.c
index eb6ec0e963..618b84e773 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -17,7 +17,6 @@
 #include <openssl/bn.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
-#include "test_main.h"
 #include "testutil.h"
 
 #ifdef OPENSSL_NO_DH
diff --git a/test/dsatest.c b/test/dsatest.c
index bff0b96ad1..e4ed8ebd63 100644
--- a/test/dsatest.c
+++ b/test/dsatest.c
@@ -18,7 +18,6 @@
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
 
-#include "test_main.h"
 #include "testutil.h"
 #include "e_os.h"
 
diff --git a/test/dtlstest.c b/test/dtlstest.c
index cb58b180c2..b766802148 100644
--- a/test/dtlstest.c
+++ b/test/dtlstest.c
@@ -14,7 +14,6 @@
 
 #include "ssltestlib.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 static char *cert = NULL;
 static char *privkey = NULL;
diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index 8b1e566ae8..561ff0c2bd 100644
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -46,7 +46,6 @@ int main(int argc, char *argv[])
 # include <openssl/err.h>
 # include <openssl/rand.h>
 # include "testutil.h"
-# include "test_main.h"
 
 static const char rnd_seed[] = "string to make the random number generator "
     "think it has entropy";
diff --git a/test/enginetest.c b/test/enginetest.c
index 89107a3b1e..55bb4e041f 100644
--- a/test/enginetest.c
+++ b/test/enginetest.c
@@ -23,7 +23,6 @@ int main(int argc, char *argv[])
 # include <openssl/engine.h>
 # include <openssl/err.h>
 # include "testutil.h"
-# include "test_main.h"
 
 static void display_engine_list(void)
 {
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index b8cfc0d204..80737f96cd 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -16,7 +16,6 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 #include "testutil.h"
-#include "test_main.h"
 
 /*
  * kExampleRSAKeyDER is an RSA private key in ASN.1, DER format. Of course, you
diff --git a/test/exdatatest.c b/test/exdatatest.c
index fb1694dd40..8880f6f40f 100644
--- a/test/exdatatest.c
+++ b/test/exdatatest.c
@@ -12,7 +12,6 @@
 #include <stdlib.h>
 #include <openssl/crypto.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 static long saved_argl;
diff --git a/test/gmdifftest.c b/test/gmdifftest.c
index 462436ff48..1d508c0c7c 100644
--- a/test/gmdifftest.c
+++ b/test/gmdifftest.c
@@ -9,7 +9,6 @@
 
 #include <openssl/crypto.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 #define SECS_PER_DAY (24 * 60 * 60)
diff --git a/test/hmactest.c b/test/hmactest.c
index d7e68b4cd7..db1b7af001 100644
--- a/test/hmactest.c
+++ b/test/hmactest.c
@@ -23,7 +23,6 @@
 #  include <openssl/ebcdic.h>
 # endif
 
-#include "test_main.h"
 #include "testutil.h"
 
 # ifndef OPENSSL_NO_MD5
diff --git a/test/ideatest.c b/test/ideatest.c
index a208334693..14d69dc321 100644
--- a/test/ideatest.c
+++ b/test/ideatest.c
@@ -10,7 +10,6 @@
 #include <string.h>
 
 #include "../e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_IDEA
diff --git a/test/lhash_test.c b/test/lhash_test.c
index 1761efdacf..b8127962c5 100644
--- a/test/lhash_test.c
+++ b/test/lhash_test.c
@@ -20,7 +20,6 @@
 #include <openssl/crypto.h>
 
 #include "e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 /*
diff --git a/test/md2test.c b/test/md2test.c
index 81a1760a47..7a1436de2f 100644
--- a/test/md2test.c
+++ b/test/md2test.c
@@ -10,7 +10,6 @@
 #include <string.h>
 
 #include "../e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_MD2
diff --git a/test/mdc2_internal_test.c b/test/mdc2_internal_test.c
index 7deaf2668f..d696ea7189 100644
--- a/test/mdc2_internal_test.c
+++ b/test/mdc2_internal_test.c
@@ -14,7 +14,6 @@
 
 #include <openssl/mdc2.h>
 #include "testutil.h"
-#include "test_main.h"
 #include "e_os.h"
 
 typedef struct {
diff --git a/test/mdc2test.c b/test/mdc2test.c
index fb513e116c..724d6d323e 100644
--- a/test/mdc2test.c
+++ b/test/mdc2test.c
@@ -10,7 +10,6 @@
 #include <string.h>
 
 #include "../e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2)
diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c
index 087115b242..b3a2b102a4 100644
--- a/test/modes_internal_test.c
+++ b/test/modes_internal_test.c
@@ -16,7 +16,6 @@
 #include <openssl/modes.h>
 #include "../crypto/modes/modes_lcl.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 #include "e_os.h"
 
 typedef struct {
diff --git a/test/packettest.c b/test/packettest.c
index 7ee4a08fe0..4866d27abd 100644
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -9,7 +9,6 @@
 
 #include "../ssl/packet_locl.h"
 #include "testutil.h"
-#include "test_main.h"
 
 #define BUF_LEN 255
 
diff --git a/test/pbelutest.c b/test/pbelutest.c
index 11189b4776..c6ce58677c 100644
--- a/test/pbelutest.c
+++ b/test/pbelutest.c
@@ -9,7 +9,6 @@
 
 #include <openssl/evp.h>
 #include "testutil.h"
-#include "test_main.h"
 
 /*
  * Password based encryption (PBE) table ordering test.
diff --git a/test/pkey_meth_test.c b/test/pkey_meth_test.c
index 88765375fa..adff232304 100644
--- a/test/pkey_meth_test.c
+++ b/test/pkey_meth_test.c
@@ -14,7 +14,6 @@
 
 #include <openssl/evp.h>
 #include "testutil.h"
-#include "test_main.h"
 
 /**********************************************************************
  *
diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 03b0fa91df..a6825d252f 100644
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -13,7 +13,6 @@
 #include <string.h>
 
 #include "testutil.h"
-#include "test_main_custom.h"
 #include "internal/poly1305.h"
 #include "../crypto/poly1305/poly1305_local.h"
 #include "e_os.h"
@@ -1600,7 +1599,7 @@ static int test_poly1305(int idx)
             Poly1305_Final(&poly1305, out);
 
             if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
-                TEST_info("Poly1305 test #%d/%" OSSLzu "+%" OSSLzu " failed.",
+                TEST_info("Poly1305 test #%d/%zu+%zu failed.",
                           idx, half, inlen-half);
                 return 0;
             }
diff --git a/test/randtest.c b/test/randtest.c
index e1d84c318c..8ef59434cf 100644
--- a/test/randtest.c
+++ b/test/randtest.c
@@ -9,7 +9,6 @@
 
 #include <openssl/rand.h>
 #include "testutil.h"
-#include "test_main.h"
 
 /* some FIPS 140-1 random number test */
 /* some simple tests */
diff --git a/test/rc2test.c b/test/rc2test.c
index 2553c914f1..056157653c 100644
--- a/test/rc2test.c
+++ b/test/rc2test.c
@@ -8,7 +8,6 @@
  */
 
 #include "../e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC2
diff --git a/test/rc4test.c b/test/rc4test.c
index e6d4ccf74d..bf2ec310bb 100644
--- a/test/rc4test.c
+++ b/test/rc4test.c
@@ -10,7 +10,6 @@
 #include <string.h>
 
 #include "../e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC4
diff --git a/test/rc5test.c b/test/rc5test.c
index bc2cd97ff2..bd02f72353 100644
--- a/test/rc5test.c
+++ b/test/rc5test.c
@@ -10,7 +10,6 @@
 #include <string.h>
 
 #include "../e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC5
diff --git a/test/recordlentest.c b/test/recordlentest.c
index 70631495a6..57c4648bcc 100644
--- a/test/recordlentest.c
+++ b/test/recordlentest.c
@@ -11,7 +11,6 @@
 
 #include "ssltestlib.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 static char *cert = NULL;
 static char *privkey = NULL;
diff --git a/test/rsa_test.c b/test/rsa_test.c
index ea10c8e260..47be25848f 100644
--- a/test/rsa_test.c
+++ b/test/rsa_test.c
@@ -19,7 +19,6 @@
 #include <openssl/rand.h>
 #include <openssl/bn.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 #ifdef OPENSSL_NO_RSA
diff --git a/test/sanitytest.c b/test/sanitytest.c
index 3ef0a37207..5a9e6bbdb4 100644
--- a/test/sanitytest.c
+++ b/test/sanitytest.c
@@ -10,7 +10,6 @@
 #include <string.h>
 #include <internal/numbers.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 static int test_sanity_null_zero(void)
diff --git a/test/secmemtest.c b/test/secmemtest.c
index 9fd023574e..3244d06b12 100644
--- a/test/secmemtest.c
+++ b/test/secmemtest.c
@@ -9,7 +9,6 @@
 
 #include <openssl/crypto.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 static int test_sec_mem(void)
diff --git a/test/sha1test.c b/test/sha1test.c
index 25c7f10568..6a8b304dbd 100644
--- a/test/sha1test.c
+++ b/test/sha1test.c
@@ -11,7 +11,6 @@
 #include <string.h>
 
 #include "../e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #include <openssl/evp.h>
diff --git a/test/sha256t.c b/test/sha256t.c
index 29e65d5ed0..c6ce1ae187 100644
--- a/test/sha256t.c
+++ b/test/sha256t.c
@@ -10,7 +10,6 @@
 #include <openssl/sha.h>
 #include <openssl/evp.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 static const unsigned char app_b1[SHA256_DIGEST_LENGTH] = {
diff --git a/test/sha512t.c b/test/sha512t.c
index 91efa328d6..2a1bd1b7b9 100644
--- a/test/sha512t.c
+++ b/test/sha512t.c
@@ -10,7 +10,6 @@
 #include <openssl/sha.h>
 #include <openssl/evp.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 static const unsigned char app_c1[SHA512_DIGEST_LENGTH] = {
diff --git a/test/siphash_internal_test.c b/test/siphash_internal_test.c
index fd097e0d59..0114af18d0 100644
--- a/test/siphash_internal_test.c
+++ b/test/siphash_internal_test.c
@@ -14,7 +14,6 @@
 
 #include <openssl/bio.h>
 #include "testutil.h"
-#include "test_main_custom.h"
 #include "internal/siphash.h"
 #include "../crypto/siphash/siphash_local.h"
 #include "e_os.h"
@@ -226,7 +225,7 @@ static int test_siphash(int idx)
 
     if (expectedlen != SIPHASH_MIN_DIGEST_SIZE &&
         expectedlen != SIPHASH_MAX_DIGEST_SIZE) {
-        TEST_info("size %" OSSLzu " vs %d and %d", expectedlen,
+        TEST_info("size %zu vs %d and %d", expectedlen,
                   SIPHASH_MIN_DIGEST_SIZE, SIPHASH_MAX_DIGEST_SIZE);
         return 0;
     }
@@ -286,7 +285,7 @@ static int test_siphash(int idx)
                 return 0;
 
             if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
-                TEST_info("SipHash test #%d/%" OSSLzu "+%" OSSLzu " failed.",
+                TEST_info("SipHash test #%d/%zu+%zu failed.",
                           idx, half, inlen-half);
                 return 0;
             }
diff --git a/test/srptest.c b/test/srptest.c
index 6d14571635..c908c393af 100644
--- a/test/srptest.c
+++ b/test/srptest.c
@@ -24,7 +24,6 @@ int main(int argc, char *argv[])
 # include <openssl/rand.h>
 # include <openssl/err.h>
 # include "testutil.h"
-# include "test_main.h"
 
 static void showbn(const char *name, const BIGNUM *bn)
 {
diff --git a/test/ssl_test.c b/test/ssl_test.c
index 9406f94280..092e755b09 100644
--- a/test/ssl_test.c
+++ b/test/ssl_test.c
@@ -17,7 +17,6 @@
 #include "handshake_helper.h"
 #include "ssl_test_ctx.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 static CONF *conf = NULL;
 
diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c
index 6f277e5242..2a633f9a53 100644
--- a/test/ssl_test_ctx_test.c
+++ b/test/ssl_test_ctx_test.c
@@ -18,7 +18,6 @@
 #include "e_os.h"
 #include "ssl_test_ctx.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 #include <openssl/e_os2.h>
 #include <openssl/err.h>
 #include <openssl/conf.h>
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 3b4d01aab9..436fbbb10f 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -17,7 +17,6 @@
 
 #include "ssltestlib.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 #include "e_os.h"
 
 static char *cert = NULL;
diff --git a/test/sslcorrupttest.c b/test/sslcorrupttest.c
index 98e5bb3e06..c480f2348b 100644
--- a/test/sslcorrupttest.c
+++ b/test/sslcorrupttest.c
@@ -10,7 +10,6 @@
 #include <string.h>
 #include "ssltestlib.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 static int docorrupt = 0;
 
diff --git a/test/stack_test.c b/test/stack_test.c
index 25b2e001e1..6d1cd91e9b 100644
--- a/test/stack_test.c
+++ b/test/stack_test.c
@@ -20,7 +20,6 @@
 #include <openssl/crypto.h>
 
 #include "e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 /* The macros below generate unused functions which error out one of the clang
diff --git a/test/test_test.c b/test/test_test.c
index a1542892e9..879a051a59 100644
--- a/test/test_test.c
+++ b/test/test_test.c
@@ -19,7 +19,6 @@
 #include <openssl/crypto.h>
 
 #include "e_os.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #define C(l, b, t)                                      \
diff --git a/test/threadstest.c b/test/threadstest.c
index 9c735ff8c6..60064d674e 100644
--- a/test/threadstest.c
+++ b/test/threadstest.c
@@ -12,7 +12,6 @@
 #endif
 
 #include <openssl/crypto.h>
-#include "test_main.h"
 #include "testutil.h"
 
 #if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index c60d3b66fe..861a8154cd 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -23,7 +23,6 @@
 #endif
 
 #include "testutil.h"
-#include "test_main.h"
 
 /*
  * Based on the test vectors provided in:
@@ -358,21 +357,21 @@ static int test_tls13_encryption(void)
 
         /* Encrypt it */
         if (!TEST_size_t_eq(tls13_enc(s, &rec, 1, 1), 1)) {
-            TEST_info("Failed to encrypt record %"OSSLzu"", ctr);
+            TEST_info("Failed to encrypt record %zu", ctr);
             goto err;
         }
         if (!TEST_true(test_record(&rec, &refdata[ctr], 1))) {
-            TEST_info("Record %"OSSLzu" encryption test failed", ctr);
+            TEST_info("Record %zu encryption test failed", ctr);
             goto err;
         }
 
         /* Decrypt it */
         if (!TEST_int_eq(tls13_enc(s, &rec, 1, 0), 1)) {
-            TEST_info("Failed to decrypt record %"OSSLzu"", ctr);
+            TEST_info("Failed to decrypt record %zu", ctr);
             goto err;
         }
         if (!TEST_true(test_record(&rec, &refdata[ctr], 0))) {
-            TEST_info("Record %"OSSLzu" decryption test failed", ctr);
+            TEST_info("Record %zu decryption test failed", ctr);
             goto err;
         }
 
diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index e74c4861ed..2904ba9f16 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -22,7 +22,6 @@
 #endif
 
 #include "testutil.h"
-#include "test_main.h"
 
 #define IVLEN   12
 #define KEYLEN  16
diff --git a/test/uitest.c b/test/uitest.c
index 574412d633..855dc45442 100644
--- a/test/uitest.c
+++ b/test/uitest.c
@@ -11,22 +11,11 @@
 #include <string.h>
 #include <openssl/opensslconf.h>
 #include <openssl/err.h>
-
-/*
- * The VMS build does stdio via a socketpair.
- */
-#ifdef __VMS
-# include "../apps/vms_term_sock.h"
-#endif
-
 #include "../apps/apps.h"
-
 #include "testutil.h"
-#include "test_main_custom.h"
 
 /* apps/apps.c depend on these */
 char *default_config_file = NULL;
-BIO *bio_err = NULL;
 
 #ifndef OPENSSL_NO_UI
 # include <openssl/ui.h>
@@ -102,21 +91,10 @@ static int test_new_ui()
 
 #endif
 
-int test_main(int argc, char *argv[])
+void register_tests(void)
 {
-    int ret;
-
-    bio_err = dup_bio_err(FORMAT_TEXT);
-
 #ifndef OPENSSL_NO_UI
     ADD_TEST(test_old);
     ADD_TEST(test_new_ui);
 #endif
-
-    ret = run_tests(argv[0]);
-
-    (void)BIO_flush(bio_err);
-    BIO_free(bio_err);
-
-    return ret;
 }
diff --git a/test/v3ext.c b/test/v3ext.c
index f4cb568c73..9fbdfd2e79 100644
--- a/test/v3ext.c
+++ b/test/v3ext.c
@@ -13,7 +13,6 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
-#include "test_main_custom.h"
 #include "testutil.h"
 
 static const char *infile;
diff --git a/test/v3nametest.c b/test/v3nametest.c
index 39dcfe86ce..cb7b799aec 100644
--- a/test/v3nametest.c
+++ b/test/v3nametest.c
@@ -12,7 +12,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "testutil.h"
-#include "test_main.h"
 
 static const char *const names[] = {
     "a", "b", ".", "*", "@",
diff --git a/test/verify_extra_test.c b/test/verify_extra_test.c
index d528fa599f..a0df29df17 100644
--- a/test/verify_extra_test.c
+++ b/test/verify_extra_test.c
@@ -14,7 +14,6 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include "testutil.h"
-#include "test_main_custom.h"
 
 static STACK_OF(X509) *load_certs_from_file(const char *filename)
 {
diff --git a/test/wpackettest.c b/test/wpackettest.c
index a37fab7a3b..a0872c5724 100644
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -22,7 +22,6 @@
 #endif
 
 #include "testutil.h"
-#include "test_main_custom.h"
 
 const static unsigned char simple1[] = { 0xff };
 const static unsigned char simple2[] = { 0x01, 0xff };
diff --git a/test/x509_dup_cert_test.c b/test/x509_dup_cert_test.c
index 05899aaa56..adeb8ea929 100644
--- a/test/x509_dup_cert_test.c
+++ b/test/x509_dup_cert_test.c
@@ -15,7 +15,6 @@
 #include <openssl/err.h>
 #include <openssl/x509_vfy.h>
 
-#include "test_main_custom.h"
 #include "testutil.h"
 
 static int test_509_dup_cert(const char *cert_f)
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index 0a3a9beacd..10cb0b189b 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -15,7 +15,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "testutil.h"
-#include "test_main.h"
 #include "e_os.h"
 
 /**********************************************************************
diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index d9a7f50877..b73e6554b9 100644
--- a/test/x509_time_test.c
+++ b/test/x509_time_test.c
@@ -15,7 +15,6 @@
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
 #include "testutil.h"
-#include "test_main.h"
 #include "e_os.h"
 
 typedef struct {
diff --git a/test/x509aux.c b/test/x509aux.c
index 7030a13365..44a9db1829 100644
--- a/test/x509aux.c
+++ b/test/x509aux.c
@@ -17,8 +17,6 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include "e_os.h"
-#include "test_main.h"
-#include "test_main_custom.h"
 #include "testutil.h"