diff --git a/group/tf-l1-boot-tests-misc/fvp-psa-mbedtls-mb_hash384-optee:fvp-optee.mb-linux.rootfs+ftpm_384-fip.ftpm-aemv8a b/group/tf-l1-boot-tests-misc/fvp-psa-mbedtls-mb_hash384-optee:fvp-optee.mb-linux.rootfs+ftpm_384-fip.ftpm-aemv8a
new file mode 100644
index 0000000..8c2d647
--- /dev/null
+++ b/group/tf-l1-boot-tests-misc/fvp-psa-mbedtls-mb_hash384-optee:fvp-optee.mb-linux.rootfs+ftpm_384-fip.ftpm-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-psa-mbedtls,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-psa-mbedtls,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..8c2d647
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-psa-mbedtls,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 62e284f..eda85ec 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -206,6 +206,9 @@
 # PSA FWU support
 clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} ARM_GPT_SUPPORT=1 PSA_FWU_SUPPORT=1 USE_ROMLIB=1 FVP_TRUSTED_SRAM_SIZE=384
 
+# PSA Crypto support
+clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} PSA_CRYPTO=1 FVP_TRUSTED_SRAM_SIZE=384
+
 # SME and HCX features
 clean_build $fvp_common_flags ENABLE_SME_FOR_NS=1 ENABLE_FEAT_HCX=1
 
diff --git a/tf_config/fvp-psa-mbedtls-mb_hash384-optee b/tf_config/fvp-psa-mbedtls-mb_hash384-optee
new file mode 100644
index 0000000..d261cec
--- /dev/null
+++ b/tf_config/fvp-psa-mbedtls-mb_hash384-optee
@@ -0,0 +1,9 @@
+ARM_TSP_RAM_LOCATION=tdram
+CROSS_COMPILE=aarch64-none-elf-
+EVENT_LOG_LEVEL=20
+FVP_TRUSTED_SRAM_SIZE=384
+MEASURED_BOOT=1
+PLAT=fvp
+PSA_CRYPTO=1
+SPD=opteed
+MBOOT_EL_HASH_ALG=sha384
diff --git a/tf_config/fvp-tbb-psa-mbedtls b/tf_config/fvp-tbb-psa-mbedtls
new file mode 100644
index 0000000..f87282b
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+PSA_CRYPTO=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1