diff --git a/tests/include/test/macros.h b/tests/include/test/macros.h
index 8bde989f8..66c8a137a 100644
--- a/tests/include/test/macros.h
+++ b/tests/include/test/macros.h
@@ -22,6 +22,12 @@
 #include "mbedtls/memory_buffer_alloc.h"
 #endif
 
+#if defined(TF_PSA_CRYPTO_VERSION_NUMBER)
+#include "tf_psa_crypto_common.h"
+#else
+#include "common.h"
+#endif
+
 /**
  * \brief   This macro tests the expression passed to it as a test step or
  *          individual test in a test case.