diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm-report-ctx-mem-use,fvp-template:fvp-spm-debug b/group/spm-l2-boot-tests/fvp-default,fvp-spm-report-ctx-mem-use,fvp-template:fvp-spm-debug
new file mode 100644
index 0000000..c473896
--- /dev/null
+++ b/group/spm-l2-boot-tests/fvp-default,fvp-spm-report-ctx-mem-use,fvp-template:fvp-spm-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-misc/fvp-report-ctx-mem-use,fvp-template:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-report-ctx-mem-use,fvp-template:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c473896
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-report-ctx-mem-use,fvp-template: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/patch/ubsan/ubsan_test.patch b/patch/ubsan/ubsan_test.patch
index 53d2d1b..1c3189d 100644
--- a/patch/ubsan/ubsan_test.patch
+++ b/patch/ubsan/ubsan_test.patch
@@ -2,8 +2,8 @@
 index cae55f314..481050a43 100644
 --- a/bl31/bl31_main.c
 +++ b/bl31/bl31_main.c
-@@ -108,6 +108,19 @@ void bl31_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2,
- #endif /* CTX_INCLUDE_PAUTH_REGS */
+@@ -112,6 +112,19 @@ void bl31_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2,
+ #endif /* PLATFORM_REPORT_CTX_MEM_USE */
  }
  
 +/*
@@ -22,7 +22,7 @@
  /*******************************************************************************
   * BL31 is responsible for setting up the runtime services for the primary cpu
   * before passing control to the bootloader or an Operating System. This
-@@ -216,6 +229,10 @@ void bl31_main(void)
+@@ -223,6 +236,10 @@ void bl31_main(void)
  	PMF_CAPTURE_TIMESTAMP(bl_svc, BL31_EXIT, PMF_CACHE_MAINT);
  	console_flush();
  #endif
diff --git a/tf_config/fvp-report-ctx-mem-use b/tf_config/fvp-report-ctx-mem-use
new file mode 100644
index 0000000..2035e25
--- /dev/null
+++ b/tf_config/fvp-report-ctx-mem-use
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+PLATFORM_REPORT_CTX_MEM_USE=1
diff --git a/tf_config/fvp-spm-report-ctx-mem-use b/tf_config/fvp-spm-report-ctx-mem-use
new file mode 100644
index 0000000..41a558a
--- /dev/null
+++ b/tf_config/fvp-spm-report-ctx-mem-use
@@ -0,0 +1,13 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=spmd
+SPMD_SPM_AT_SEL2=1
+CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MINOR=5
+CTX_INCLUDE_PAUTH_REGS=1
+CTX_INCLUDE_MTE_REGS=1
+BRANCH_PROTECTION=1
+SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+PLATFORM_REPORT_CTX_MEM_USE=1
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1