diff --git a/tftf/tests/tests-psci-extensive.xml b/tftf/tests/tests-psci-extensive.xml
index a2c05b2..031bbc7 100644
--- a/tftf/tests/tests-psci-extensive.xml
+++ b/tftf/tests/tests-psci-extensive.xml
@@ -11,9 +11,7 @@
   <testsuite name="PSCI CPU ON OFF Stress Tests" description="Stress-test hotplug">
     <testcase name="Repeated shutdown of all cores to stress test CPU_ON, CPU_SUSPEND and CPU_OFF"
               function="psci_on_off_suspend_coherency_test" />
-    <!-- testcase name="Verify PSCI CPU ON race" function="psci_verify_cpu_on_race" / -->
     <testcase name="PSCI CPU ON OFF stress test" function="psci_cpu_on_off_stress" />
-    <testcase name="PSCI CPU ON OFF SUSPEND stress test" function="psci_cpu_on_off_suspend_stress" />
     <testcase name="Repeated hotplug of all cores to stress test CPU_ON and CPU_OFF"
               function="psci_hotplug_stress_test" />
     <testcase name="Random hotplug cores in a large iteration to stress boot path code"
@@ -22,8 +20,4 @@
               function="psci_cluster_hotplug_stress_test" />
   </testsuite>
 
-  <testsuite name="PSCI SYSTEM SUSPEND stress tests" description="Stress-test SYSTEM SUSPEND">
-    <testcase name="Stress test PSCI_SYSTEM_SUSPEND" function="psci_sys_susp_on_off_stress_test" />
-  </testsuite>
-
 </testsuites>
diff --git a/tftf/tests/tests-unstable.mk b/tftf/tests/tests-unstable.mk
new file mode 100644
index 0000000..5097ffb
--- /dev/null
+++ b/tftf/tests/tests-unstable.mk
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+TESTS_SOURCES	+= $(addprefix tftf/tests/,					\
+	runtime_services/standard_service/psci/system_tests/test_psci_on_off_suspend_stress.c \
+	runtime_services/standard_service/psci/system_tests/test_psci_system_suspend_stress.c \
+)
diff --git a/tftf/tests/tests-unstable.xml b/tftf/tests/tests-unstable.xml
new file mode 100644
index 0000000..fb15de3
--- /dev/null
+++ b/tftf/tests/tests-unstable.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright (c) 2019, Arm Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-3-Clause
+-->
+
+<testsuites>
+
+  <testsuite name="Unstable PSCI tests" description="Need to be fixed">
+    <testcase name="PSCI CPU ON OFF SUSPEND stress test" function="psci_cpu_on_off_suspend_stress" />
+    <testcase name="Verify PSCI CPU ON race" function="psci_verify_cpu_on_race" />
+  </testsuite>
+
+  <testsuite name="Unstable PSCI SYSTEM SUSPEND stress tests" description="Need to be fixed">
+    <testcase name="Stress test PSCI_SYSTEM_SUSPEND" function="psci_sys_susp_on_off_stress_test" />
+  </testsuite>
+
+</testsuites>