diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 5e9de86eee..cb316706b7 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -818,7 +818,6 @@ int main(int argc, char *argv[])
 #endif
     psa_status_t status;
 
-    rng_context_t rng;
     mbedtls_ssl_context ssl;
     mbedtls_ssl_config conf;
     mbedtls_ssl_session saved_session;
@@ -1652,7 +1651,7 @@ usage:
     mbedtls_printf("\n  . Seeding the random number generator...");
     fflush(stdout);
 
-    ret = rng_seed(&rng, opt.reproducible, pers);
+    ret = rng_seed(opt.reproducible, pers);
     if (ret != 0) {
         goto exit;
     }
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index d12dc2b6e2..f4de913ed3 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -600,9 +600,6 @@ int main(void)
         (out_be)[(i) + 7] = (unsigned char) (((in_le) >> 0) & 0xFF);    \
     }
 
-/* This is global so it can be easily accessed by callback functions */
-rng_context_t rng;
-
 /*
  * global options
  */
@@ -2538,7 +2535,7 @@ usage:
     mbedtls_printf("\n  . Seeding the random number generator...");
     fflush(stdout);
 
-    ret = rng_seed(&rng, opt.reproducible, pers);
+    ret = rng_seed(opt.reproducible, pers);
     if (ret != 0) {
         goto exit;
     }
diff --git a/programs/ssl/ssl_test_lib.c b/programs/ssl/ssl_test_lib.c
index c2cd4ef36c..fbb16b641c 100644
--- a/programs/ssl/ssl_test_lib.c
+++ b/programs/ssl/ssl_test_lib.c
@@ -46,10 +46,9 @@ mbedtls_time_t dummy_constant_time(mbedtls_time_t *time)
 }
 #endif
 
-int rng_seed(rng_context_t *rng, int reproducible, const char *pers)
+int rng_seed(int reproducible, const char *pers)
 {
     /* The PSA crypto RNG does its own seeding. */
-    (void) rng;
     (void) pers;
     if (reproducible) {
         mbedtls_fprintf(stderr,
diff --git a/programs/ssl/ssl_test_lib.h b/programs/ssl/ssl_test_lib.h
index 29c0e5313d..4a09ebb92b 100644
--- a/programs/ssl/ssl_test_lib.h
+++ b/programs/ssl/ssl_test_lib.h
@@ -120,7 +120,7 @@ mbedtls_time_t dummy_constant_time(mbedtls_time_t *time);
  *
  * return 0 on success, a negative value on error.
  */
-int rng_seed(rng_context_t *rng, int reproducible, const char *pers);
+int rng_seed(int reproducible, const char *pers);
 
 /** Parse command-line option: key_opaque_algs
  *