diff --git a/tftf_config/build-docs b/tftf_config/build-docs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tftf_config/build-docs
diff --git a/tftf_config/fvp-2t b/tftf_config/fvp-2t
new file mode 100644
index 0000000..8e17476
--- /dev/null
+++ b/tftf_config/fvp-2t
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_MAX_PE_PER_CPU=2
+PLAT=fvp
diff --git a/tftf_config/fvp-8_2-1x2t b/tftf_config/fvp-8_2-1x2t
new file mode 100644
index 0000000..3da06ae
--- /dev/null
+++ b/tftf_config/fvp-8_2-1x2t
@@ -0,0 +1,6 @@
+ARM_ARCH_MINOR=2
+CROSS_COMPILE=aarch64-none-elf-
+FVP_CLUSTER_COUNT=1
+FVP_MAX_CPUS_PER_CLUSTER=1
+FVP_MAX_PE_PER_CPU=2
+PLAT=fvp
diff --git a/tftf_config/fvp-8_2-2x2t b/tftf_config/fvp-8_2-2x2t
new file mode 100644
index 0000000..34302e3
--- /dev/null
+++ b/tftf_config/fvp-8_2-2x2t
@@ -0,0 +1,6 @@
+ARM_ARCH_MINOR=2
+CROSS_COMPILE=aarch64-none-elf-
+FVP_CLUSTER_COUNT=1
+FVP_MAX_CPUS_PER_CLUSTER=2
+FVP_MAX_PE_PER_CPU=2
+PLAT=fvp
diff --git a/tftf_config/fvp-8_2-4x2t b/tftf_config/fvp-8_2-4x2t
new file mode 100644
index 0000000..b181ea8
--- /dev/null
+++ b/tftf_config/fvp-8_2-4x2t
@@ -0,0 +1,6 @@
+ARM_ARCH_MINOR=2
+CROSS_COMPILE=aarch64-none-elf-
+FVP_CLUSTER_COUNT=1
+FVP_MAX_CPUS_PER_CLUSTER=4
+FVP_MAX_PE_PER_CPU=2
+PLAT=fvp
diff --git a/tftf_config/fvp-8x2t b/tftf_config/fvp-8x2t
new file mode 100644
index 0000000..38c623f
--- /dev/null
+++ b/tftf_config/fvp-8x2t
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+FVP_MAX_CPUS_PER_CLUSTER=8
+FVP_MAX_PE_PER_CPU=2
+PLAT=fvp
diff --git a/tftf_config/fvp-NVM_reboot b/tftf_config/fvp-NVM_reboot
new file mode 100644
index 0000000..86e6c15
--- /dev/null
+++ b/tftf_config/fvp-NVM_reboot
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+NEW_TEST_SESSION=0
+PLAT=fvp
+TESTS=manual
+USE_NVM=1
diff --git a/tftf_config/fvp-aarch32-NVM_reboot b/tftf_config/fvp-aarch32-NVM_reboot
new file mode 100644
index 0000000..62f38af
--- /dev/null
+++ b/tftf_config/fvp-aarch32-NVM_reboot
@@ -0,0 +1,6 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+NEW_TEST_SESSION=0
+PLAT=fvp
+TESTS=manual
+USE_NVM=1
diff --git a/tftf_config/fvp-aarch32-default b/tftf_config/fvp-aarch32-default
new file mode 100644
index 0000000..8b62915
--- /dev/null
+++ b/tftf_config/fvp-aarch32-default
@@ -0,0 +1,3 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=fvp
diff --git a/tftf_config/fvp-aarch32-fwu b/tftf_config/fvp-aarch32-fwu
new file mode 100644
index 0000000..2f94d03
--- /dev/null
+++ b/tftf_config/fvp-aarch32-fwu
@@ -0,0 +1,6 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+NEW_TEST_SESSION=0
+PLAT=fvp
+TESTS=fwu
+USE_NVM=1
diff --git a/tftf_config/fvp-aarch32-xlat-v2 b/tftf_config/fvp-aarch32-xlat-v2
new file mode 100644
index 0000000..ed36dee
--- /dev/null
+++ b/tftf_config/fvp-aarch32-xlat-v2
@@ -0,0 +1,4 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=fvp
+TESTS=xlat-v2
diff --git a/tftf_config/fvp-arm-state-switch b/tftf_config/fvp-arm-state-switch
new file mode 100644
index 0000000..796efa5
--- /dev/null
+++ b/tftf_config/fvp-arm-state-switch
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=arm-state-switch
diff --git a/tftf_config/fvp-boot-req b/tftf_config/fvp-boot-req
new file mode 100644
index 0000000..354b171
--- /dev/null
+++ b/tftf_config/fvp-boot-req
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=boot-req
diff --git a/tftf_config/fvp-cpu-extensions b/tftf_config/fvp-cpu-extensions
new file mode 100644
index 0000000..3d880c9
--- /dev/null
+++ b/tftf_config/fvp-cpu-extensions
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=cpu-extensions
diff --git a/tftf_config/fvp-default b/tftf_config/fvp-default
new file mode 100644
index 0000000..050637b
--- /dev/null
+++ b/tftf_config/fvp-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
diff --git a/tftf_config/fvp-el3-power-state b/tftf_config/fvp-el3-power-state
new file mode 100644
index 0000000..afcf68f
--- /dev/null
+++ b/tftf_config/fvp-el3-power-state
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=el3-power-state
diff --git a/tftf_config/fvp-extensive b/tftf_config/fvp-extensive
new file mode 100644
index 0000000..fa55153
--- /dev/null
+++ b/tftf_config/fvp-extensive
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=extensive
diff --git a/tftf_config/fvp-fwu b/tftf_config/fvp-fwu
new file mode 100644
index 0000000..827b78e
--- /dev/null
+++ b/tftf_config/fvp-fwu
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+NEW_TEST_SESSION=0
+PLAT=fvp
+TESTS=fwu
+USE_NVM=1
diff --git a/tftf_config/fvp-fwu-pauth b/tftf_config/fvp-fwu-pauth
new file mode 100644
index 0000000..e6a4f23
--- /dev/null
+++ b/tftf_config/fvp-fwu-pauth
@@ -0,0 +1,7 @@
+ARM_ARCH_MINOR=5
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_PAUTH=1
+NEW_TEST_SESSION=0
+PLAT=fvp
+TESTS=fwu
+USE_NVM=1
diff --git a/tftf_config/fvp-pauth b/tftf_config/fvp-pauth
new file mode 100644
index 0000000..2e6c76c
--- /dev/null
+++ b/tftf_config/fvp-pauth
@@ -0,0 +1,4 @@
+CROSS_COMPILE=aarch64-none-elf-
+ARM_ARCH_MINOR=5
+ENABLE_PAUTH=1
+PLAT=fvp
diff --git a/tftf_config/fvp-performance b/tftf_config/fvp-performance
new file mode 100644
index 0000000..27abd49
--- /dev/null
+++ b/tftf_config/fvp-performance
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=performance
diff --git a/tftf_config/fvp-psci b/tftf_config/fvp-psci
new file mode 100644
index 0000000..55c0abe
--- /dev/null
+++ b/tftf_config/fvp-psci
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=psci
diff --git a/tftf_config/fvp-psci-extensive b/tftf_config/fvp-psci-extensive
new file mode 100644
index 0000000..2ff5781
--- /dev/null
+++ b/tftf_config/fvp-psci-extensive
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=psci-extensive
diff --git a/tftf_config/fvp-rdn1edge-default b/tftf_config/fvp-rdn1edge-default
new file mode 100644
index 0000000..0532d55
--- /dev/null
+++ b/tftf_config/fvp-rdn1edge-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=rdn1edge
diff --git a/tftf_config/fvp-runtime-instrumentation b/tftf_config/fvp-runtime-instrumentation
new file mode 100644
index 0000000..b4510c2
--- /dev/null
+++ b/tftf_config/fvp-runtime-instrumentation
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=runtime-instrumentation
diff --git a/tftf_config/fvp-sdei b/tftf_config/fvp-sdei
new file mode 100644
index 0000000..0ce0d74
--- /dev/null
+++ b/tftf_config/fvp-sdei
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=sdei
diff --git a/tftf_config/fvp-sgi575-default b/tftf_config/fvp-sgi575-default
new file mode 100644
index 0000000..b0bd2c1
--- /dev/null
+++ b/tftf_config/fvp-sgi575-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=sgi575
diff --git a/tftf_config/fvp-single-fault b/tftf_config/fvp-single-fault
new file mode 100644
index 0000000..3c41547
--- /dev/null
+++ b/tftf_config/fvp-single-fault
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=single-fault
diff --git a/tftf_config/fvp-spm-mm b/tftf_config/fvp-spm-mm
new file mode 100644
index 0000000..dfd34b1
--- /dev/null
+++ b/tftf_config/fvp-spm-mm
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=spm-mm
diff --git a/tftf_config/fvp-standard b/tftf_config/fvp-standard
new file mode 100644
index 0000000..828e864
--- /dev/null
+++ b/tftf_config/fvp-standard
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=standard
diff --git a/tftf_config/fvp-template b/tftf_config/fvp-template
new file mode 100644
index 0000000..e8d996f
--- /dev/null
+++ b/tftf_config/fvp-template
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=template
diff --git a/tftf_config/fvp-tftf-validation b/tftf_config/fvp-tftf-validation
new file mode 100644
index 0000000..d8305e4
--- /dev/null
+++ b/tftf_config/fvp-tftf-validation
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=tftf-validation
diff --git a/tftf_config/fvp-tsp b/tftf_config/fvp-tsp
new file mode 100644
index 0000000..675668b
--- /dev/null
+++ b/tftf_config/fvp-tsp
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=tsp
diff --git a/tftf_config/fvp-uncontainable b/tftf_config/fvp-uncontainable
new file mode 100644
index 0000000..2f058fa
--- /dev/null
+++ b/tftf_config/fvp-uncontainable
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=uncontainable
diff --git a/tftf_config/fvp-unstable b/tftf_config/fvp-unstable
new file mode 100644
index 0000000..a3a73bb
--- /dev/null
+++ b/tftf_config/fvp-unstable
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=unstable
diff --git a/tftf_config/fvp-xlat-v2 b/tftf_config/fvp-xlat-v2
new file mode 100644
index 0000000..8e82af4
--- /dev/null
+++ b/tftf_config/fvp-xlat-v2
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=xlat-v2
diff --git a/tftf_config/hikey960-default b/tftf_config/hikey960-default
new file mode 100644
index 0000000..6bfe5de
--- /dev/null
+++ b/tftf_config/hikey960-default
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=hikey960
+TESTS=tftf-validation
diff --git a/tftf_config/juno-aarch32-default b/tftf_config/juno-aarch32-default
new file mode 100644
index 0000000..d39971f
--- /dev/null
+++ b/tftf_config/juno-aarch32-default
@@ -0,0 +1,3 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=juno
diff --git a/tftf_config/juno-aarch32-extensive b/tftf_config/juno-aarch32-extensive
new file mode 100644
index 0000000..5166a4b
--- /dev/null
+++ b/tftf_config/juno-aarch32-extensive
@@ -0,0 +1,4 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=juno
+TESTS=extensive
diff --git a/tftf_config/juno-aarch32-manual-shutdown b/tftf_config/juno-aarch32-manual-shutdown
new file mode 100644
index 0000000..fe6110f
--- /dev/null
+++ b/tftf_config/juno-aarch32-manual-shutdown
@@ -0,0 +1,6 @@
+CROSS_COMPILE=arm-none-eabi-
+PLAT=juno
+ARCH=aarch32
+USE_NVM=1
+NEW_TEST_SESSION=0
+TESTS=manual-shutdown
diff --git a/tftf_config/juno-aarch32-reboot b/tftf_config/juno-aarch32-reboot
new file mode 100644
index 0000000..21e6472
--- /dev/null
+++ b/tftf_config/juno-aarch32-reboot
@@ -0,0 +1,7 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=juno
+TESTS=reboot
+USE_NVM=1
+NEW_TEST_SESSION=0
+
diff --git a/tftf_config/juno-aarch32-reboot_reset2 b/tftf_config/juno-aarch32-reboot_reset2
new file mode 100644
index 0000000..213db56
--- /dev/null
+++ b/tftf_config/juno-aarch32-reboot_reset2
@@ -0,0 +1,7 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=juno
+TESTS=reboot_reset2
+USE_NVM=1
+NEW_TEST_SESSION=0
+
diff --git a/tftf_config/juno-aarch32-runtime-instrumentation b/tftf_config/juno-aarch32-runtime-instrumentation
new file mode 100644
index 0000000..9d9f35f
--- /dev/null
+++ b/tftf_config/juno-aarch32-runtime-instrumentation
@@ -0,0 +1,4 @@
+ARCH=aarch32
+CROSS_COMPILE=arm-none-eabi-
+PLAT=juno
+TESTS=runtime-instrumentation
diff --git a/tftf_config/juno-arm-state-switch b/tftf_config/juno-arm-state-switch
new file mode 100644
index 0000000..ccfde5e
--- /dev/null
+++ b/tftf_config/juno-arm-state-switch
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=arm-state-switch
diff --git a/tftf_config/juno-boot-req b/tftf_config/juno-boot-req
new file mode 100644
index 0000000..ad46cc0
--- /dev/null
+++ b/tftf_config/juno-boot-req
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=boot-req
diff --git a/tftf_config/juno-cpu-extensions b/tftf_config/juno-cpu-extensions
new file mode 100644
index 0000000..2cfa2df
--- /dev/null
+++ b/tftf_config/juno-cpu-extensions
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=cpu-extensions
diff --git a/tftf_config/juno-default b/tftf_config/juno-default
new file mode 100644
index 0000000..67df331
--- /dev/null
+++ b/tftf_config/juno-default
@@ -0,0 +1,2 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
diff --git a/tftf_config/juno-el3-power-state b/tftf_config/juno-el3-power-state
new file mode 100644
index 0000000..8df8f11
--- /dev/null
+++ b/tftf_config/juno-el3-power-state
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=el3-power-state
diff --git a/tftf_config/juno-extensive b/tftf_config/juno-extensive
new file mode 100644
index 0000000..4a2d898
--- /dev/null
+++ b/tftf_config/juno-extensive
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=extensive
diff --git a/tftf_config/juno-fwu b/tftf_config/juno-fwu
new file mode 100644
index 0000000..01f5cdf
--- /dev/null
+++ b/tftf_config/juno-fwu
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+NEW_TEST_SESSION=0
+PLAT=juno
+TESTS=fwu
+USE_NVM=1
diff --git a/tftf_config/juno-instrumentation b/tftf_config/juno-instrumentation
new file mode 100644
index 0000000..1918f5d
--- /dev/null
+++ b/tftf_config/juno-instrumentation
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=runtime-instrumentation
diff --git a/tftf_config/juno-manual b/tftf_config/juno-manual
new file mode 100644
index 0000000..a8c2568
--- /dev/null
+++ b/tftf_config/juno-manual
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+NEW_TEST_SESSION=0
+PLAT=juno
+TESTS=manual
+USE_NVM=1
diff --git a/tftf_config/juno-manual-shutdown b/tftf_config/juno-manual-shutdown
new file mode 100644
index 0000000..41eadff
--- /dev/null
+++ b/tftf_config/juno-manual-shutdown
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+USE_NVM=1
+NEW_TEST_SESSION=0
+TESTS=manual-shutdown
diff --git a/tftf_config/juno-performance b/tftf_config/juno-performance
new file mode 100644
index 0000000..a44e84a
--- /dev/null
+++ b/tftf_config/juno-performance
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=performance
diff --git a/tftf_config/juno-psci b/tftf_config/juno-psci
new file mode 100644
index 0000000..c2700b8
--- /dev/null
+++ b/tftf_config/juno-psci
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=psci
diff --git a/tftf_config/juno-psci-extensive b/tftf_config/juno-psci-extensive
new file mode 100644
index 0000000..38dbb5d
--- /dev/null
+++ b/tftf_config/juno-psci-extensive
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=psci-extensive
diff --git a/tftf_config/juno-reboot b/tftf_config/juno-reboot
new file mode 100644
index 0000000..3972e01
--- /dev/null
+++ b/tftf_config/juno-reboot
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+NEW_TEST_SESSION=0
+PLAT=juno
+TESTS=reboot
+USE_NVM=1
diff --git a/tftf_config/juno-reboot_reset2 b/tftf_config/juno-reboot_reset2
new file mode 100644
index 0000000..a221ac7
--- /dev/null
+++ b/tftf_config/juno-reboot_reset2
@@ -0,0 +1,5 @@
+CROSS_COMPILE=aarch64-none-elf-
+NEW_TEST_SESSION=0
+PLAT=juno
+TESTS=reboot_reset2
+USE_NVM=1
diff --git a/tftf_config/juno-runtime-instrumentation b/tftf_config/juno-runtime-instrumentation
new file mode 100644
index 0000000..1918f5d
--- /dev/null
+++ b/tftf_config/juno-runtime-instrumentation
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=runtime-instrumentation
diff --git a/tftf_config/juno-sdei b/tftf_config/juno-sdei
new file mode 100644
index 0000000..3e9b8d3
--- /dev/null
+++ b/tftf_config/juno-sdei
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=sdei
diff --git a/tftf_config/juno-single-fault b/tftf_config/juno-single-fault
new file mode 100644
index 0000000..4ddbad9
--- /dev/null
+++ b/tftf_config/juno-single-fault
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=single-fault
diff --git a/tftf_config/juno-standard b/tftf_config/juno-standard
new file mode 100644
index 0000000..ac41a7a
--- /dev/null
+++ b/tftf_config/juno-standard
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=standard
diff --git a/tftf_config/juno-template b/tftf_config/juno-template
new file mode 100644
index 0000000..e633cb1
--- /dev/null
+++ b/tftf_config/juno-template
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=template
diff --git a/tftf_config/juno-tftf-validation b/tftf_config/juno-tftf-validation
new file mode 100644
index 0000000..0158637
--- /dev/null
+++ b/tftf_config/juno-tftf-validation
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=tftf-validation
diff --git a/tftf_config/juno-tsp b/tftf_config/juno-tsp
new file mode 100644
index 0000000..d73d512
--- /dev/null
+++ b/tftf_config/juno-tsp
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=tsp
diff --git a/tftf_config/juno-uncontainable b/tftf_config/juno-uncontainable
new file mode 100644
index 0000000..9e44f25
--- /dev/null
+++ b/tftf_config/juno-uncontainable
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=uncontainable
diff --git a/tftf_config/juno-unstable b/tftf_config/juno-unstable
new file mode 100644
index 0000000..df85ad7
--- /dev/null
+++ b/tftf_config/juno-unstable
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=juno
+TESTS=unstable