diff --git a/group/tf-l2-boot-tests-misc/fvp-undef-injection,fvp-undef-injection:fvp-tftf-fip.tftf-aemv8a.all b/group/tf-l2-boot-tests-misc/fvp-undef-injection,fvp-undef-injection:fvp-tftf-fip.tftf-aemv8a.all
new file mode 100644
index 0000000..b452bbf
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-undef-injection,fvp-undef-injection:fvp-tftf-fip.tftf-aemv8a.all
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2023 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/tf_config/fvp-undef-injection b/tf_config/fvp-undef-injection
new file mode 100644
index 0000000..5d508d9
--- /dev/null
+++ b/tf_config/fvp-undef-injection
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
+PLAT=fvp
+ENABLE_FEAT_FGT=0
diff --git a/tftf_config/fvp-undef-injection b/tftf_config/fvp-undef-injection
new file mode 100644
index 0000000..6bb5888
--- /dev/null
+++ b/tftf_config/fvp-undef-injection
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=undef-injection