diff --git a/plat/hisilicon/hikey960/tests.xml b/plat/hisilicon/hikey960/tests.xml
index c72b783..a1d8746 100644
--- a/plat/hisilicon/hikey960/tests.xml
+++ b/plat/hisilicon/hikey960/tests.xml
@@ -10,10 +10,12 @@
 <!-- External references to all individual tests files. -->
 <!DOCTYPE testsuites [
   <!ENTITY tests-tftf-validation SYSTEM "../../../tftf/tests/tests-tftf-validation.xml">
+  <!ENTITY tests-timer-stress SYSTEM "../../../tftf/tests/tests-timer-stress.xml">
 ]>
 
 <testsuites>
 
   &tests-tftf-validation;
+  &tests-timer-stress;
 
 </testsuites>
diff --git a/tftf/tests/tests-extensive.mk b/tftf/tests/tests-extensive.mk
index d1c6c5e..5e0f006 100644
--- a/tftf/tests/tests-extensive.mk
+++ b/tftf/tests/tests-extensive.mk
@@ -6,6 +6,8 @@
 
 # Run all standard tests, plus the extensive ones.
 include tftf/tests/tests-standard.mk
-TESTS_MAKEFILE += tftf/tests/tests-psci-extensive.mk
+
+TESTS_MAKEFILE += tftf/tests/tests-psci-extensive.mk	\
+		  tftf/tests/tests-timer-stress.mk
 
 include ${TESTS_MAKEFILE}
diff --git a/tftf/tests/tests-extensive.xml b/tftf/tests/tests-extensive.xml
index 773c19e..5824967 100644
--- a/tftf/tests/tests-extensive.xml
+++ b/tftf/tests/tests-extensive.xml
@@ -23,6 +23,7 @@
   <!ENTITY tests-performance SYSTEM "tests-performance.xml">
   <!ENTITY tests-smc SYSTEM "tests-smc.xml">
   <!ENTITY tests-pmu-leakage SYSTEM "tests-pmu-leakage.xml">
+  <!ENTITY tests-timer-stress SYSTEM "tests-timer-stress.xml">
 ]>
 
 <testsuites>
@@ -41,5 +42,6 @@
   &tests-performance;
   &tests-smc;
   &tests-pmu-leakage;
+  &tests-timer-stress;
 
 </testsuites>
diff --git a/tftf/tests/tests-tftf-validation.xml b/tftf/tests/tests-tftf-validation.xml
index 932b10e..e1e48d9 100644
--- a/tftf/tests/tests-tftf-validation.xml
+++ b/tftf/tests/tests-tftf-validation.xml
@@ -20,7 +20,6 @@
      <testcase name="Verify the timer interrupt generation" function="test_timer_framework_interrupt" />
      <testcase name="Target timer to a power down cpu" function="test_timer_target_power_down_cpu" />
      <testcase name="Test scenario where multiple CPUs call same timeout" function="test_timer_target_multiple_same_interval" />
-     <testcase name="Stress test the timer framework" function="stress_test_timer_framework" />
   </testsuite>
 
 </testsuites>
diff --git a/tftf/tests/tests-timer-stress.mk b/tftf/tests/tests-timer-stress.mk
new file mode 100644
index 0000000..50ee723
--- /dev/null
+++ b/tftf/tests/tests-timer-stress.mk
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+TESTS_SOURCES  +=                                              \
+       $(addprefix tftf/tests/framework_validation_tests/,     \
+               test_timer_framework.c                          \
+       )
diff --git a/tftf/tests/tests-timer-stress.xml b/tftf/tests/tests-timer-stress.xml
new file mode 100644
index 0000000..e461e90
--- /dev/null
+++ b/tftf/tests/tests-timer-stress.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright (c) 2022, Arm Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-3-Clause
+-->
+
+<testsuites>
+
+  <testsuite name="Stress tests" description="Validate all stress tests">
+     <testcase name="Stress test the timer framework" function="stress_test_timer_framework" />
+  </testsuite>
+
+</testsuites>