diff --git a/group/qemu-boot-tests/qemu-tbb-psa-mbedtls-enc-bl31:qemu-linux.rootfs-fip.uefi-virt-debug b/group/qemu-boot-tests/qemu-tbb-psa-mbedtls-enc-bl31:qemu-linux.rootfs-fip.uefi-virt-debug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/group/qemu-boot-tests/qemu-tbb-psa-mbedtls-enc-bl31:qemu-linux.rootfs-fip.uefi-virt-debug
diff --git a/group/tf-l1-build-plat/qemu-tbb-psa-mbedtls-enc-bl31:nil b/group/tf-l1-build-plat/qemu-tbb-psa-mbedtls-enc-bl31:nil
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/group/tf-l1-build-plat/qemu-tbb-psa-mbedtls-enc-bl31:nil
diff --git a/tf_config/qemu-tbb-psa-mbedtls-enc-bl31 b/tf_config/qemu-tbb-psa-mbedtls-enc-bl31
new file mode 100644
index 0000000..9a512e3
--- /dev/null
+++ b/tf_config/qemu-tbb-psa-mbedtls-enc-bl31
@@ -0,0 +1,7 @@
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=qemu
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
+DECRYPTION_SUPPORT=aes_gcm
+ENCRYPT_BL31=1
\ No newline at end of file