diff --git a/framework b/framework
index 9eeacb7125..df7024c723 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 9eeacb7125d6630a11e29d8a7aab5873b3638b6d
+Subproject commit df7024c72357610b3aa4194ae8e10ede989ed0fd
diff --git a/tests/suites/helpers.function b/tf-psa-crypto/tests/suites/helpers.function
similarity index 100%
rename from tests/suites/helpers.function
rename to tf-psa-crypto/tests/suites/helpers.function
diff --git a/tests/suites/host_test.function b/tf-psa-crypto/tests/suites/host_test.function
similarity index 100%
rename from tests/suites/host_test.function
rename to tf-psa-crypto/tests/suites/host_test.function
diff --git a/tests/suites/main_test.function b/tf-psa-crypto/tests/suites/main_test.function
similarity index 100%
rename from tests/suites/main_test.function
rename to tf-psa-crypto/tests/suites/main_test.function
diff --git a/tests/suites/test_suite_aes.cbc.data b/tf-psa-crypto/tests/suites/test_suite_aes.cbc.data
similarity index 100%
rename from tests/suites/test_suite_aes.cbc.data
rename to tf-psa-crypto/tests/suites/test_suite_aes.cbc.data
diff --git a/tests/suites/test_suite_aes.cfb.data b/tf-psa-crypto/tests/suites/test_suite_aes.cfb.data
similarity index 100%
rename from tests/suites/test_suite_aes.cfb.data
rename to tf-psa-crypto/tests/suites/test_suite_aes.cfb.data
diff --git a/tests/suites/test_suite_aes.ctr.data b/tf-psa-crypto/tests/suites/test_suite_aes.ctr.data
similarity index 100%
rename from tests/suites/test_suite_aes.ctr.data
rename to tf-psa-crypto/tests/suites/test_suite_aes.ctr.data
diff --git a/tests/suites/test_suite_aes.ecb.data b/tf-psa-crypto/tests/suites/test_suite_aes.ecb.data
similarity index 100%
rename from tests/suites/test_suite_aes.ecb.data
rename to tf-psa-crypto/tests/suites/test_suite_aes.ecb.data
diff --git a/tests/suites/test_suite_aes.function b/tf-psa-crypto/tests/suites/test_suite_aes.function
similarity index 100%
rename from tests/suites/test_suite_aes.function
rename to tf-psa-crypto/tests/suites/test_suite_aes.function
diff --git a/tests/suites/test_suite_aes.ofb.data b/tf-psa-crypto/tests/suites/test_suite_aes.ofb.data
similarity index 100%
rename from tests/suites/test_suite_aes.ofb.data
rename to tf-psa-crypto/tests/suites/test_suite_aes.ofb.data
diff --git a/tests/suites/test_suite_aes.rest.data b/tf-psa-crypto/tests/suites/test_suite_aes.rest.data
similarity index 100%
rename from tests/suites/test_suite_aes.rest.data
rename to tf-psa-crypto/tests/suites/test_suite_aes.rest.data
diff --git a/tests/suites/test_suite_aes.xts.data b/tf-psa-crypto/tests/suites/test_suite_aes.xts.data
similarity index 100%
rename from tests/suites/test_suite_aes.xts.data
rename to tf-psa-crypto/tests/suites/test_suite_aes.xts.data
diff --git a/tests/suites/test_suite_alignment.data b/tf-psa-crypto/tests/suites/test_suite_alignment.data
similarity index 100%
rename from tests/suites/test_suite_alignment.data
rename to tf-psa-crypto/tests/suites/test_suite_alignment.data
diff --git a/tests/suites/test_suite_alignment.function b/tf-psa-crypto/tests/suites/test_suite_alignment.function
similarity index 100%
rename from tests/suites/test_suite_alignment.function
rename to tf-psa-crypto/tests/suites/test_suite_alignment.function
diff --git a/tests/suites/test_suite_aria.data b/tf-psa-crypto/tests/suites/test_suite_aria.data
similarity index 100%
rename from tests/suites/test_suite_aria.data
rename to tf-psa-crypto/tests/suites/test_suite_aria.data
diff --git a/tests/suites/test_suite_aria.function b/tf-psa-crypto/tests/suites/test_suite_aria.function
similarity index 100%
rename from tests/suites/test_suite_aria.function
rename to tf-psa-crypto/tests/suites/test_suite_aria.function
diff --git a/tests/suites/test_suite_asn1parse.data b/tf-psa-crypto/tests/suites/test_suite_asn1parse.data
similarity index 100%
rename from tests/suites/test_suite_asn1parse.data
rename to tf-psa-crypto/tests/suites/test_suite_asn1parse.data
diff --git a/tests/suites/test_suite_asn1parse.function b/tf-psa-crypto/tests/suites/test_suite_asn1parse.function
similarity index 100%
rename from tests/suites/test_suite_asn1parse.function
rename to tf-psa-crypto/tests/suites/test_suite_asn1parse.function
diff --git a/tests/suites/test_suite_asn1write.data b/tf-psa-crypto/tests/suites/test_suite_asn1write.data
similarity index 100%
rename from tests/suites/test_suite_asn1write.data
rename to tf-psa-crypto/tests/suites/test_suite_asn1write.data
diff --git a/tests/suites/test_suite_asn1write.function b/tf-psa-crypto/tests/suites/test_suite_asn1write.function
similarity index 100%
rename from tests/suites/test_suite_asn1write.function
rename to tf-psa-crypto/tests/suites/test_suite_asn1write.function
diff --git a/tests/suites/test_suite_base64.data b/tf-psa-crypto/tests/suites/test_suite_base64.data
similarity index 100%
rename from tests/suites/test_suite_base64.data
rename to tf-psa-crypto/tests/suites/test_suite_base64.data
diff --git a/tests/suites/test_suite_base64.function b/tf-psa-crypto/tests/suites/test_suite_base64.function
similarity index 100%
rename from tests/suites/test_suite_base64.function
rename to tf-psa-crypto/tests/suites/test_suite_base64.function
diff --git a/tests/suites/test_suite_bignum.function b/tf-psa-crypto/tests/suites/test_suite_bignum.function
similarity index 100%
rename from tests/suites/test_suite_bignum.function
rename to tf-psa-crypto/tests/suites/test_suite_bignum.function
diff --git a/tests/suites/test_suite_bignum.misc.data b/tf-psa-crypto/tests/suites/test_suite_bignum.misc.data
similarity index 100%
rename from tests/suites/test_suite_bignum.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_bignum.misc.data
diff --git a/tests/suites/test_suite_bignum_core.function b/tf-psa-crypto/tests/suites/test_suite_bignum_core.function
similarity index 100%
rename from tests/suites/test_suite_bignum_core.function
rename to tf-psa-crypto/tests/suites/test_suite_bignum_core.function
diff --git a/tests/suites/test_suite_bignum_core.misc.data b/tf-psa-crypto/tests/suites/test_suite_bignum_core.misc.data
similarity index 100%
rename from tests/suites/test_suite_bignum_core.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_bignum_core.misc.data
diff --git a/tests/suites/test_suite_bignum_mod.function b/tf-psa-crypto/tests/suites/test_suite_bignum_mod.function
similarity index 100%
rename from tests/suites/test_suite_bignum_mod.function
rename to tf-psa-crypto/tests/suites/test_suite_bignum_mod.function
diff --git a/tests/suites/test_suite_bignum_mod.misc.data b/tf-psa-crypto/tests/suites/test_suite_bignum_mod.misc.data
similarity index 100%
rename from tests/suites/test_suite_bignum_mod.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_bignum_mod.misc.data
diff --git a/tests/suites/test_suite_bignum_mod_raw.data b/tf-psa-crypto/tests/suites/test_suite_bignum_mod_raw.data
similarity index 100%
rename from tests/suites/test_suite_bignum_mod_raw.data
rename to tf-psa-crypto/tests/suites/test_suite_bignum_mod_raw.data
diff --git a/tests/suites/test_suite_bignum_mod_raw.function b/tf-psa-crypto/tests/suites/test_suite_bignum_mod_raw.function
similarity index 100%
rename from tests/suites/test_suite_bignum_mod_raw.function
rename to tf-psa-crypto/tests/suites/test_suite_bignum_mod_raw.function
diff --git a/tests/suites/test_suite_bignum_random.data b/tf-psa-crypto/tests/suites/test_suite_bignum_random.data
similarity index 100%
rename from tests/suites/test_suite_bignum_random.data
rename to tf-psa-crypto/tests/suites/test_suite_bignum_random.data
diff --git a/tests/suites/test_suite_bignum_random.function b/tf-psa-crypto/tests/suites/test_suite_bignum_random.function
similarity index 100%
rename from tests/suites/test_suite_bignum_random.function
rename to tf-psa-crypto/tests/suites/test_suite_bignum_random.function
diff --git a/tests/suites/test_suite_block_cipher.data b/tf-psa-crypto/tests/suites/test_suite_block_cipher.data
similarity index 100%
rename from tests/suites/test_suite_block_cipher.data
rename to tf-psa-crypto/tests/suites/test_suite_block_cipher.data
diff --git a/tests/suites/test_suite_block_cipher.function b/tf-psa-crypto/tests/suites/test_suite_block_cipher.function
similarity index 100%
rename from tests/suites/test_suite_block_cipher.function
rename to tf-psa-crypto/tests/suites/test_suite_block_cipher.function
diff --git a/tests/suites/test_suite_block_cipher.psa.data b/tf-psa-crypto/tests/suites/test_suite_block_cipher.psa.data
similarity index 100%
rename from tests/suites/test_suite_block_cipher.psa.data
rename to tf-psa-crypto/tests/suites/test_suite_block_cipher.psa.data
diff --git a/tests/suites/test_suite_camellia.data b/tf-psa-crypto/tests/suites/test_suite_camellia.data
similarity index 100%
rename from tests/suites/test_suite_camellia.data
rename to tf-psa-crypto/tests/suites/test_suite_camellia.data
diff --git a/tests/suites/test_suite_camellia.function b/tf-psa-crypto/tests/suites/test_suite_camellia.function
similarity index 100%
rename from tests/suites/test_suite_camellia.function
rename to tf-psa-crypto/tests/suites/test_suite_camellia.function
diff --git a/tests/suites/test_suite_ccm.data b/tf-psa-crypto/tests/suites/test_suite_ccm.data
similarity index 100%
rename from tests/suites/test_suite_ccm.data
rename to tf-psa-crypto/tests/suites/test_suite_ccm.data
diff --git a/tests/suites/test_suite_ccm.function b/tf-psa-crypto/tests/suites/test_suite_ccm.function
similarity index 100%
rename from tests/suites/test_suite_ccm.function
rename to tf-psa-crypto/tests/suites/test_suite_ccm.function
diff --git a/tests/suites/test_suite_chacha20.data b/tf-psa-crypto/tests/suites/test_suite_chacha20.data
similarity index 100%
rename from tests/suites/test_suite_chacha20.data
rename to tf-psa-crypto/tests/suites/test_suite_chacha20.data
diff --git a/tests/suites/test_suite_chacha20.function b/tf-psa-crypto/tests/suites/test_suite_chacha20.function
similarity index 100%
rename from tests/suites/test_suite_chacha20.function
rename to tf-psa-crypto/tests/suites/test_suite_chacha20.function
diff --git a/tests/suites/test_suite_chachapoly.data b/tf-psa-crypto/tests/suites/test_suite_chachapoly.data
similarity index 100%
rename from tests/suites/test_suite_chachapoly.data
rename to tf-psa-crypto/tests/suites/test_suite_chachapoly.data
diff --git a/tests/suites/test_suite_chachapoly.function b/tf-psa-crypto/tests/suites/test_suite_chachapoly.function
similarity index 100%
rename from tests/suites/test_suite_chachapoly.function
rename to tf-psa-crypto/tests/suites/test_suite_chachapoly.function
diff --git a/tests/suites/test_suite_cipher.aes.data b/tf-psa-crypto/tests/suites/test_suite_cipher.aes.data
similarity index 100%
rename from tests/suites/test_suite_cipher.aes.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.aes.data
diff --git a/tests/suites/test_suite_cipher.aria.data b/tf-psa-crypto/tests/suites/test_suite_cipher.aria.data
similarity index 100%
rename from tests/suites/test_suite_cipher.aria.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.aria.data
diff --git a/tests/suites/test_suite_cipher.camellia.data b/tf-psa-crypto/tests/suites/test_suite_cipher.camellia.data
similarity index 100%
rename from tests/suites/test_suite_cipher.camellia.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.camellia.data
diff --git a/tests/suites/test_suite_cipher.ccm.data b/tf-psa-crypto/tests/suites/test_suite_cipher.ccm.data
similarity index 100%
rename from tests/suites/test_suite_cipher.ccm.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.ccm.data
diff --git a/tests/suites/test_suite_cipher.chacha20.data b/tf-psa-crypto/tests/suites/test_suite_cipher.chacha20.data
similarity index 100%
rename from tests/suites/test_suite_cipher.chacha20.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.chacha20.data
diff --git a/tests/suites/test_suite_cipher.chachapoly.data b/tf-psa-crypto/tests/suites/test_suite_cipher.chachapoly.data
similarity index 100%
rename from tests/suites/test_suite_cipher.chachapoly.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.chachapoly.data
diff --git a/tests/suites/test_suite_cipher.des.data b/tf-psa-crypto/tests/suites/test_suite_cipher.des.data
similarity index 100%
rename from tests/suites/test_suite_cipher.des.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.des.data
diff --git a/tests/suites/test_suite_cipher.function b/tf-psa-crypto/tests/suites/test_suite_cipher.function
similarity index 100%
rename from tests/suites/test_suite_cipher.function
rename to tf-psa-crypto/tests/suites/test_suite_cipher.function
diff --git a/tests/suites/test_suite_cipher.gcm.data b/tf-psa-crypto/tests/suites/test_suite_cipher.gcm.data
similarity index 100%
rename from tests/suites/test_suite_cipher.gcm.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.gcm.data
diff --git a/tests/suites/test_suite_cipher.misc.data b/tf-psa-crypto/tests/suites/test_suite_cipher.misc.data
similarity index 100%
rename from tests/suites/test_suite_cipher.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.misc.data
diff --git a/tests/suites/test_suite_cipher.nist_kw.data b/tf-psa-crypto/tests/suites/test_suite_cipher.nist_kw.data
similarity index 100%
rename from tests/suites/test_suite_cipher.nist_kw.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.nist_kw.data
diff --git a/tests/suites/test_suite_cipher.null.data b/tf-psa-crypto/tests/suites/test_suite_cipher.null.data
similarity index 100%
rename from tests/suites/test_suite_cipher.null.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.null.data
diff --git a/tests/suites/test_suite_cipher.padding.data b/tf-psa-crypto/tests/suites/test_suite_cipher.padding.data
similarity index 100%
rename from tests/suites/test_suite_cipher.padding.data
rename to tf-psa-crypto/tests/suites/test_suite_cipher.padding.data
diff --git a/tests/suites/test_suite_cmac.data b/tf-psa-crypto/tests/suites/test_suite_cmac.data
similarity index 100%
rename from tests/suites/test_suite_cmac.data
rename to tf-psa-crypto/tests/suites/test_suite_cmac.data
diff --git a/tests/suites/test_suite_cmac.function b/tf-psa-crypto/tests/suites/test_suite_cmac.function
similarity index 100%
rename from tests/suites/test_suite_cmac.function
rename to tf-psa-crypto/tests/suites/test_suite_cmac.function
diff --git a/tests/suites/test_suite_common.data b/tf-psa-crypto/tests/suites/test_suite_common.data
similarity index 100%
rename from tests/suites/test_suite_common.data
rename to tf-psa-crypto/tests/suites/test_suite_common.data
diff --git a/tests/suites/test_suite_common.function b/tf-psa-crypto/tests/suites/test_suite_common.function
similarity index 100%
rename from tests/suites/test_suite_common.function
rename to tf-psa-crypto/tests/suites/test_suite_common.function
diff --git a/tests/suites/test_suite_config.crypto_combinations.data b/tf-psa-crypto/tests/suites/test_suite_config.crypto_combinations.data
similarity index 100%
rename from tests/suites/test_suite_config.crypto_combinations.data
rename to tf-psa-crypto/tests/suites/test_suite_config.crypto_combinations.data
diff --git a/tf-psa-crypto/tests/suites/test_suite_config.function b/tf-psa-crypto/tests/suites/test_suite_config.function
new file mode 100644
index 0000000000..9e9dd01990
--- /dev/null
+++ b/tf-psa-crypto/tests/suites/test_suite_config.function
@@ -0,0 +1,14 @@
+/* BEGIN_HEADER */
+
+/* END_HEADER */
+
+/* BEGIN_CASE */
+/* This test case always passes. It is intended solely for configuration
+ * reporting in the outcome file. Write test cases using this function
+ * with dependencies to record in which configurations the dependencies
+ * are met. */
+void pass()
+{
+    goto exit;
+}
+/* END_CASE */
diff --git a/tests/suites/test_suite_config.psa_combinations.data b/tf-psa-crypto/tests/suites/test_suite_config.psa_combinations.data
similarity index 100%
rename from tests/suites/test_suite_config.psa_combinations.data
rename to tf-psa-crypto/tests/suites/test_suite_config.psa_combinations.data
diff --git a/tests/suites/test_suite_constant_time.data b/tf-psa-crypto/tests/suites/test_suite_constant_time.data
similarity index 100%
rename from tests/suites/test_suite_constant_time.data
rename to tf-psa-crypto/tests/suites/test_suite_constant_time.data
diff --git a/tests/suites/test_suite_constant_time.function b/tf-psa-crypto/tests/suites/test_suite_constant_time.function
similarity index 100%
rename from tests/suites/test_suite_constant_time.function
rename to tf-psa-crypto/tests/suites/test_suite_constant_time.function
diff --git a/tests/suites/test_suite_constant_time_hmac.data b/tf-psa-crypto/tests/suites/test_suite_constant_time_hmac.data
similarity index 100%
rename from tests/suites/test_suite_constant_time_hmac.data
rename to tf-psa-crypto/tests/suites/test_suite_constant_time_hmac.data
diff --git a/tests/suites/test_suite_constant_time_hmac.function b/tf-psa-crypto/tests/suites/test_suite_constant_time_hmac.function
similarity index 100%
rename from tests/suites/test_suite_constant_time_hmac.function
rename to tf-psa-crypto/tests/suites/test_suite_constant_time_hmac.function
diff --git a/tests/suites/test_suite_ctr_drbg.data b/tf-psa-crypto/tests/suites/test_suite_ctr_drbg.data
similarity index 100%
rename from tests/suites/test_suite_ctr_drbg.data
rename to tf-psa-crypto/tests/suites/test_suite_ctr_drbg.data
diff --git a/tests/suites/test_suite_ctr_drbg.function b/tf-psa-crypto/tests/suites/test_suite_ctr_drbg.function
similarity index 100%
rename from tests/suites/test_suite_ctr_drbg.function
rename to tf-psa-crypto/tests/suites/test_suite_ctr_drbg.function
diff --git a/tests/suites/test_suite_des.data b/tf-psa-crypto/tests/suites/test_suite_des.data
similarity index 100%
rename from tests/suites/test_suite_des.data
rename to tf-psa-crypto/tests/suites/test_suite_des.data
diff --git a/tests/suites/test_suite_des.function b/tf-psa-crypto/tests/suites/test_suite_des.function
similarity index 100%
rename from tests/suites/test_suite_des.function
rename to tf-psa-crypto/tests/suites/test_suite_des.function
diff --git a/tests/suites/test_suite_dhm.data b/tf-psa-crypto/tests/suites/test_suite_dhm.data
similarity index 100%
rename from tests/suites/test_suite_dhm.data
rename to tf-psa-crypto/tests/suites/test_suite_dhm.data
diff --git a/tests/suites/test_suite_dhm.function b/tf-psa-crypto/tests/suites/test_suite_dhm.function
similarity index 100%
rename from tests/suites/test_suite_dhm.function
rename to tf-psa-crypto/tests/suites/test_suite_dhm.function
diff --git a/tests/suites/test_suite_ecdh.data b/tf-psa-crypto/tests/suites/test_suite_ecdh.data
similarity index 100%
rename from tests/suites/test_suite_ecdh.data
rename to tf-psa-crypto/tests/suites/test_suite_ecdh.data
diff --git a/tests/suites/test_suite_ecdh.function b/tf-psa-crypto/tests/suites/test_suite_ecdh.function
similarity index 100%
rename from tests/suites/test_suite_ecdh.function
rename to tf-psa-crypto/tests/suites/test_suite_ecdh.function
diff --git a/tests/suites/test_suite_ecdsa.data b/tf-psa-crypto/tests/suites/test_suite_ecdsa.data
similarity index 100%
rename from tests/suites/test_suite_ecdsa.data
rename to tf-psa-crypto/tests/suites/test_suite_ecdsa.data
diff --git a/tests/suites/test_suite_ecdsa.function b/tf-psa-crypto/tests/suites/test_suite_ecdsa.function
similarity index 100%
rename from tests/suites/test_suite_ecdsa.function
rename to tf-psa-crypto/tests/suites/test_suite_ecdsa.function
diff --git a/tests/suites/test_suite_ecjpake.data b/tf-psa-crypto/tests/suites/test_suite_ecjpake.data
similarity index 100%
rename from tests/suites/test_suite_ecjpake.data
rename to tf-psa-crypto/tests/suites/test_suite_ecjpake.data
diff --git a/tests/suites/test_suite_ecjpake.function b/tf-psa-crypto/tests/suites/test_suite_ecjpake.function
similarity index 100%
rename from tests/suites/test_suite_ecjpake.function
rename to tf-psa-crypto/tests/suites/test_suite_ecjpake.function
diff --git a/tests/suites/test_suite_ecp.data b/tf-psa-crypto/tests/suites/test_suite_ecp.data
similarity index 100%
rename from tests/suites/test_suite_ecp.data
rename to tf-psa-crypto/tests/suites/test_suite_ecp.data
diff --git a/tests/suites/test_suite_ecp.function b/tf-psa-crypto/tests/suites/test_suite_ecp.function
similarity index 100%
rename from tests/suites/test_suite_ecp.function
rename to tf-psa-crypto/tests/suites/test_suite_ecp.function
diff --git a/tests/suites/test_suite_entropy.data b/tf-psa-crypto/tests/suites/test_suite_entropy.data
similarity index 100%
rename from tests/suites/test_suite_entropy.data
rename to tf-psa-crypto/tests/suites/test_suite_entropy.data
diff --git a/tests/suites/test_suite_entropy.function b/tf-psa-crypto/tests/suites/test_suite_entropy.function
similarity index 100%
rename from tests/suites/test_suite_entropy.function
rename to tf-psa-crypto/tests/suites/test_suite_entropy.function
diff --git a/tests/suites/test_suite_error.data b/tf-psa-crypto/tests/suites/test_suite_error.data
similarity index 100%
rename from tests/suites/test_suite_error.data
rename to tf-psa-crypto/tests/suites/test_suite_error.data
diff --git a/tests/suites/test_suite_error.function b/tf-psa-crypto/tests/suites/test_suite_error.function
similarity index 100%
rename from tests/suites/test_suite_error.function
rename to tf-psa-crypto/tests/suites/test_suite_error.function
diff --git a/tests/suites/test_suite_gcm.aes128_de.data b/tf-psa-crypto/tests/suites/test_suite_gcm.aes128_de.data
similarity index 100%
rename from tests/suites/test_suite_gcm.aes128_de.data
rename to tf-psa-crypto/tests/suites/test_suite_gcm.aes128_de.data
diff --git a/tests/suites/test_suite_gcm.aes128_en.data b/tf-psa-crypto/tests/suites/test_suite_gcm.aes128_en.data
similarity index 100%
rename from tests/suites/test_suite_gcm.aes128_en.data
rename to tf-psa-crypto/tests/suites/test_suite_gcm.aes128_en.data
diff --git a/tests/suites/test_suite_gcm.aes192_de.data b/tf-psa-crypto/tests/suites/test_suite_gcm.aes192_de.data
similarity index 100%
rename from tests/suites/test_suite_gcm.aes192_de.data
rename to tf-psa-crypto/tests/suites/test_suite_gcm.aes192_de.data
diff --git a/tests/suites/test_suite_gcm.aes192_en.data b/tf-psa-crypto/tests/suites/test_suite_gcm.aes192_en.data
similarity index 100%
rename from tests/suites/test_suite_gcm.aes192_en.data
rename to tf-psa-crypto/tests/suites/test_suite_gcm.aes192_en.data
diff --git a/tests/suites/test_suite_gcm.aes256_de.data b/tf-psa-crypto/tests/suites/test_suite_gcm.aes256_de.data
similarity index 100%
rename from tests/suites/test_suite_gcm.aes256_de.data
rename to tf-psa-crypto/tests/suites/test_suite_gcm.aes256_de.data
diff --git a/tests/suites/test_suite_gcm.aes256_en.data b/tf-psa-crypto/tests/suites/test_suite_gcm.aes256_en.data
similarity index 100%
rename from tests/suites/test_suite_gcm.aes256_en.data
rename to tf-psa-crypto/tests/suites/test_suite_gcm.aes256_en.data
diff --git a/tests/suites/test_suite_gcm.camellia.data b/tf-psa-crypto/tests/suites/test_suite_gcm.camellia.data
similarity index 100%
rename from tests/suites/test_suite_gcm.camellia.data
rename to tf-psa-crypto/tests/suites/test_suite_gcm.camellia.data
diff --git a/tests/suites/test_suite_gcm.function b/tf-psa-crypto/tests/suites/test_suite_gcm.function
similarity index 100%
rename from tests/suites/test_suite_gcm.function
rename to tf-psa-crypto/tests/suites/test_suite_gcm.function
diff --git a/tests/suites/test_suite_gcm.misc.data b/tf-psa-crypto/tests/suites/test_suite_gcm.misc.data
similarity index 100%
rename from tests/suites/test_suite_gcm.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_gcm.misc.data
diff --git a/tests/suites/test_suite_hkdf.data b/tf-psa-crypto/tests/suites/test_suite_hkdf.data
similarity index 100%
rename from tests/suites/test_suite_hkdf.data
rename to tf-psa-crypto/tests/suites/test_suite_hkdf.data
diff --git a/tests/suites/test_suite_hkdf.function b/tf-psa-crypto/tests/suites/test_suite_hkdf.function
similarity index 100%
rename from tests/suites/test_suite_hkdf.function
rename to tf-psa-crypto/tests/suites/test_suite_hkdf.function
diff --git a/tests/suites/test_suite_hmac_drbg.function b/tf-psa-crypto/tests/suites/test_suite_hmac_drbg.function
similarity index 100%
rename from tests/suites/test_suite_hmac_drbg.function
rename to tf-psa-crypto/tests/suites/test_suite_hmac_drbg.function
diff --git a/tests/suites/test_suite_hmac_drbg.misc.data b/tf-psa-crypto/tests/suites/test_suite_hmac_drbg.misc.data
similarity index 100%
rename from tests/suites/test_suite_hmac_drbg.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_hmac_drbg.misc.data
diff --git a/tests/suites/test_suite_hmac_drbg.no_reseed.data b/tf-psa-crypto/tests/suites/test_suite_hmac_drbg.no_reseed.data
similarity index 100%
rename from tests/suites/test_suite_hmac_drbg.no_reseed.data
rename to tf-psa-crypto/tests/suites/test_suite_hmac_drbg.no_reseed.data
diff --git a/tests/suites/test_suite_hmac_drbg.nopr.data b/tf-psa-crypto/tests/suites/test_suite_hmac_drbg.nopr.data
similarity index 100%
rename from tests/suites/test_suite_hmac_drbg.nopr.data
rename to tf-psa-crypto/tests/suites/test_suite_hmac_drbg.nopr.data
diff --git a/tests/suites/test_suite_hmac_drbg.pr.data b/tf-psa-crypto/tests/suites/test_suite_hmac_drbg.pr.data
similarity index 100%
rename from tests/suites/test_suite_hmac_drbg.pr.data
rename to tf-psa-crypto/tests/suites/test_suite_hmac_drbg.pr.data
diff --git a/tests/suites/test_suite_lmots.data b/tf-psa-crypto/tests/suites/test_suite_lmots.data
similarity index 100%
rename from tests/suites/test_suite_lmots.data
rename to tf-psa-crypto/tests/suites/test_suite_lmots.data
diff --git a/tests/suites/test_suite_lmots.function b/tf-psa-crypto/tests/suites/test_suite_lmots.function
similarity index 100%
rename from tests/suites/test_suite_lmots.function
rename to tf-psa-crypto/tests/suites/test_suite_lmots.function
diff --git a/tests/suites/test_suite_lms.data b/tf-psa-crypto/tests/suites/test_suite_lms.data
similarity index 100%
rename from tests/suites/test_suite_lms.data
rename to tf-psa-crypto/tests/suites/test_suite_lms.data
diff --git a/tests/suites/test_suite_lms.function b/tf-psa-crypto/tests/suites/test_suite_lms.function
similarity index 100%
rename from tests/suites/test_suite_lms.function
rename to tf-psa-crypto/tests/suites/test_suite_lms.function
diff --git a/tests/suites/test_suite_md.data b/tf-psa-crypto/tests/suites/test_suite_md.data
similarity index 100%
rename from tests/suites/test_suite_md.data
rename to tf-psa-crypto/tests/suites/test_suite_md.data
diff --git a/tests/suites/test_suite_md.function b/tf-psa-crypto/tests/suites/test_suite_md.function
similarity index 100%
rename from tests/suites/test_suite_md.function
rename to tf-psa-crypto/tests/suites/test_suite_md.function
diff --git a/tests/suites/test_suite_md.psa.data b/tf-psa-crypto/tests/suites/test_suite_md.psa.data
similarity index 100%
rename from tests/suites/test_suite_md.psa.data
rename to tf-psa-crypto/tests/suites/test_suite_md.psa.data
diff --git a/tests/suites/test_suite_mdx.data b/tf-psa-crypto/tests/suites/test_suite_mdx.data
similarity index 100%
rename from tests/suites/test_suite_mdx.data
rename to tf-psa-crypto/tests/suites/test_suite_mdx.data
diff --git a/tests/suites/test_suite_mdx.function b/tf-psa-crypto/tests/suites/test_suite_mdx.function
similarity index 100%
rename from tests/suites/test_suite_mdx.function
rename to tf-psa-crypto/tests/suites/test_suite_mdx.function
diff --git a/tests/suites/test_suite_memory_buffer_alloc.data b/tf-psa-crypto/tests/suites/test_suite_memory_buffer_alloc.data
similarity index 100%
rename from tests/suites/test_suite_memory_buffer_alloc.data
rename to tf-psa-crypto/tests/suites/test_suite_memory_buffer_alloc.data
diff --git a/tests/suites/test_suite_memory_buffer_alloc.function b/tf-psa-crypto/tests/suites/test_suite_memory_buffer_alloc.function
similarity index 100%
rename from tests/suites/test_suite_memory_buffer_alloc.function
rename to tf-psa-crypto/tests/suites/test_suite_memory_buffer_alloc.function
diff --git a/tests/suites/test_suite_nist_kw.data b/tf-psa-crypto/tests/suites/test_suite_nist_kw.data
similarity index 100%
rename from tests/suites/test_suite_nist_kw.data
rename to tf-psa-crypto/tests/suites/test_suite_nist_kw.data
diff --git a/tests/suites/test_suite_nist_kw.function b/tf-psa-crypto/tests/suites/test_suite_nist_kw.function
similarity index 100%
rename from tests/suites/test_suite_nist_kw.function
rename to tf-psa-crypto/tests/suites/test_suite_nist_kw.function
diff --git a/tests/suites/test_suite_oid.data b/tf-psa-crypto/tests/suites/test_suite_oid.data
similarity index 100%
rename from tests/suites/test_suite_oid.data
rename to tf-psa-crypto/tests/suites/test_suite_oid.data
diff --git a/tests/suites/test_suite_oid.function b/tf-psa-crypto/tests/suites/test_suite_oid.function
similarity index 100%
rename from tests/suites/test_suite_oid.function
rename to tf-psa-crypto/tests/suites/test_suite_oid.function
diff --git a/tests/suites/test_suite_pem.data b/tf-psa-crypto/tests/suites/test_suite_pem.data
similarity index 100%
rename from tests/suites/test_suite_pem.data
rename to tf-psa-crypto/tests/suites/test_suite_pem.data
diff --git a/tests/suites/test_suite_pem.function b/tf-psa-crypto/tests/suites/test_suite_pem.function
similarity index 100%
rename from tests/suites/test_suite_pem.function
rename to tf-psa-crypto/tests/suites/test_suite_pem.function
diff --git a/tests/suites/test_suite_pk.data b/tf-psa-crypto/tests/suites/test_suite_pk.data
similarity index 100%
rename from tests/suites/test_suite_pk.data
rename to tf-psa-crypto/tests/suites/test_suite_pk.data
diff --git a/tests/suites/test_suite_pk.function b/tf-psa-crypto/tests/suites/test_suite_pk.function
similarity index 100%
rename from tests/suites/test_suite_pk.function
rename to tf-psa-crypto/tests/suites/test_suite_pk.function
diff --git a/tests/suites/test_suite_pkcs12.data b/tf-psa-crypto/tests/suites/test_suite_pkcs12.data
similarity index 100%
rename from tests/suites/test_suite_pkcs12.data
rename to tf-psa-crypto/tests/suites/test_suite_pkcs12.data
diff --git a/tests/suites/test_suite_pkcs12.function b/tf-psa-crypto/tests/suites/test_suite_pkcs12.function
similarity index 100%
rename from tests/suites/test_suite_pkcs12.function
rename to tf-psa-crypto/tests/suites/test_suite_pkcs12.function
diff --git a/tests/suites/test_suite_pkcs1_v15.data b/tf-psa-crypto/tests/suites/test_suite_pkcs1_v15.data
similarity index 100%
rename from tests/suites/test_suite_pkcs1_v15.data
rename to tf-psa-crypto/tests/suites/test_suite_pkcs1_v15.data
diff --git a/tests/suites/test_suite_pkcs1_v15.function b/tf-psa-crypto/tests/suites/test_suite_pkcs1_v15.function
similarity index 100%
rename from tests/suites/test_suite_pkcs1_v15.function
rename to tf-psa-crypto/tests/suites/test_suite_pkcs1_v15.function
diff --git a/tests/suites/test_suite_pkcs1_v21.data b/tf-psa-crypto/tests/suites/test_suite_pkcs1_v21.data
similarity index 100%
rename from tests/suites/test_suite_pkcs1_v21.data
rename to tf-psa-crypto/tests/suites/test_suite_pkcs1_v21.data
diff --git a/tests/suites/test_suite_pkcs1_v21.function b/tf-psa-crypto/tests/suites/test_suite_pkcs1_v21.function
similarity index 100%
rename from tests/suites/test_suite_pkcs1_v21.function
rename to tf-psa-crypto/tests/suites/test_suite_pkcs1_v21.function
diff --git a/tests/suites/test_suite_pkcs5.data b/tf-psa-crypto/tests/suites/test_suite_pkcs5.data
similarity index 100%
rename from tests/suites/test_suite_pkcs5.data
rename to tf-psa-crypto/tests/suites/test_suite_pkcs5.data
diff --git a/tests/suites/test_suite_pkcs5.function b/tf-psa-crypto/tests/suites/test_suite_pkcs5.function
similarity index 100%
rename from tests/suites/test_suite_pkcs5.function
rename to tf-psa-crypto/tests/suites/test_suite_pkcs5.function
diff --git a/tests/suites/test_suite_pkparse.data b/tf-psa-crypto/tests/suites/test_suite_pkparse.data
similarity index 100%
rename from tests/suites/test_suite_pkparse.data
rename to tf-psa-crypto/tests/suites/test_suite_pkparse.data
diff --git a/tests/suites/test_suite_pkparse.function b/tf-psa-crypto/tests/suites/test_suite_pkparse.function
similarity index 100%
rename from tests/suites/test_suite_pkparse.function
rename to tf-psa-crypto/tests/suites/test_suite_pkparse.function
diff --git a/tests/suites/test_suite_pkwrite.data b/tf-psa-crypto/tests/suites/test_suite_pkwrite.data
similarity index 100%
rename from tests/suites/test_suite_pkwrite.data
rename to tf-psa-crypto/tests/suites/test_suite_pkwrite.data
diff --git a/tests/suites/test_suite_pkwrite.function b/tf-psa-crypto/tests/suites/test_suite_pkwrite.function
similarity index 100%
rename from tests/suites/test_suite_pkwrite.function
rename to tf-psa-crypto/tests/suites/test_suite_pkwrite.function
diff --git a/tests/suites/test_suite_platform.data b/tf-psa-crypto/tests/suites/test_suite_platform.data
similarity index 100%
rename from tests/suites/test_suite_platform.data
rename to tf-psa-crypto/tests/suites/test_suite_platform.data
diff --git a/tests/suites/test_suite_platform.function b/tf-psa-crypto/tests/suites/test_suite_platform.function
similarity index 100%
rename from tests/suites/test_suite_platform.function
rename to tf-psa-crypto/tests/suites/test_suite_platform.function
diff --git a/tests/suites/test_suite_platform_printf.data b/tf-psa-crypto/tests/suites/test_suite_platform_printf.data
similarity index 100%
rename from tests/suites/test_suite_platform_printf.data
rename to tf-psa-crypto/tests/suites/test_suite_platform_printf.data
diff --git a/tests/suites/test_suite_platform_printf.function b/tf-psa-crypto/tests/suites/test_suite_platform_printf.function
similarity index 100%
rename from tests/suites/test_suite_platform_printf.function
rename to tf-psa-crypto/tests/suites/test_suite_platform_printf.function
diff --git a/tests/suites/test_suite_platform_util.data b/tf-psa-crypto/tests/suites/test_suite_platform_util.data
similarity index 100%
rename from tests/suites/test_suite_platform_util.data
rename to tf-psa-crypto/tests/suites/test_suite_platform_util.data
diff --git a/tests/suites/test_suite_platform_util.function b/tf-psa-crypto/tests/suites/test_suite_platform_util.function
similarity index 100%
rename from tests/suites/test_suite_platform_util.function
rename to tf-psa-crypto/tests/suites/test_suite_platform_util.function
diff --git a/tests/suites/test_suite_poly1305.data b/tf-psa-crypto/tests/suites/test_suite_poly1305.data
similarity index 100%
rename from tests/suites/test_suite_poly1305.data
rename to tf-psa-crypto/tests/suites/test_suite_poly1305.data
diff --git a/tests/suites/test_suite_poly1305.function b/tf-psa-crypto/tests/suites/test_suite_poly1305.function
similarity index 100%
rename from tests/suites/test_suite_poly1305.function
rename to tf-psa-crypto/tests/suites/test_suite_poly1305.function
diff --git a/tests/suites/test_suite_psa_crypto.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto.data
diff --git a/tests/suites/test_suite_psa_crypto.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto.function
diff --git a/tests/suites/test_suite_psa_crypto.pbkdf2.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto.pbkdf2.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto.pbkdf2.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto.pbkdf2.data
diff --git a/tests/suites/test_suite_psa_crypto_attributes.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_attributes.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_attributes.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_attributes.data
diff --git a/tests/suites/test_suite_psa_crypto_attributes.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_attributes.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_attributes.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_attributes.function
diff --git a/tests/suites/test_suite_psa_crypto_driver_wrappers.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_driver_wrappers.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_driver_wrappers.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_driver_wrappers.data
diff --git a/tests/suites/test_suite_psa_crypto_driver_wrappers.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_driver_wrappers.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_driver_wrappers.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_driver_wrappers.function
diff --git a/tests/suites/test_suite_psa_crypto_entropy.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_entropy.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_entropy.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_entropy.data
diff --git a/tests/suites/test_suite_psa_crypto_entropy.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_entropy.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_entropy.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_entropy.function
diff --git a/tests/suites/test_suite_psa_crypto_generate_key.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_generate_key.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_generate_key.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_generate_key.function
diff --git a/tests/suites/test_suite_psa_crypto_hash.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_hash.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_hash.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_hash.data
diff --git a/tests/suites/test_suite_psa_crypto_hash.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_hash.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_hash.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_hash.function
diff --git a/tests/suites/test_suite_psa_crypto_init.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_init.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_init.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_init.data
diff --git a/tests/suites/test_suite_psa_crypto_init.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_init.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_init.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_init.function
diff --git a/tests/suites/test_suite_psa_crypto_low_hash.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_low_hash.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_low_hash.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_low_hash.function
diff --git a/tests/suites/test_suite_psa_crypto_memory.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_memory.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_memory.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_memory.data
diff --git a/tests/suites/test_suite_psa_crypto_memory.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_memory.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_memory.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_memory.function
diff --git a/tests/suites/test_suite_psa_crypto_metadata.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_metadata.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_metadata.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_metadata.data
diff --git a/tests/suites/test_suite_psa_crypto_metadata.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_metadata.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_metadata.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_metadata.function
diff --git a/tests/suites/test_suite_psa_crypto_not_supported.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_not_supported.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_not_supported.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_not_supported.function
diff --git a/tests/suites/test_suite_psa_crypto_not_supported.misc.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_not_supported.misc.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_not_supported.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_not_supported.misc.data
diff --git a/tests/suites/test_suite_psa_crypto_op_fail.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_op_fail.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_op_fail.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_op_fail.function
diff --git a/tests/suites/test_suite_psa_crypto_op_fail.misc.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_op_fail.misc.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_op_fail.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_op_fail.misc.data
diff --git a/tests/suites/test_suite_psa_crypto_pake.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_pake.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_pake.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_pake.data
diff --git a/tests/suites/test_suite_psa_crypto_pake.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_pake.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_pake.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_pake.function
diff --git a/tests/suites/test_suite_psa_crypto_persistent_key.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_persistent_key.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_persistent_key.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_persistent_key.data
diff --git a/tests/suites/test_suite_psa_crypto_persistent_key.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_persistent_key.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_persistent_key.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_persistent_key.function
diff --git a/tests/suites/test_suite_psa_crypto_se_driver_hal.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_se_driver_hal.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_se_driver_hal.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_se_driver_hal.data
diff --git a/tests/suites/test_suite_psa_crypto_se_driver_hal.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_se_driver_hal.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_se_driver_hal.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_se_driver_hal.function
diff --git a/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.data
diff --git a/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_se_driver_hal_mocks.function
diff --git a/tests/suites/test_suite_psa_crypto_slot_management.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_slot_management.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_slot_management.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_slot_management.data
diff --git a/tests/suites/test_suite_psa_crypto_slot_management.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_slot_management.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_slot_management.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_slot_management.function
diff --git a/tests/suites/test_suite_psa_crypto_storage_format.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_storage_format.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_storage_format.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_storage_format.function
diff --git a/tests/suites/test_suite_psa_crypto_storage_format.misc.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_storage_format.misc.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_storage_format.misc.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_storage_format.misc.data
diff --git a/tests/suites/test_suite_psa_crypto_util.data b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_util.data
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_util.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_util.data
diff --git a/tests/suites/test_suite_psa_crypto_util.function b/tf-psa-crypto/tests/suites/test_suite_psa_crypto_util.function
similarity index 100%
rename from tests/suites/test_suite_psa_crypto_util.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_crypto_util.function
diff --git a/tests/suites/test_suite_psa_its.data b/tf-psa-crypto/tests/suites/test_suite_psa_its.data
similarity index 100%
rename from tests/suites/test_suite_psa_its.data
rename to tf-psa-crypto/tests/suites/test_suite_psa_its.data
diff --git a/tests/suites/test_suite_psa_its.function b/tf-psa-crypto/tests/suites/test_suite_psa_its.function
similarity index 100%
rename from tests/suites/test_suite_psa_its.function
rename to tf-psa-crypto/tests/suites/test_suite_psa_its.function
diff --git a/tests/suites/test_suite_random.data b/tf-psa-crypto/tests/suites/test_suite_random.data
similarity index 100%
rename from tests/suites/test_suite_random.data
rename to tf-psa-crypto/tests/suites/test_suite_random.data
diff --git a/tests/suites/test_suite_random.function b/tf-psa-crypto/tests/suites/test_suite_random.function
similarity index 100%
rename from tests/suites/test_suite_random.function
rename to tf-psa-crypto/tests/suites/test_suite_random.function
diff --git a/tests/suites/test_suite_rsa.data b/tf-psa-crypto/tests/suites/test_suite_rsa.data
similarity index 100%
rename from tests/suites/test_suite_rsa.data
rename to tf-psa-crypto/tests/suites/test_suite_rsa.data
diff --git a/tests/suites/test_suite_rsa.function b/tf-psa-crypto/tests/suites/test_suite_rsa.function
similarity index 100%
rename from tests/suites/test_suite_rsa.function
rename to tf-psa-crypto/tests/suites/test_suite_rsa.function
diff --git a/tests/suites/test_suite_shax.data b/tf-psa-crypto/tests/suites/test_suite_shax.data
similarity index 100%
rename from tests/suites/test_suite_shax.data
rename to tf-psa-crypto/tests/suites/test_suite_shax.data
diff --git a/tests/suites/test_suite_shax.function b/tf-psa-crypto/tests/suites/test_suite_shax.function
similarity index 100%
rename from tests/suites/test_suite_shax.function
rename to tf-psa-crypto/tests/suites/test_suite_shax.function
diff --git a/tests/suites/test_suite_timing.data b/tf-psa-crypto/tests/suites/test_suite_timing.data
similarity index 100%
rename from tests/suites/test_suite_timing.data
rename to tf-psa-crypto/tests/suites/test_suite_timing.data
diff --git a/tests/suites/test_suite_timing.function b/tf-psa-crypto/tests/suites/test_suite_timing.function
similarity index 100%
rename from tests/suites/test_suite_timing.function
rename to tf-psa-crypto/tests/suites/test_suite_timing.function
diff --git a/tests/suites/test_suite_version.data b/tf-psa-crypto/tests/suites/test_suite_version.data
similarity index 100%
rename from tests/suites/test_suite_version.data
rename to tf-psa-crypto/tests/suites/test_suite_version.data
diff --git a/tests/suites/test_suite_version.function b/tf-psa-crypto/tests/suites/test_suite_version.function
similarity index 100%
rename from tests/suites/test_suite_version.function
rename to tf-psa-crypto/tests/suites/test_suite_version.function