diff --git a/tf_config/fvp-spm-mm b/tf_config/fvp-spm-mm
index 1d146b6..47df74e 100644
--- a/tf_config/fvp-spm-mm
+++ b/tf_config/fvp-spm-mm
@@ -1,5 +1,6 @@
 ARM_BL31_IN_DRAM=1
 CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_FPREGS=1
 EL3_EXCEPTION_HANDLING=1
 ENABLE_SVE_FOR_NS=0
 SPM_MM=1
diff --git a/tf_config/fvp-spm-mm-cc b/tf_config/fvp-spm-mm-cc
index a3d5fcc..8cdfdc1 100644
--- a/tf_config/fvp-spm-mm-cc
+++ b/tf_config/fvp-spm-mm-cc
@@ -1,5 +1,6 @@
 ARM_BL31_IN_DRAM=1
 CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_FPREGS=1
 EL3_EXCEPTION_HANDLING=1
 ENABLE_ASSERTIONS=0
 ENABLE_SVE_FOR_NS=0
diff --git a/tf_config/synquacer-spm b/tf_config/synquacer-spm
index a32a8bb..c9e9464 100644
--- a/tf_config/synquacer-spm
+++ b/tf_config/synquacer-spm
@@ -1,4 +1,5 @@
 CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_FPREGS=1
 EL3_EXCEPTION_HANDLING=1
 SPM_MM=1
 PLAT=synquacer