diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h
index 8d0f7e69d..c29134a92 100644
--- a/tests/include/test/psa_crypto_helpers.h
+++ b/tests/include/test/psa_crypto_helpers.h
@@ -21,6 +21,10 @@
 #include "mbedtls/psa_util.h"
 #endif
 
+#if defined(MBEDTLS_TEST_HOOKS)
+#include "test/psa_memory_poisoning_wrappers.h"
+#endif
+
 #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
 
 /* Internal function for #TEST_USES_KEY_ID. Return 1 on success, 0 on failure. */
diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 8ebb3950b..796a62a5f 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -19,10 +19,6 @@
 #include "test/psa_crypto_helpers.h"
 #include "test/psa_exercise_key.h"
 
-#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