diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
deleted file mode 100644
index 2a68e93..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-fetch_tf_resource() {
-	set_run_env "num_uarts" "3"
-	uart="0" file="tftf.exp" track_expect
-	uart="1" file="hold_uart.exp" track_expect
-	uart="2" file="hold_uart.exp" track_expect
-}
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
rename to group/tftf-l2-fvp/fvp-default,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug b/group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemva.8_6-debug
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug
rename to group/tftf-l2-fvp/fvp-default,fvp-pauth-standard:fvp-tftf-fip.tftf-aemva.8_6-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
rename to group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
copy to group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-tsp-romlib,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-bti-tsp-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-bti-tsp-sdei,fvp-pauth-bti:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-ctx-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-ctx-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-ctx-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-ctx-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-pac-ret-leaf-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-pac-ret-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-pac-ret-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-pac-ret-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
copy to group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
copy to group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-tsp-romlib,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tftf-l2-fvp/fvp-pauth-standard-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
similarity index 100%
copy from group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
copy to group/tftf-l2-fvp/fvp-pauth-standard-tsp-sdei,fvp-pauth-standard:fvp-tftf-fip.tftf-aemv8a.8_5-debug
diff --git a/tf_config/fvp-pauth-bti-romlib b/tf_config/fvp-pauth-bti-romlib
new file mode 100644
index 0000000..92535ec
--- /dev/null
+++ b/tf_config/fvp-pauth-bti-romlib
@@ -0,0 +1,9 @@
+ARM_ARCH_MINOR=5
+ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=4
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-pauth-ctx b/tf_config/fvp-pauth-bti-sdei
similarity index 79%
rename from tf_config/fvp-pauth-ctx
rename to tf_config/fvp-pauth-bti-sdei
index 742dc60..2489e75 100644
--- a/tf_config/fvp-pauth-ctx
+++ b/tf_config/fvp-pauth-bti-sdei
@@ -1,6 +1,6 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
-CTX_INCLUDE_PAUTH_REGS=1
+BRANCH_PROTECTION=4
+CROSS_COMPILE=aarch64-none-elf-
 EL3_EXCEPTION_HANDLING=1
-SDEI_SUPPORT=1
 PLAT=fvp
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-pauth-bti-tsp-romlib b/tf_config/fvp-pauth-bti-tsp-romlib
new file mode 100644
index 0000000..9b66d47
--- /dev/null
+++ b/tf_config/fvp-pauth-bti-tsp-romlib
@@ -0,0 +1,11 @@
+ARM_ARCH_MINOR=5
+ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=4
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-pauth-ctx-tsp b/tf_config/fvp-pauth-bti-tsp-sdei
similarity index 84%
rename from tf_config/fvp-pauth-ctx-tsp
rename to tf_config/fvp-pauth-bti-tsp-sdei
index cc82744..73e1448 100644
--- a/tf_config/fvp-pauth-ctx-tsp
+++ b/tf_config/fvp-pauth-bti-tsp-sdei
@@ -1,8 +1,8 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
-CTX_INCLUDE_PAUTH_REGS=1
+BRANCH_PROTECTION=4
+CROSS_COMPILE=aarch64-none-elf-
 EL3_EXCEPTION_HANDLING=1
+PLAT=fvp
 SDEI_SUPPORT=1
 SPD=tspd
 TSP_NS_INTR_ASYNC_PREEMPT=1
-PLAT=fvp
diff --git a/tf_config/fvp-pauth-standard b/tf_config/fvp-pauth-ctx-sdei
similarity index 99%
rename from tf_config/fvp-pauth-standard
rename to tf_config/fvp-pauth-ctx-sdei
index 71d508c..8fe896b 100644
--- a/tf_config/fvp-pauth-standard
+++ b/tf_config/fvp-pauth-ctx-sdei
@@ -1,7 +1,7 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_PAUTH_REGS=1
 EL3_EXCEPTION_HANDLING=1
-SDEI_SUPPORT=1
 PLAT=fvp
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-pauth-standard-tsp b/tf_config/fvp-pauth-ctx-tsp-sdei
similarity index 99%
rename from tf_config/fvp-pauth-standard-tsp
rename to tf_config/fvp-pauth-ctx-tsp-sdei
index b9d2bc6..fec45a6 100644
--- a/tf_config/fvp-pauth-standard-tsp
+++ b/tf_config/fvp-pauth-ctx-tsp-sdei
@@ -1,9 +1,9 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_PAUTH_REGS=1
 EL3_EXCEPTION_HANDLING=1
