diff --git a/group/tftf-l2-fvp/fvp-aarch64-handoff,fvp-aarch64-handoff:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp/fvp-aarch64-handoff,fvp-aarch64-handoff:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..5515958
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch64-handoff,fvp-aarch64-handoff:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# 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 95c4375..48639d1 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -154,6 +154,9 @@
 # SPM support with SPM sitting at EL3
 clean_build $fvp_common_flags SPD=spmd SPMD_SPM_AT_SEL2=0 SPMC_AT_EL3=1
 
+# Firmware Handoff framework support
+clean_build $fvp_common_flags TRANSFER_LIST=1
+
 #BL2 at EL3 support
 clean_build $fvp_common_flags RESET_TO_BL2=1 FVP_TRUSTED_SRAM_SIZE=384
 clean_build $fvp_common_flags CROSS_COMPILE=arm-none-eabi- \
diff --git a/tf_config/fvp-aarch64-handoff b/tf_config/fvp-aarch64-handoff
new file mode 100644
index 0000000..1d9566d
--- /dev/null
+++ b/tf_config/fvp-aarch64-handoff
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+PLAT=fvp
+TRANSFER_LIST=1
diff --git a/tftf_config/fvp-aarch64-handoff b/tftf_config/fvp-aarch64-handoff
new file mode 100644
index 0000000..1b1c51b
--- /dev/null
+++ b/tftf_config/fvp-aarch64-handoff
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TRANSFER_LIST=1
+TESTS=firmware-handoff