diff --git a/group/tftf-l2-fvp/fvp-errata-abi-a53,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa53x4-debug b/group/tftf-l2-fvp/fvp-errata-abi-a53,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa53x4-debug
new file mode 100644
index 0000000..5515958
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-errata-abi-a53,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa53x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2023 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-errata-abi-a55,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug b/group/tftf-l2-fvp/fvp-errata-abi-a55,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug
new file mode 100644
index 0000000..5515958
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-errata-abi-a55,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa55x4a75x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2023 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug b/group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug
new file mode 100644
index 0000000..5515958
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2023 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/tf_config/fvp-errata-abi-a53 b/tf_config/fvp-errata-abi-a53
new file mode 100644
index 0000000..5823d2f
--- /dev/null
+++ b/tf_config/fvp-errata-abi-a53
@@ -0,0 +1,14 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERRATA_ABI_SUPPORT=1
+ERRATA_A53_819472=1
+ERRATA_A53_824069=1
+ERRATA_A53_826319=1
+ERRATA_A53_827319=1
+ERRATA_A53_835769=1
+ERRATA_A53_836870=1
+ERRATA_A53_843419=1
+ERRATA_A53_855873=1
+ERRATA_A53_1530924=1
+HW_ASSISTED_COHERENCY=0
+PLAT=fvp
+USE_COHERENT_MEM=1
diff --git a/tf_config/fvp-errata-abi-a55 b/tf_config/fvp-errata-abi-a55
new file mode 100644
index 0000000..98ea33a
--- /dev/null
+++ b/tf_config/fvp-errata-abi-a55
@@ -0,0 +1,12 @@
+CROSS_COMPILE=aarch64-none-elf-
+ERRATA_ABI_SUPPORT=1
+ERRATA_A55_768277=1
+ERRATA_A55_778703=1
+ERRATA_A55_798797=1
+ERRATA_A55_846532=1
+ERRATA_A55_903758=1
+ERRATA_A55_1221012=1
+ERRATA_A55_1530923=1
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-errata-abi-a710 b/tf_config/fvp-errata-abi-a710
new file mode 100644
index 0000000..15d9e41
--- /dev/null
+++ b/tf_config/fvp-errata-abi-a710
@@ -0,0 +1,15 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+ERRATA_ABI_SUPPORT=1
+ERRATA_A710_2701952=1
+ERRATA_A710_1987031=1
+ERRATA_A710_2081180=1
+ERRATA_A710_2282622=1
+ERRATA_A710_2083908=1
+ERRATA_A710_2291219=1
+ERRATA_A710_2216384=1
+ERRATA_A710_2768515=1
+ERRATA_NON_ARM_INTERCONNECT=1
+HW_ASSISTED_COHERENCY=1
+PLAT=fvp
+USE_COHERENT_MEM=0
diff --git a/tftf_config/fvp-errata-abi b/tftf_config/fvp-errata-abi
new file mode 100644
index 0000000..13edcfa
--- /dev/null
+++ b/tftf_config/fvp-errata-abi
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=errata_abi