diff --git a/tftf/tests/tests-common.mk b/tftf/tests/tests-common.mk
new file mode 100644
index 0000000..c4d35c6
--- /dev/null
+++ b/tftf/tests/tests-common.mk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2018, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+TESTS_MAKEFILE := $(addprefix tftf/tests/,	\
+	tests-arm-state-switch.mk		\
+	tests-boot-req.mk			\
+	tests-cpu-extensions.mk			\
+	tests-el3-power-state.mk		\
+	tests-fwu.mk				\
+	tests-manual.mk				\
+	tests-performance.mk			\
+	tests-psci.mk				\
+	tests-runtime-instrumentation.mk	\
+	tests-sdei.mk				\
+	tests-single-fault.mk			\
+	tests-spm.mk				\
+	tests-template.mk			\
+	tests-tftf-validation.mk		\
+	tests-tsp.mk				\
+	tests-uncontainable.mk			\
+)
+
+include ${TESTS_MAKEFILE}
diff --git a/tftf/tests/tests-extensive.mk b/tftf/tests/tests-extensive.mk
new file mode 100644
index 0000000..92eea35
--- /dev/null
+++ b/tftf/tests/tests-extensive.mk
@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2018, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Run all standard tests, plus the extensive ones.
+include tftf/tests/tests-common.mk
+TESTS_MAKEFILE += tftf/tests/tests-psci-extensive.mk
+
+include ${TESTS_MAKEFILE}