diff --git a/expect-lava/cactus.exp b/expect-lava/cactus.exp
deleted file mode 100644
index 6400aac..0000000
--- a/expect-lava/cactus.exp
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Expect script for the test Secure Partition Cactus
-#
-
-expect_string+=('i;Booting test Secure Partition Cactus')
-
-source $ci_root/expect-lava/uart-hold.inc
diff --git a/expect-lava/tftf_cactus.exp b/expect-lava/tftf_cactus.exp
new file mode 100644
index 0000000..a7c22c9
--- /dev/null
+++ b/expect-lava/tftf_cactus.exp
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2021-2024 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for the test Secure Partition Cactus
+#
+
+source $ci_root/expect-lava/trusted-firmware.inc
+
+expect_string+=('i;Booting Secure Partition ')
+
+source $ci_root/expect-lava/tftf.inc
+
+source $ci_root/expect-lava/uart-hold.inc
diff --git a/expect/cactus.exp b/expect/cactus.exp
deleted file mode 100644
index 5ad166a..0000000
--- a/expect/cactus.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Expect script for the test Secure Partition Cactus
-#
-
-source [file join [file dirname [info script]] handle-arguments.inc]
-
-expect_string "Booting test Secure Partition Cactus"
-
-source [file join [file dirname [info script]] uart-hold.inc]
diff --git a/expect/tftf_cactus.exp b/expect/tftf_cactus.exp
new file mode 100644
index 0000000..840c9b0
--- /dev/null
+++ b/expect/tftf_cactus.exp
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2019-2024 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for the test Secure Partition Cactus
+#
+
+source [file join [file dirname [info script]] handle-arguments.inc]
+
+source [file join [file dirname [info script]] trusted-firmware.inc]
+
+expect_string "Booting Secure Partition "
+
+source [file join [file dirname [info script]] tftf.inc]
+
+source [file join [file dirname [info script]] uart-hold.inc]
diff --git a/group/spm-l3-boot-tests/nil,fvp-el3-spmc-simd,fvp-el3-spmc:fvp-cactus.tftf b/group/spm-l3-boot-tests/nil,fvp-el3-spmc-simd,fvp-el3-spmc:fvp-cactus.tftf
new file mode 100644
index 0000000..f73abc8
--- /dev/null
+++ b/group/spm-l3-boot-tests/nil,fvp-el3-spmc-simd,fvp-el3-spmc:fvp-cactus.tftf
@@ -0,0 +1,4 @@
+#
+ # Copyright (c) 2024, Arm Limited. All rights reserved.
+ #
+ # SPDX-License-Identifier: BSD-3-Clause
diff --git a/run_config/fvp-cactus.tftf b/run_config/fvp-cactus.tftf
new file mode 100644
index 0000000..ed23abc
--- /dev/null
+++ b/run_config/fvp-cactus.tftf
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_tf_build() {
+	build_fip BL33="$archive/tftf.bin" BL32="$archive/cactus.bin"
+}
+
+generate_lava_job_template() {
+	payload_type="tftf" gen_yaml_template
+}
+
+generate_lava_job() {
+	local model="base-aemv8a"
+
+	uart="0" file="tftf_cactus.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+
+	model="$model" \
+		has_sve="1" \
+		gen_model_params
+
+	model="$model" gen_fvp_yaml
+}
diff --git a/tf_config/fvp-el3-spmc-simd b/tf_config/fvp-el3-spmc-simd
new file mode 100644
index 0000000..db2aa0d
--- /dev/null
+++ b/tf_config/fvp-el3-spmc-simd
@@ -0,0 +1,12 @@
+ARM_SPMC_MANIFEST_DTS=plat/arm/board/fvp/fdts/fvp_cactus_sp_manifest.dts
+BL32=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_FPREGS=1
+CTX_INCLUDE_SVE_REGS=1
+ENABLE_SVE_FOR_NS=1
+ENABLE_SVE_FOR_SWD=1
+FVP_TRUSTED_SRAM_SIZE=384
+PLAT=fvp
+SPD=spmd
+SPMC_AT_EL3=1
+SPMD_SPM_AT_SEL2=0
diff --git a/tftf_config/fvp-el3-spmc b/tftf_config/fvp-el3-spmc
new file mode 100644
index 0000000..0ac9745
--- /dev/null
+++ b/tftf_config/fvp-el3-spmc
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+SPMC_AT_EL3=1
+PLAT=fvp
+TESTS=el3-spmc