+PLAT=fvp
 SDEI_SUPPORT=1
 SPD=tspd
 TSP_NS_INTR_ASYNC_PREEMPT=1
-PLAT=fvp
diff --git a/tf_config/fvp-pauth-pac-ret-leaf b/tf_config/fvp-pauth-pac-ret-leaf-sdei
similarity index 99%
rename from tf_config/fvp-pauth-pac-ret-leaf
rename to tf_config/fvp-pauth-pac-ret-leaf-sdei
index f392e0e..31470c1 100644
--- a/tf_config/fvp-pauth-pac-ret-leaf
+++ b/tf_config/fvp-pauth-pac-ret-leaf-sdei
@@ -1,7 +1,7 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=3
+CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_PAUTH_REGS=1
 EL3_EXCEPTION_HANDLING=1
-SDEI_SUPPORT=1
 PLAT=fvp
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-pauth-pac-ret-leaf-tsp b/tf_config/fvp-pauth-pac-ret-leaf-tsp-sdei
similarity index 99%
rename from tf_config/fvp-pauth-pac-ret-leaf-tsp
rename to tf_config/fvp-pauth-pac-ret-leaf-tsp-sdei
index b4b0442..2e66bc3 100644
--- a/tf_config/fvp-pauth-pac-ret-leaf-tsp
+++ b/tf_config/fvp-pauth-pac-ret-leaf-tsp-sdei
@@ -1,9 +1,9 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=3
+CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_PAUTH_REGS=1
 EL3_EXCEPTION_HANDLING=1
+PLAT=fvp
 SDEI_SUPPORT=1
 SPD=tspd
 TSP_NS_INTR_ASYNC_PREEMPT=1
-PLAT=fvp
diff --git a/tf_config/fvp-pauth-pac-ret b/tf_config/fvp-pauth-pac-ret-sdei
similarity index 99%
rename from tf_config/fvp-pauth-pac-ret
rename to tf_config/fvp-pauth-pac-ret-sdei
index b78c60a..2ce2fbf 100644
--- a/tf_config/fvp-pauth-pac-ret
+++ b/tf_config/fvp-pauth-pac-ret-sdei
@@ -1,7 +1,7 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=2
+CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_PAUTH_REGS=1
 EL3_EXCEPTION_HANDLING=1
-SDEI_SUPPORT=1
 PLAT=fvp
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-pauth-pac-ret-tsp b/tf_config/fvp-pauth-pac-ret-tsp-sdei
similarity index 99%
rename from tf_config/fvp-pauth-pac-ret-tsp
rename to tf_config/fvp-pauth-pac-ret-tsp-sdei
index 3d19c2e..197ab65 100644
--- a/tf_config/fvp-pauth-pac-ret-tsp
+++ b/tf_config/fvp-pauth-pac-ret-tsp-sdei
@@ -1,9 +1,9 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=2
+CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_PAUTH_REGS=1
 EL3_EXCEPTION_HANDLING=1
+PLAT=fvp
 SDEI_SUPPORT=1
 SPD=tspd
 TSP_NS_INTR_ASYNC_PREEMPT=1
-PLAT=fvp
diff --git a/tf_config/fvp-pauth-standard-romlib b/tf_config/fvp-pauth-standard-romlib
index 3c8f8be..7545a58 100644
--- a/tf_config/fvp-pauth-standard-romlib
+++ b/tf_config/fvp-pauth-standard-romlib
@@ -1,10 +1,10 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
-BRANCH_PROTECTION=1
-CTX_INCLUDE_PAUTH_REGS=1
 ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_PAUTH_REGS=1
 GENERATE_COT=1
+PLAT=fvp
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
 TRUSTED_BOARD_BOOT=1
 USE_ROMLIB=1
