diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h
index 04b90b9231..935e071819 100644
--- a/tests/include/test/psa_crypto_helpers.h
+++ b/tests/include/test/psa_crypto_helpers.h
@@ -16,6 +16,9 @@
 #include <psa/crypto.h>
 #endif
 
+#if defined(MBEDTLS_TEST_HOOKS)
+#include "test/psa_memory_poisoning_wrappers.h"
+#endif
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)
 /** Initialize the PSA Crypto subsystem. */
diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index a024c1ee48..1962f7b33e 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -25,10 +25,6 @@
 #define TEST_DRIVER_LOCATION 0x7fffff
 #endif
 
-#if defined(MBEDTLS_TEST_HOOKS)
-#include "test/psa_memory_poisoning_wrappers.h"
-#endif
-
 /* If this comes up, it's a bug in the test code or in the test data. */
 #define UNUSED 0xdeadbeef