diff --git a/test/build.info b/test/build.info
index 500999ca34..a74dd36de2 100644
--- a/test/build.info
+++ b/test/build.info
@@ -37,7 +37,7 @@ IF[{- !$disabled{tests} -}]
           sanitytest rsa_complex exdatatest bntest \
           ecstresstest gmdifftest pbelutest \
           destest mdc2test sha_test \
-          exptest pbetest localetest evp_pkey_ctx_new_from_name\
+          exptest pbetest localetest evp_pkey_ctx_new_from_name \
           evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
           evp_fetch_prov_test evp_libctx_test ossl_store_test \
           v3nametest v3ext \
@@ -956,6 +956,13 @@ ENDIF
   INCLUDE[build_wincrypt_test]=../include
   DEPEND[build_wincrypt_test]=../libssl ../libcrypto
 
+  IF[{- !$disabled{shared} -}]
+    PROGRAMS{noinst}=timing_load_creds
+    SOURCE[timing_load_creds]=timing_load_creds.c
+    INCLUDE[timing_load_creds]=../include
+    DEPEND[timing_load_creds]=../libcrypto.a
+  ENDIF
+
   IF[{- !$disabled{'quic'} -}]
     PROGRAMS{noinst}=quicapitest quic_wire_test
   ENDIF
diff --git a/test/timing-cert.pem b/test/certs/timing-cert.pem
similarity index 100%
rename from test/timing-cert.pem
rename to test/certs/timing-cert.pem
diff --git a/test/timing-key.pem b/test/certs/timing-key.pem
similarity index 100%
rename from test/timing-key.pem
rename to test/certs/timing-key.pem
diff --git a/test/timing.c b/test/timing_load_creds.c
similarity index 96%
rename from test/timing.c
rename to test/timing_load_creds.c
index 9c3ada97e7..5189dfec67 100644
--- a/test/timing.c
+++ b/test/timing_load_creds.c
@@ -5,9 +5,6 @@
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
- *
- * I compiled this in the source tree this way:
- *      gcc -g -Iinclude a.c libcrypto.a -ldl -lpthread
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,7 +17,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
-static char *prog = "./a.out";
+static char *prog;
 
 static void readx509(const char *contents, int size)
 {