-PLAT=fvp
diff --git a/tf_config/fvp-pauth-standard b/tf_config/fvp-pauth-standard-sdei
similarity index 99%
copy from tf_config/fvp-pauth-standard
copy to tf_config/fvp-pauth-standard-sdei
index 71d508c..8fe896b 100644
--- a/tf_config/fvp-pauth-standard
+++ b/tf_config/fvp-pauth-standard-sdei
@@ -1,7 +1,7 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_PAUTH_REGS=1
 EL3_EXCEPTION_HANDLING=1
-SDEI_SUPPORT=1
 PLAT=fvp
+SDEI_SUPPORT=1
diff --git a/tf_config/fvp-pauth-standard-tsp-romlib b/tf_config/fvp-pauth-standard-tsp-romlib
index e491662..fbd0478 100644
--- a/tf_config/fvp-pauth-standard-tsp-romlib
+++ b/tf_config/fvp-pauth-standard-tsp-romlib
@@ -1,12 +1,12 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
-BRANCH_PROTECTION=1
-CTX_INCLUDE_PAUTH_REGS=1
-SPD=tspd
-TSP_NS_INTR_ASYNC_PREEMPT=1
 ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_PAUTH_REGS=1
 GENERATE_COT=1
-ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-TRUSTED_BOARD_BOOT=1
-USE_ROMLIB=1
 PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
+USE_ROMLIB=1
diff --git a/tf_config/fvp-pauth-standard-tsp b/tf_config/fvp-pauth-standard-tsp-sdei
similarity index 99%
copy from tf_config/fvp-pauth-standard-tsp
copy to tf_config/fvp-pauth-standard-tsp-sdei
index b9d2bc6..fec45a6 100644
--- a/tf_config/fvp-pauth-standard-tsp
+++ b/tf_config/fvp-pauth-standard-tsp-sdei
@@ -1,9 +1,9 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
 CTX_INCLUDE_PAUTH_REGS=1
 EL3_EXCEPTION_HANDLING=1
+PLAT=fvp
 SDEI_SUPPORT=1
 SPD=tspd
 TSP_NS_INTR_ASYNC_PREEMPT=1
-PLAT=fvp
diff --git a/tftf_config/fvp-fwu-pauth b/tftf_config/fvp-fwu-bti
similarity index 82%
copy from tftf_config/fvp-fwu-pauth
copy to tftf_config/fvp-fwu-bti
index e6a4f23..6147012 100644
--- a/tftf_config/fvp-fwu-pauth
+++ b/tftf_config/fvp-fwu-bti
@@ -1,6 +1,6 @@
 ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=4
 CROSS_COMPILE=aarch64-none-elf-
-ENABLE_PAUTH=1
 NEW_TEST_SESSION=0
 PLAT=fvp
 TESTS=fwu
diff --git a/tftf_config/fvp-fwu-pauth b/tftf_config/fvp-fwu-pauth-standard
similarity index 82%
rename from tftf_config/fvp-fwu-pauth
rename to tftf_config/fvp-fwu-pauth-standard
index e6a4f23..9bb670f 100644
--- a/tftf_config/fvp-fwu-pauth
+++ b/tftf_config/fvp-fwu-pauth-standard
@@ -1,6 +1,6 @@
 ARM_ARCH_MINOR=5
+BRANCH_PROTECTION=1
 CROSS_COMPILE=aarch64-none-elf-
-ENABLE_PAUTH=1
 NEW_TEST_SESSION=0
 PLAT=fvp
 TESTS=fwu
diff --git a/tftf_config/fvp-pauth b/tftf_config/fvp-pauth-bti
similarity index 74%
copy from tftf_config/fvp-pauth
copy to tftf_config/fvp-pauth-bti
index 2e6c76c..f952a08 100644
--- a/tftf_config/fvp-pauth
+++ b/tftf_config/fvp-pauth-bti
@@ -1,4 +1,4 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
-ENABLE_PAUTH=1
+BRANCH_PROTECTION=4
+CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
diff --git a/tftf_config/fvp-pauth b/tftf_config/fvp-pauth-standard
similarity index 74%
rename from tftf_config/fvp-pauth
rename to tftf_config/fvp-pauth-standard
index 2e6c76c..ccd7cfb 100644
--- a/tftf_config/fvp-pauth
+++ b/tftf_config/fvp-pauth-standard
@@ -1,4 +1,4 @@
-CROSS_COMPILE=aarch64-none-elf-
 ARM_ARCH_MINOR=5
-ENABLE_PAUTH=1
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp