diff --git a/group/scp-boot-tests/fvp-tc2,fvp-tc2-tbb:fvp-linux.tc-fip.tc-tc2-debug b/group/scp-boot-tests/fvp-tc2,fvp-tc2-tbb:fvp-linux.tc-fip.tc-tc2-debug
new file mode 100644
index 0000000..b8939c8
--- /dev/null
+++ b/group/scp-boot-tests/fvp-tc2,fvp-tc2-tbb:fvp-linux.tc-fip.tc-tc2-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-css/fvp-tc2-tbb:fvp-linux.tc-fip.tc-tc2-debug b/group/tf-l3-boot-tests-css/fvp-tc2-tbb:fvp-linux.tc-fip.tc-tc2-debug
new file mode 100644
index 0000000..b8939c8
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-tc2-tbb:fvp-linux.tc-fip.tc-tc2-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/model/tc2.sh b/model/tc2.sh
index 04bcb66..5b6e4b4 100644
--- a/model/tc2.sh
+++ b/model/tc2.sh
@@ -8,8 +8,6 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC2"
 
 cat <<EOF >"$model_param_file"
-${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
-${scp_rom_bin+-C css.scp.ROMloader.fname=$scp_rom_bin}
 ${fip_bin+-C board.flashloader0.fname=$fip_bin}
 ${initrd_bin+--data board.dram=$initrd_bin@${initrd_addr:?}}
 ${kernel_bin+--data board.dram=$kernel_bin@${kernel_addr:?}}
@@ -17,6 +15,10 @@
 ${uart0_out+-C soc.pl011_uart0.unbuffered_output=1}
 ${uart1_out+-C soc.pl011_uart1.out_file=$uart1_out}
 ${uart1_out+-C soc.pl011_uart1.unbuffered_output=1}
+-C displayController=2
 ${rss_rom_file+--data css.rss.cpu=$rss_rom_file@${rss_rom_addr:?}}
 ${rss_flash_file+--data css.rss.cpu=$rss_flash_file@${rss_flash_addr:?}}
+${vmmaddrwidth+-C css.rss.VMADDRWIDTH=$vmmaddrwidth}
+${rvbaddr_lw+-C css.scp.c0_pik.rvbaraddr_lw=$rvbaddr_lw}
+${rvbaddr_up+-C css.scp.c0_pik.rvbaraddr_up=$rvbaddr_up}
 EOF
diff --git a/tc_utils.sh b/tc_utils.sh
index d6b141f..9c79e14 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -18,8 +18,27 @@
 initrd_addr=0x8000000
 kernel_addr=0x80000
 scp_ram_addr=0x0bd80000
+
 rss_rom_addr=0x11000000
 rss_flash_addr=0x31000000
+vmmaddrwidth=23
+rvbaddr_lw=0x1000
+rvbaddr_up=0x0000
+
+if [ $plat_variant -eq 2 ]; then
+    if [ ! -f "$archive/rss_rom.bin" ]; then
+            url="$tc_prebuilts/tc$plat_variant/rss_rom.bin" saveas="rss_rom.bin" fetch_file
+	    archive_file "rss_rom.bin"
+    fi
+
+    if [ ! -f "$archive/rss_flash.bin" ]; then
+	    url="$tc_prebuilts/tc$plat_variant/rss_flash.bin" saveas="rss_flash.bin" fetch_file
+	    archive_file "rss_flash.bin"
+    fi
+fi
+
+rss_rom_file="$archive/rss_rom.bin"
+rss_flash_file="$archive/rss_flash.bin"
 
 # Hafnium build repo containing Secure hafnium binaries
 spm_secure_out_dir=secure_tc_clang