diff --git a/tests/include/test/macros.h b/tests/include/test/macros.h
index a73e06fca..544db916d 100644
--- a/tests/include/test/macros.h
+++ b/tests/include/test/macros.h
@@ -21,7 +21,12 @@
 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
 #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
diff --git a/tests/programs/metatest.c b/tests/programs/metatest.c
index f39cb545d..750ef20aa 100644
--- a/tests/programs/metatest.c
+++ b/tests/programs/metatest.c
@@ -34,7 +34,6 @@
 #include "test/threading_helpers.h"
 #include "test/macros.h"
 #include "test/memory.h"
-#include "common.h"
 
 #include <stdio.h>
 #include <string.h>