diff --git a/tests/include/drivers/keygen.h b/tests/include/test/drivers/keygen.h
similarity index 100%
rename from tests/include/drivers/keygen.h
rename to tests/include/test/drivers/keygen.h
diff --git a/tests/include/drivers/signature.h b/tests/include/test/drivers/signature.h
similarity index 100%
rename from tests/include/drivers/signature.h
rename to tests/include/test/drivers/signature.h
diff --git a/tests/include/drivers/test_driver.h b/tests/include/test/drivers/test_driver.h
similarity index 92%
rename from tests/include/drivers/test_driver.h
rename to tests/include/test/drivers/test_driver.h
index 98dded8..75135e0 100644
--- a/tests/include/drivers/test_driver.h
+++ b/tests/include/test/drivers/test_driver.h
@@ -22,7 +22,7 @@
 
 #define PSA_CRYPTO_TEST_DRIVER_LIFETIME 0x7fffff
 
-#include "drivers/signature.h"
-#include "drivers/keygen.h"
+#include "test/drivers/signature.h"
+#include "test/drivers/keygen.h"
 
 #endif /* PSA_CRYPTO_TEST_DRIVER_H */
diff --git a/tests/src/drivers/keygen.c b/tests/src/drivers/keygen.c
index d493ab3..f15a4bc 100644
--- a/tests/src/drivers/keygen.c
+++ b/tests/src/drivers/keygen.c
@@ -30,7 +30,7 @@
 #include "mbedtls/ecp.h"
 #include "mbedtls/error.h"
 
-#include "drivers/keygen.h"
+#include "test/drivers/keygen.h"
 
 #include "test/random.h"
 
diff --git a/tests/src/drivers/signature.c b/tests/src/drivers/signature.c
index 5299a96..028d24a 100644
--- a/tests/src/drivers/signature.c
+++ b/tests/src/drivers/signature.c
@@ -30,7 +30,7 @@
 #include "psa_crypto_core.h"
 #include "mbedtls/ecp.h"
 
-#include "drivers/signature.h"
+#include "test/drivers/signature.h"
 
 #include "mbedtls/md.h"
 #include "mbedtls/ecdsa.h"
diff --git a/tests/suites/test_suite_psa_crypto_driver_wrappers.function b/tests/suites/test_suite_psa_crypto_driver_wrappers.function
index c3830a7..9177982 100644
--- a/tests/suites/test_suite_psa_crypto_driver_wrappers.function
+++ b/tests/suites/test_suite_psa_crypto_driver_wrappers.function
@@ -1,7 +1,7 @@
 /* BEGIN_HEADER */
 #include "test/psa_crypto_helpers.h"
 
-#include "drivers/test_driver.h"
+#include "test/drivers/test_driver.h"
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES