diff --git a/group/tf-l1-boot-tests-foundation/fvp-default-pie:fvp-linux-dtb.foundation-fip.uboot-foundationv8 b/group/tf-l1-boot-tests-foundation/fvp-default-pie:fvp-linux-dtb.foundation-fip.uboot-foundationv8
new file mode 100644
index 0000000..dc36574
--- /dev/null
+++ b/group/tf-l1-boot-tests-foundation/fvp-default-pie:fvp-linux-dtb.foundation-fip.uboot-foundationv8
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-bl2_el3/fvp-bl2-el3-pie:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug b/group/tf-l2-boot-tests-bl2_el3/fvp-bl2-el3-pie:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
new file mode 100644
index 0000000..dc36574
--- /dev/null
+++ b/group/tf-l2-boot-tests-bl2_el3/fvp-bl2-el3-pie:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-latest/fvp-tspd-pie:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug b/group/tf-l2-boot-tests-latest/fvp-tspd-pie:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug
new file mode 100644
index 0000000..dc36574
--- /dev/null
+++ b/group/tf-l2-boot-tests-latest/fvp-tspd-pie:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/tf_config/fvp-bl2-el3-pie b/tf_config/fvp-bl2-el3-pie
new file mode 100644
index 0000000..793c8f4
--- /dev/null
+++ b/tf_config/fvp-bl2-el3-pie
@@ -0,0 +1,4 @@
+BL2_AT_EL3=1
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+ENABLE_PIE=1
diff --git a/tf_config/fvp-default-pie b/tf_config/fvp-default-pie
new file mode 100644
index 0000000..b45bb2e
--- /dev/null
+++ b/tf_config/fvp-default-pie
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+ENABLE_PIE=1
diff --git a/tf_config/fvp-tspd-pie b/tf_config/fvp-tspd-pie
new file mode 100644
index 0000000..cf2e781
--- /dev/null
+++ b/tf_config/fvp-tspd-pie
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+SPD=tspd
+ENABLE_PIE=1