diff --git a/expect-lava/tftf-non-primary.exp b/expect-lava/tftf-non-primary.exp
new file mode 100644
index 0000000..eb8ad46
--- /dev/null
+++ b/expect-lava/tftf-non-primary.exp
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for Trusted Firmware Test Framework
+#
+
+prompt='Booting trusted firmware test framework'
+expect_string+=("i;${prompt}")
+
+prompt='Running at NS-EL(1|2)'
+expect_string+=("i;${prompt}")
+
+prompt='Tests Failed  : 0'
+expect_string+=("i;${prompt}")
+
+prompt='Exiting tests.'
+failures='Tests Passed  : 0'
+expect_string+=("i;${prompt};;${failures}")
diff --git a/run_config/fvp-tc0.spm.tftf b/run_config/fvp-tc0.spm.tftf
index 69dc510..efcf7b8 100644
--- a/run_config/fvp-tc0.spm.tftf
+++ b/run_config/fvp-tc0.spm.tftf
@@ -30,10 +30,10 @@
 generate_lava_job() {
 	local model="tc0"
 
-	uart="0" port="5002" set_payload_uart="1" file="tftf-non-primary.exp" track_expect
+	uart="0" port="5002" set_primary="1" file="tftf-non-primary.exp" track_expect
 
 	uart="1" set_expect_variable "num_cpus" "8"
-	uart="1" port="5003" set_primary="1" file="spm-cactus-sp-uart1.exp" track_expect
+	uart="1" port="5003" file="spm-cactus-sp-uart1.exp" track_expect
 
 	set_run_env "ports_script" "$ci_root/model/tc-ports.awk"
 	set_run_env "num_uarts" "2"