diff --git a/scripts/check_names.py b/scripts/check_names.py
index 57d2e1104..7f95dded9 100755
--- a/scripts/check_names.py
+++ b/scripts/check_names.py
@@ -703,6 +703,8 @@ def comprehensive_parse(self):
             "include/tf-psa-crypto/*.h",
             "include/mbedtls/*.h",
             "drivers/builtin/include/mbedtls/*.h",
+            "include/mbedtls/private/*.h",
+            "drivers/builtin/include/mbedtls/private/*.h",
             "drivers/everest/include/everest/everest.h",
             "drivers/everest/include/everest/x25519.h",
             "drivers/everest/include/tf-psa-crypto/private/everest/everest.h",
@@ -722,6 +724,8 @@ def comprehensive_parse(self):
             "include/tf-psa-crypto/*.h",
             "include/mbedtls/*.h",
             "drivers/builtin/include/mbedtls/*.h",
+            "include/mbedtls/private/*.h",
+            "drivers/builtin/include/mbedtls/private/*.h",
             "core/*.h",
             "drivers/builtin/src/*.h",
             "core/*.c",
@@ -736,6 +740,8 @@ def comprehensive_parse(self):
             "include/tf-psa-crypto/*.h",
             "include/mbedtls/*.h",
             "drivers/builtin/include/mbedtls/*.h",
+            "include/mbedtls/private/*.h",
+            "drivers/builtin/include/mbedtls/private/*.h",
             "core/*.h",
             "drivers/builtin/src/*.h",
             "drivers/everest/include/everest/everest.h",
@@ -748,6 +754,8 @@ def comprehensive_parse(self):
             "include/tf-psa-crypto/*.h",
             "include/mbedtls/*.h",
             "drivers/builtin/include/mbedtls/*.h",
+            "include/mbedtls/private/*.h",
+            "drivers/builtin/include/mbedtls/private/*.h",
             "core/*.h",
             "drivers/builtin/src/*.h",
             "drivers/everest/include/everest/everest.h",
diff --git a/tests/include/test/bignum_helpers.h b/tests/include/test/bignum_helpers.h
index a5e49cbe5..49e290b92 100644
--- a/tests/include/test/bignum_helpers.h
+++ b/tests/include/test/bignum_helpers.h
@@ -17,7 +17,11 @@
 
 #if defined(MBEDTLS_BIGNUM_C)
 
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include <mbedtls/private/bignum.h>
+#else
 #include <mbedtls/bignum.h>
+#endif
 #include <bignum_mod.h>
 
 /** Allocate and populate a core MPI from a test case argument.
diff --git a/tests/include/test/drivers/cipher.h b/tests/include/test/drivers/cipher.h
index 38c75aba7..b6860f95e 100644
--- a/tests/include/test/drivers/cipher.h
+++ b/tests/include/test/drivers/cipher.h
@@ -16,7 +16,11 @@
 #include <psa/crypto_driver_common.h>
 #include <psa/crypto.h>
 
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include "mbedtls/private/cipher.h"
+#else
 #include "mbedtls/cipher.h"
+#endif
 
 typedef struct {
     /* If non-null, on success, copy this to the output. */
diff --git a/tests/include/test/helpers.h b/tests/include/test/helpers.h
index aff84748f..f1700bbb8 100644
--- a/tests/include/test/helpers.h
+++ b/tests/include/test/helpers.h
@@ -51,9 +51,15 @@
 #include <stdint.h>
 
 #if defined(MBEDTLS_BIGNUM_C)
+
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include "mbedtls/private/bignum.h"
+#else
 #include "mbedtls/bignum.h"
 #endif
 
+#endif
+
 /** The type of test case arguments that contain binary data. */
 typedef struct data_tag {
     uint8_t *x;
diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h
index 9b7dbd57a..962ca1e2f 100644
--- a/tests/include/test/psa_crypto_helpers.h
+++ b/tests/include/test/psa_crypto_helpers.h
@@ -17,7 +17,12 @@
 #endif
 
 #include <psa/crypto.h>
+
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include <mbedtls/private/ctr_drbg.h>
+#else
 #include <mbedtls/ctr_drbg.h>
+#endif
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)
 /** Initialize the PSA Crypto subsystem. */
diff --git a/tests/src/bignum_helpers.c b/tests/src/bignum_helpers.c
index 913f5e387..8b35e38c8 100644
--- a/tests/src/bignum_helpers.c
+++ b/tests/src/bignum_helpers.c
@@ -18,7 +18,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include <mbedtls/private/bignum.h>
+#else
 #include <mbedtls/bignum.h>
+#endif
+
 #include <bignum_core.h>
 #include <bignum_mod.h>
 #include <bignum_mod_raw.h>
diff --git a/tests/src/drivers/test_driver_asymmetric_encryption.c b/tests/src/drivers/test_driver_asymmetric_encryption.c
index 6fdbe43ae..57adb5ce9 100644
--- a/tests/src/drivers/test_driver_asymmetric_encryption.c
+++ b/tests/src/drivers/test_driver_asymmetric_encryption.c
@@ -9,7 +9,13 @@
 
 #if defined(PSA_CRYPTO_DRIVER_TEST)
 #include "psa/crypto.h"
