diff --git a/tests/src/helpers.c b/tests/src/helpers.c
index bf823fed3e..1a157331b6 100644
--- a/tests/src/helpers.c
+++ b/tests/src/helpers.c
@@ -718,8 +718,6 @@ void mbedtls_test_err_add_check(int high, int low,
     }
 }
 
-#if defined(MBEDTLS_TEST_HOOKS)
 void (*mbedtls_test_hook_error_add)(int, int, const char *, int);
-#endif
 
 #endif /* MBEDTLS_TEST_HOOKS */
diff --git a/tf-psa-crypto/tests/suites/helpers.function b/tf-psa-crypto/tests/suites/helpers.function
index f28da70537..37ed61ac51 100644
--- a/tf-psa-crypto/tests/suites/helpers.function
+++ b/tf-psa-crypto/tests/suites/helpers.function
@@ -16,9 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(MBEDTLS_ERRORCOMMON_C)
 #include "mbedtls/error_common.h"
-#endif
 #include "mbedtls/platform.h"
 
 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
diff --git a/tf-psa-crypto/tests/suites/main_test.function b/tf-psa-crypto/tests/suites/main_test.function
index fd0656ba38..aebae1c967 100644
--- a/tf-psa-crypto/tests/suites/main_test.function
+++ b/tf-psa-crypto/tests/suites/main_test.function
@@ -232,9 +232,7 @@ int main(int argc, const char *argv[])
 #if defined(MBEDTLS_TEST_HOOKS)
     extern void (*mbedtls_test_hook_test_fail)(const char *test, int line, const char *file);
     mbedtls_test_hook_test_fail = &mbedtls_test_fail;
-#if defined(MBEDTLS_ERRORCOMMON_C)
     mbedtls_test_hook_error_add = &mbedtls_test_err_add_check;
-#endif
 #endif
 
     /* Try changing to the directory containing the executable, if