diff --git a/tests/include/test/macros.h b/tests/include/test/macros.h
index 01eaff5c20..ae84ec2363 100644
--- a/tests/include/test/macros.h
+++ b/tests/include/test/macros.h
@@ -33,6 +33,7 @@
 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
 #include "mbedtls/memory_buffer_alloc.h"
 #endif
+#include "common.h"
 
 /**
  * \brief   This macro tests the expression passed to it as a test step or
diff --git a/tests/src/psa_crypto_helpers.c b/tests/src/psa_crypto_helpers.c
index 8f58d4dc16..77c2f89764 100644
--- a/tests/src/psa_crypto_helpers.c
+++ b/tests/src/psa_crypto_helpers.c
@@ -24,7 +24,6 @@
 #include <test/macros.h>
 #include <psa_crypto_slot_management.h>
 #include <test/psa_crypto_helpers.h>
-#include "common.h"
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)