+
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include "mbedtls/private/rsa.h"
+#else
 #include "mbedtls/rsa.h"
+#endif
+
 #include "psa_crypto_rsa.h"
 #include "string.h"
 #include "test/drivers/asymmetric_encryption.h"
diff --git a/tests/src/drivers/test_driver_cipher.c b/tests/src/drivers/test_driver_cipher.c
index 9a9a77c70..9b753cd89 100644
--- a/tests/src/drivers/test_driver_cipher.c
+++ b/tests/src/drivers/test_driver_cipher.c
@@ -12,7 +12,12 @@
 #include "psa/crypto.h"
 #include "psa_crypto_cipher.h"
 #include "psa_crypto_core.h"
+
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include "mbedtls/private/cipher.h"
+#else
 #include "mbedtls/cipher.h"
+#endif
 
 #include "test/drivers/cipher.h"
 
diff --git a/tests/src/drivers/test_driver_key_management.c b/tests/src/drivers/test_driver_key_management.c
index d2ca157b8..90cdb2153 100644
--- a/tests/src/drivers/test_driver_key_management.c
+++ b/tests/src/drivers/test_driver_key_management.c
@@ -14,7 +14,13 @@
 #include "psa_crypto_ecp.h"
 #include "psa_crypto_rsa.h"
 #include "psa_crypto_ffdh.h"
+
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include "mbedtls/private/ecp.h"
+#else
 #include "mbedtls/ecp.h"
+#endif
+
 #include "mbedtls/error.h"
 
 #include "test/drivers/key_management.h"
diff --git a/tests/src/drivers/test_driver_signature.c b/tests/src/drivers/test_driver_signature.c
index a6eef573b..2915b5426 100644
--- a/tests/src/drivers/test_driver_signature.c
+++ b/tests/src/drivers/test_driver_signature.c
@@ -15,13 +15,22 @@
 #include "psa_crypto_ecp.h"
 #include "psa_crypto_hash.h"
 #include "psa_crypto_rsa.h"
+
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include "mbedtls/private/ecp.h"
+#else
 #include "mbedtls/ecp.h"
+#endif
 
 #include "test/drivers/hash.h"
 #include "test/drivers/signature.h"
 #include "test/drivers/hash.h"
 
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include "mbedtls/private/ecdsa.h"
+#else
 #include "mbedtls/ecdsa.h"
+#endif
 
 #include "test/random.h"
 
diff --git a/tests/src/fake_external_rng_for_test.c b/tests/src/fake_external_rng_for_test.c
index 21da1414a..6b8f682cd 100644
--- a/tests/src/fake_external_rng_for_test.c
+++ b/tests/src/fake_external_rng_for_test.c
@@ -54,7 +54,12 @@ psa_status_t mbedtls_psa_external_get_random(
 #if defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT)
 
 #include <test/random.h>
+
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include <mbedtls/private/entropy.h>
+#else
 #include <mbedtls/entropy.h>
+#endif
 
 static int platform_get_entropy_force_failure;
 static size_t platform_get_entropy_forced_entropy_content = SIZE_MAX;
diff --git a/tests/src/psa_crypto_helpers.c b/tests/src/psa_crypto_helpers.c
index 9de2861e9..3baf5474d 100644
--- a/tests/src/psa_crypto_helpers.c
+++ b/tests/src/psa_crypto_helpers.c
@@ -14,8 +14,12 @@
 #include <test/psa_crypto_helpers.h>
 
 #if defined(MBEDTLS_CTR_DRBG_C)
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include <mbedtls/private/ctr_drbg.h>
+#else
 #include <mbedtls/ctr_drbg.h>
 #endif
+#endif
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)
 
@@ -249,7 +253,12 @@ uint64_t mbedtls_test_parse_binary_string(data_t *bin_string)
 
 #if defined(MBEDTLS_PSA_INJECT_ENTROPY)
 
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include <mbedtls/private/entropy.h>
+#else
 #include <mbedtls/entropy.h>
+#endif
+
 #include <psa_crypto_its.h>
 
 int mbedtls_test_inject_entropy_seed_read(unsigned char *buf, size_t len)
diff --git a/tests/src/psa_exercise_key.c b/tests/src/psa_exercise_key.c
index 1b30c44c5..7380f7acc 100644
--- a/tests/src/psa_exercise_key.c
+++ b/tests/src/psa_exercise_key.c
@@ -25,7 +25,13 @@
 #include <pk_internal.h>
 #endif
 #if defined(MBEDTLS_ECP_C)
+
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include <mbedtls/private/ecp.h>
+#else
 #include <mbedtls/ecp.h>
+#endif
+
 #endif
 #if defined(MBEDTLS_RSA_C)
 #include <rsa_internal.h>
diff --git a/tests/src/random.c b/tests/src/random.c
index d041f36a1..e98c36709 100644
--- a/tests/src/random.c
+++ b/tests/src/random.c
@@ -23,7 +23,11 @@
 #include <test/random.h>
 #include <string.h>
 
+#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
+#include <mbedtls/private/entropy.h>
+#else
 #include <mbedtls/entropy.h>
+#endif
 #include <alignment.h>
 
 int mbedtls_test_rnd_std_rand(void *rng_state,