Test: Remove test result from struct test_t

It is unnecessary to assign a dedicated test result structure in
each test description. Test framework can define a common
test_result_t and pass it to each test case.

This patch removed the test_result_t in struct test_t to decrease
16 bytes * numbers of test cases.

Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
Change-Id: Ia46f88ec1641860b1d3416089cc79a63579a9cb0
diff --git a/test/bl2/mcuboot/suites/integration/mcuboot_integration_tests.c b/test/bl2/mcuboot/suites/integration/mcuboot_integration_tests.c
index baf7394..603c8b3 100644
--- a/test/bl2/mcuboot/suites/integration/mcuboot_integration_tests.c
+++ b/test/bl2/mcuboot/suites/integration/mcuboot_integration_tests.c
@@ -275,7 +275,7 @@
 
 static struct test_t integration_tests[] = {
     {&tfm_mcuboot_integration_test_0001, "TFM_MCUBOOT_INTEGRATION_TEST_0001",
-     "Integration invalid image signature test", {TEST_PASSED} },
+     "Integration invalid image signature test"},
 };
 
 void register_testsuite_mcuboot_integration(struct test_suite_t *p_test_suite)
diff --git a/test/framework/test_framework.c b/test/framework/test_framework.c
index 73bdbeb..0310474 100644
--- a/test/framework/test_framework.c
+++ b/test/framework/test_framework.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -12,9 +12,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-static void test_failed(const struct test_t *p_test)
+static void test_failed(const struct test_result_t *ret, const char *name)
 {
-    const struct test_result_t *ret = &p_test->ret;
     printf_set_color(RED);
     if (ret->info_msg != 0) {
         TEST_LOG("  %s", ret->info_msg);
@@ -27,7 +26,7 @@
         }
     }
 
-    TEST_LOG("  TEST: %s - FAILED!\r\n", p_test->name);
+    TEST_LOG("  TEST: %s - FAILED!\r\n", name);
 }
 
 static void print_error(const char *err_msg)
@@ -89,6 +88,7 @@
     uint32_t failed_tests = 0;
     uint32_t i;
     struct test_t *p_test;
+    struct test_result_t ret = {0};
 
     if (test_suite == 0 || test_suite->freg == 0) {
         print_error("TEST_SUITE_ERR_INVALID_DATA!");
@@ -120,12 +120,12 @@
                  p_test->name, p_test->desc);
 
         /* Sets the default value before the test */
-        p_test->ret.val = TEST_PASSED;
+        ret.val = TEST_PASSED;
 
         /* Executes the test */
-        p_test->test(&p_test->ret);
-        if (p_test->ret.val == TEST_FAILED) {
-            test_failed(p_test);
+        p_test->test(&ret);
+        if (ret.val == TEST_FAILED) {
+            test_failed(&ret, p_test->name);
             failed_tests++;
         } else {
             printf_set_color(GREEN);
diff --git a/test/framework/test_framework.h b/test/framework/test_framework.h
index 1378905..c205614 100644
--- a/test/framework/test_framework.h
+++ b/test/framework/test_framework.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -45,7 +45,6 @@
     TEST_FUN * const test;         /*!< Test function to call */
     const char *name;              /*!< Test name */
     const char *desc;              /*!< Test description */
-    struct test_result_t ret;      /*!< Test result */
 };
 
 struct test_suite_t;
diff --git a/test/secure_fw/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c b/test/secure_fw/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
index 2824e66..901958a 100644
--- a/test/secure_fw/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/attestation/non_secure/attest_asymmetric_ns_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -29,16 +29,16 @@
 static struct test_t attestation_interface_tests[] = {
 #ifdef INCLUDE_TEST_CODE /* Remove them from release build */
     {&tfm_attest_test_1001, "TFM_NS_ATTEST_TEST_1001",
-     "Minimal token test of attest token", {TEST_PASSED} },
+     "Minimal token test of attest token"},
     {&tfm_attest_test_1002, "TFM_NS_ATTEST_TEST_1002",
-     "Minimal token size test of attest token", {TEST_PASSED} },
+     "Minimal token size test of attest token"},
     {&tfm_attest_test_1003, "TFM_NS_ATTEST_TEST_1003",
-     "Short circuit signature test of attest token", {TEST_PASSED} },
+     "Short circuit signature test of attest token"},
 #endif
     {&tfm_attest_test_1004, "TFM_NS_ATTEST_TEST_1004",
-     "ECDSA signature test of attest token", {TEST_PASSED} },
+     "ECDSA signature test of attest token"},
     {&tfm_attest_test_1005, "TFM_NS_ATTEST_TEST_1005",
-     "Negative test cases for initial attestation service", {TEST_PASSED} },
+     "Negative test cases for initial attestation service"},
 };
 
 void
diff --git a/test/secure_fw/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c b/test/secure_fw/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
index a5a8791..ab61614 100644
--- a/test/secure_fw/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/attestation/non_secure/attest_symmetric_ns_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -24,16 +24,16 @@
 
 static struct test_t attestation_interface_tests[] = {
     {&tfm_attest_test_2001, "TFM_NS_ATTEST_TEST_2001",
-     "Symmetric key algorithm based Initial Attestation test", {0} },
+     "Symmetric key algorithm based Initial Attestation test"},
 #ifdef INCLUDE_TEST_CODE /* Remove them from release build */
     {&tfm_attest_test_2002, "TFM_NS_ATTEST_TEST_2002",
-     "Minimal token test of attest token", {0} },
+     "Minimal token test of attest token"},
     {&tfm_attest_test_2003, "TFM_NS_ATTEST_TEST_2003",
-     "Minimal token size test of attest token", {0} },
+     "Minimal token size test of attest token"},
     {&tfm_attest_test_2004, "TFM_NS_ATTEST_TEST_2004",
-     "Short circuit tag test of attest token", {0} },
+     "Short circuit tag test of attest token"},
     {&tfm_attest_test_2005, "TFM_NS_ATTEST_TEST_2005",
-     "Negative test cases for initial attestation service", {0} },
+     "Negative test cases for initial attestation service"},
 #endif
 };
 
diff --git a/test/secure_fw/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c b/test/secure_fw/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
index f06f430..82f8872 100644
--- a/test/secure_fw/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
+++ b/test/secure_fw/suites/attestation/secure/attest_asymmetric_s_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -29,16 +29,16 @@
 static struct test_t attestation_interface_tests[] = {
 #ifdef INCLUDE_TEST_CODE /* Remove them from release build */
     {&tfm_attest_test_1001, "TFM_S_ATTEST_TEST_1001",
-     "Minimal token test of attest token", {TEST_PASSED} },
+     "Minimal token test of attest token"},
     {&tfm_attest_test_1002, "TFM_S_ATTEST_TEST_1002",
-     "Minimal token size test of attest token", {TEST_PASSED} },
+     "Minimal token size test of attest token"},
     {&tfm_attest_test_1003, "TFM_S_ATTEST_TEST_1003",
-     "Short circuit signature test of attest token", {TEST_PASSED} },
+     "Short circuit signature test of attest token"},
 #endif
     {&tfm_attest_test_1004, "TFM_S_ATTEST_TEST_1004",
-     "ECDSA signature test of attest token", {TEST_PASSED} },
+     "ECDSA signature test of attest token"},
     {&tfm_attest_test_1005, "TFM_S_ATTEST_TEST_1005",
-     "Negative test cases for initial attestation service", {TEST_PASSED} },
+     "Negative test cases for initial attestation service"},
 };
 
 void
diff --git a/test/secure_fw/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c b/test/secure_fw/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
index 3aeeee0..7591c1e 100644
--- a/test/secure_fw/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
+++ b/test/secure_fw/suites/attestation/secure/attest_symmetric_s_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -24,16 +24,16 @@
 
 static struct test_t attestation_interface_tests[] = {
     {&tfm_attest_test_2001, "TFM_S_ATTEST_TEST_2001",
-     "Symmetric key algorithm based Initial Attestation test", {0} },
+     "Symmetric key algorithm based Initial Attestation test"},
 #ifdef INCLUDE_TEST_CODE /* Remove them from release build */
     {&tfm_attest_test_2002, "TFM_S_ATTEST_TEST_2002",
-     "Minimal token test of attest token", {0} },
+     "Minimal token test of attest token"},
     {&tfm_attest_test_2003, "TFM_S_ATTEST_TEST_2003",
-     "Minimal token size test of attest token", {0} },
+     "Minimal token size test of attest token"},
     {&tfm_attest_test_2004, "TFM_S_ATTEST_TEST_2004",
-     "Short circuit tag test of attest token", {0} },
+     "Short circuit tag test of attest token"},
     {&tfm_attest_test_2005, "TFM_S_ATTEST_TEST_2005",
-     "Negative test cases for initial attestation service", {0} },
+     "Negative test cases for initial attestation service"},
 #endif
 };
 
diff --git a/test/secure_fw/suites/audit/non_secure/audit_ns_interface_testsuite.c b/test/secure_fw/suites/audit/non_secure/audit_ns_interface_testsuite.c
index 10b3b6b..c9d6b86 100644
--- a/test/secure_fw/suites/audit/non_secure/audit_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/audit/non_secure/audit_ns_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -54,7 +54,7 @@
 
 static struct test_t audit_veneers_tests[] = {
     {&tfm_audit_test_1001, "TFM_NS_AUDIT_TEST_1001",
-     "Non Secure functional", {TEST_PASSED} },
+     "Non Secure functional"},
 };
 
 void register_testsuite_ns_audit_interface(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/audit/secure/audit_s_interface_testsuite.c b/test/secure_fw/suites/audit/secure/audit_s_interface_testsuite.c
index 6bb04f2..3f9618d 100644
--- a/test/secure_fw/suites/audit/secure/audit_s_interface_testsuite.c
+++ b/test/secure_fw/suites/audit/secure/audit_s_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -33,7 +33,7 @@
 
 static struct test_t audit_veneers_tests[] = {
     {&tfm_audit_test_1001, "TFM_S_AUDIT_TEST_1001",
-     "Secure functional", {TEST_PASSED} },
+     "Secure functional"},
 };
 
 void register_testsuite_s_audit_interface(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/core/non_secure/core_ns_positive_testsuite.c b/test/secure_fw/suites/core/non_secure/core_ns_positive_testsuite.c
index 48ebd80..e4cdea7 100644
--- a/test/secure_fw/suites/core/non_secure/core_ns_positive_testsuite.c
+++ b/test/secure_fw/suites/core/non_secure/core_ns_positive_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022, Arm Limited. All rights reserved.
  * Copyright (c) 2020, Cypress Semiconductor Corporation. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
@@ -27,7 +27,7 @@
 #define TOSTRING(x) #x
 #define CORE_TEST_DESCRIPTION(number, fn, description) \
     {fn, "TFM_NS_CORE_TEST_"TOSTRING(number),\
-     description, {TEST_PASSED} }
+     description}
 
 #ifndef TFM_PSA_API
 static void tfm_core_test_get_caller_client_id(struct test_result_t *ret);
diff --git a/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c b/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
index 7541135..1c15bbe 100644
--- a/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
@@ -84,122 +84,112 @@
 
 static struct test_t crypto_tests[] = {
     {&tfm_crypto_test_1001, "TFM_NS_CRYPTO_TEST_1001",
-     "Non Secure Key management interface", {TEST_PASSED} },
+     "Non Secure Key management interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_CBC
     {&tfm_crypto_test_1002, "TFM_NS_CRYPTO_TEST_1002",
-     "Non Secure Symmetric encryption (AES-128-CBC) interface", {TEST_PASSED} },
+     "Non Secure Symmetric encryption (AES-128-CBC) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CBC */
 #ifdef TFM_CRYPTO_TEST_ALG_CFB
     {&tfm_crypto_test_1003, "TFM_NS_CRYPTO_TEST_1003",
-     "Non Secure Symmetric encryption (AES-128-CFB) interface", {TEST_PASSED} },
+     "Non Secure Symmetric encryption (AES-128-CFB) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CFB */
 #ifdef TFM_CRYPTO_TEST_ALG_CTR
     {&tfm_crypto_test_1005, "TFM_NS_CRYPTO_TEST_1005",
-     "Non Secure Symmetric encryption (AES-128-CTR) interface", {TEST_PASSED} },
+     "Non Secure Symmetric encryption (AES-128-CTR) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CTR */
     {&tfm_crypto_test_1007, "TFM_NS_CRYPTO_TEST_1007",
-     "Non Secure Symmetric encryption invalid cipher", {TEST_PASSED} },
+     "Non Secure Symmetric encryption invalid cipher"},
     {&tfm_crypto_test_1008, "TFM_NS_CRYPTO_TEST_1008",
-     "Non Secure Symmetric encryption invalid cipher (AES-152)", {TEST_PASSED} },
+     "Non Secure Symmetric encryption invalid cipher (AES-152)"},
 #ifdef TFM_CRYPTO_TEST_ALG_CFB
     {&tfm_crypto_test_1009, "TFM_NS_CRYPTO_TEST_1009",
-     "Non Secure Symmetric encryption invalid cipher (HMAC-128-CFB)",
-     {TEST_PASSED} },
+     "Non Secure Symmetric encryption invalid cipher (HMAC-128-CFB)"},
 #endif /* TFM_CRYPTO_TEST_ALG_CFB */
     {&tfm_crypto_test_1010, "TFM_NS_CRYPTO_TEST_1010",
-     "Non Secure Unsupported Hash (SHA-1) interface", {TEST_PASSED} },
+     "Non Secure Unsupported Hash (SHA-1) interface"},
     {&tfm_crypto_test_1011, "TFM_NS_CRYPTO_TEST_1011",
-     "Non Secure Hash (SHA-224) interface", {TEST_PASSED} },
+     "Non Secure Hash (SHA-224) interface"},
     {&tfm_crypto_test_1012, "TFM_NS_CRYPTO_TEST_1012",
-     "Non Secure Hash (SHA-256) interface", {TEST_PASSED} },
+     "Non Secure Hash (SHA-256) interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_SHA_512
     {&tfm_crypto_test_1013, "TFM_NS_CRYPTO_TEST_1013",
-     "Non Secure Hash (SHA-384) interface", {TEST_PASSED} },
+     "Non Secure Hash (SHA-384) interface"},
     {&tfm_crypto_test_1014, "TFM_NS_CRYPTO_TEST_1014",
-     "Non Secure Hash (SHA-512) interface", {TEST_PASSED} },
+     "Non Secure Hash (SHA-512) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
     {&tfm_crypto_test_1019, "TFM_NS_CRYPTO_TEST_1019",
-     "Non Secure Unsupported HMAC (SHA-1) interface", {TEST_PASSED} },
+     "Non Secure Unsupported HMAC (SHA-1) interface"},
     {&tfm_crypto_test_1020, "TFM_NS_CRYPTO_TEST_1020",
-     "Non Secure HMAC (SHA-256) interface", {TEST_PASSED} },
+     "Non Secure HMAC (SHA-256) interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_SHA_512
     {&tfm_crypto_test_1021, "TFM_NS_CRYPTO_TEST_1021",
-     "Non Secure HMAC (SHA-384) interface", {TEST_PASSED} },
+     "Non Secure HMAC (SHA-384) interface"},
     {&tfm_crypto_test_1022, "TFM_NS_CRYPTO_TEST_1022",
-     "Non Secure HMAC (SHA-512) interface", {TEST_PASSED} },
+     "Non Secure HMAC (SHA-512) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
     {&tfm_crypto_test_1024, "TFM_NS_CRYPTO_TEST_1024",
-     "Non Secure HMAC with long key (SHA-224) interface", {TEST_PASSED} },
+     "Non Secure HMAC with long key (SHA-224) interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_CCM
     {&tfm_crypto_test_1030, "TFM_NS_CRYPTO_TEST_1030",
-     "Non Secure AEAD (AES-128-CCM) interface", {TEST_PASSED} },
+     "Non Secure AEAD (AES-128-CCM) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CCM */
 #ifdef TFM_CRYPTO_TEST_ALG_GCM
     {&tfm_crypto_test_1031, "TFM_NS_CRYPTO_TEST_1031",
-     "Non Secure AEAD (AES-128-GCM) interface", {TEST_PASSED} },
+     "Non Secure AEAD (AES-128-GCM) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_GCM */
     {&tfm_crypto_test_1032, "TFM_NS_CRYPTO_TEST_1032",
-     "Non Secure key policy interface", {TEST_PASSED} },
+     "Non Secure key policy interface"},
     {&tfm_crypto_test_1033, "TFM_NS_CRYPTO_TEST_1033",
-     "Non Secure key policy check permissions", {TEST_PASSED} },
+     "Non Secure key policy check permissions"},
     {&tfm_crypto_test_1034, "TFM_NS_CRYPTO_TEST_1034",
-     "Non Secure persistent key interface", {TEST_PASSED} },
+     "Non Secure persistent key interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_CCM
     {&tfm_crypto_test_1035, "TFM_NS_CRYPTO_TEST_1035",
-     "Non Secure AEAD interface with truncated auth tag (AES-128-CCM-8)",
-     {TEST_PASSED} },
+     "Non Secure AEAD interface with truncated auth tag (AES-128-CCM-8)"},
 #endif /* TFM_CRYPTO_TEST_ALG_CCM */
     {&tfm_crypto_test_1036, "TFM_NS_CRYPTO_TEST_1036",
-     "Non Secure TLS 1.2 PRF key derivation", {TEST_PASSED} },
+     "Non Secure TLS 1.2 PRF key derivation"},
     {&tfm_crypto_test_1037, "TFM_NS_CRYPTO_TEST_1037",
-     "Non Secure TLS-1.2 PSK-to-MasterSecret key derivation", {TEST_PASSED} },
+     "Non Secure TLS-1.2 PSK-to-MasterSecret key derivation"},
 #ifdef TFM_CRYPTO_TEST_HKDF
     {&tfm_crypto_test_1038, "TFM_NS_CRYPTO_TEST_1038",
-     "Non Secure HKDF key derivation", {TEST_PASSED} },
+     "Non Secure HKDF key derivation"},
 #endif /* TFM_CRYPTO_TEST_HKDF */
 #ifdef TFM_CRYPTO_TEST_ECDH
     {&tfm_crypto_test_1039, "TFM_NS_CRYPTO_TEST_1039",
-     "Non Secure ECDH key agreement", {TEST_PASSED} },
+     "Non Secure ECDH key agreement"},
 #endif /* TFM_CRYPTO_TEST_ECDH */
 #ifdef TFM_CRYPTO_TEST_ALG_OFB
     {&tfm_crypto_test_1040, "TFM_NS_CRYPTO_TEST_1040",
-     "Non Secure Symmetric encryption (AES-128-OFB) interface",
-    {TEST_PASSED} },
+     "Non Secure Symmetric encryption (AES-128-OFB) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_OFB */
 #ifdef TFM_CRYPTO_TEST_ALG_ECB
     {&tfm_crypto_test_1041, "TFM_NS_CRYPTO_TEST_1041",
-     "Non Secure Symmetric encryption (AES-128-ECB) interface",
-    {TEST_PASSED} },
+     "Non Secure Symmetric encryption (AES-128-ECB) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_ECB */
 #ifdef TFM_CRYPTO_TEST_ASYM_ENCRYPT
     {&tfm_crypto_test_1042, "TFM_NS_CRYPTO_TEST_1042",
-     "Non Secure Asymmetric encryption interface (RSA_OAEP)", {TEST_PASSED} },
+     "Non Secure Asymmetric encryption interface (RSA_OAEP)"},
     {&tfm_crypto_test_1043, "TFM_NS_CRYPTO_TEST_1043",
-     "Non Secure Asymmetric encryption interface (RSA_PKCS1V15)",
-     {TEST_PASSED} },
+     "Non Secure Asymmetric encryption interface (RSA_PKCS1V15)"},
     {&tfm_crypto_test_1044, "TFM_NS_CRYPTO_TEST_1044",
-     "Non Secure Sign and verify message interface (ECDSA-SECP256R1-SHA256)",
-     {TEST_PASSED} },
+     "Non Secure Sign and verify message interface (ECDSA-SECP256R1-SHA256)"},
 #endif /* TFM_CRYPTO_TEST_ASYM_ENCRYPT */
 #ifdef TFM_CRYPTO_TEST_ALG_CBC
     {&tfm_crypto_test_1045, "TFM_NS_CRYPTO_TEST_1045",
-     "Non Secure Symmetric encryption (AES-128-CBC-PKCS7) interface",
-     {TEST_PASSED} },
+     "Non Secure Symmetric encryption (AES-128-CBC-PKCS7) interface"},
     {&tfm_crypto_test_1046, "TFM_NS_CRYPTO_TEST_1046",
-     "Non Secure Symmetric encryption (AES-128-CBC-PKCS7) interface, shorter",
-     {TEST_PASSED} },
+     "Non Secure Symmetric encryption (AES-128-CBC-PKCS7) interface, shorter"},
     {&tfm_crypto_test_1047, "TFM_NS_CRYPTO_TEST_1047",
-     "Non Secure Symmetric encryption (AES-128-CBC-PKCS7) interface, longer",
-     {TEST_PASSED} },
+     "Non Secure Symmetric encryption (AES-128-CBC-PKCS7) interface, longer"},
 #endif /* TFM_CRYPTO_TEST_ALG_CBC */
 #ifdef TFM_CRYPTO_TEST_CHACHA20
     {&tfm_crypto_test_1048, "TFM_NS_CRYPTO_TEST_1048",
-     "Non Secure Symmetric encryption (CHACHA20-256) interface",
-     {TEST_PASSED} },
+     "Non Secure Symmetric encryption (CHACHA20-256) interface"},
 #endif /* TFM_CRYPTO_TEST_CHACHA20 */
 #ifdef TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305
     {&tfm_crypto_test_1049, "TFM_NS_CRYPTO_TEST_1049",
-     "Non Secure AEAD (CHACHA20-256-POLY1305) interface", {TEST_PASSED} },
+     "Non Secure AEAD (CHACHA20-256-POLY1305) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
 };
 
diff --git a/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c b/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
index 596cecc..c731b08 100644
--- a/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
+++ b/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
@@ -86,121 +86,114 @@
 
 static struct test_t crypto_tests[] = {
     {&tfm_crypto_test_1001, "TFM_S_CRYPTO_TEST_1001",
-     "Secure Key management interface", {TEST_PASSED} },
+     "Secure Key management interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_CBC
     {&tfm_crypto_test_1002, "TFM_S_CRYPTO_TEST_1002",
-     "Secure Symmetric encryption (AES-128-CBC) interface", {TEST_PASSED} },
+     "Secure Symmetric encryption (AES-128-CBC) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CBC */
 #ifdef TFM_CRYPTO_TEST_ALG_CFB
     {&tfm_crypto_test_1003, "TFM_S_CRYPTO_TEST_1003",
-     "Secure Symmetric encryption (AES-128-CFB) interface", {TEST_PASSED} },
+     "Secure Symmetric encryption (AES-128-CFB) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CFB */
 #ifdef TFM_CRYPTO_TEST_ALG_CTR
     {&tfm_crypto_test_1005, "TFM_S_CRYPTO_TEST_1005",
-     "Secure Symmetric encryption (AES-128-CTR) interface", {TEST_PASSED} },
+     "Secure Symmetric encryption (AES-128-CTR) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CTR */
     {&tfm_crypto_test_1007, "TFM_S_CRYPTO_TEST_1007",
-     "Secure Symmetric encryption invalid cipher", {TEST_PASSED} },
+     "Secure Symmetric encryption invalid cipher"},
     {&tfm_crypto_test_1008, "TFM_S_CRYPTO_TEST_1008",
-     "Secure Symmetric encryption invalid cipher (AES-152)", {TEST_PASSED} },
+     "Secure Symmetric encryption invalid cipher (AES-152)"},
 #ifdef TFM_CRYPTO_TEST_ALG_CFB
     {&tfm_crypto_test_1009, "TFM_S_CRYPTO_TEST_1009",
-     "Secure Symmetric encryption invalid cipher (HMAC-128-CFB)", {TEST_PASSED} },
+     "Secure Symmetric encryption invalid cipher (HMAC-128-CFB)"},
 #endif /* TFM_CRYPTO_TEST_ALG_CFB */
     {&tfm_crypto_test_1010, "TFM_S_CRYPTO_TEST_1010",
-     "Secure Unsupported Hash (SHA-1) interface", {TEST_PASSED} },
+     "Secure Unsupported Hash (SHA-1) interface"},
     {&tfm_crypto_test_1011, "TFM_S_CRYPTO_TEST_1011",
-     "Secure Hash (SHA-224) interface", {TEST_PASSED} },
+     "Secure Hash (SHA-224) interface"},
     {&tfm_crypto_test_1012, "TFM_S_CRYPTO_TEST_1012",
-     "Secure Hash (SHA-256) interface", {TEST_PASSED} },
+     "Secure Hash (SHA-256) interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_SHA_512
     {&tfm_crypto_test_1013, "TFM_S_CRYPTO_TEST_1013",
-     "Secure Hash (SHA-384) interface", {TEST_PASSED} },
+     "Secure Hash (SHA-384) interface"},
     {&tfm_crypto_test_1014, "TFM_S_CRYPTO_TEST_1014",
-     "Secure Hash (SHA-512) interface", {TEST_PASSED} },
+     "Secure Hash (SHA-512) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
     {&tfm_crypto_test_1019, "TFM_S_CRYPTO_TEST_1019",
-     "Secure Unsupported HMAC (SHA-1) interface", {TEST_PASSED} },
+     "Secure Unsupported HMAC (SHA-1) interface"},
     {&tfm_crypto_test_1020, "TFM_S_CRYPTO_TEST_1020",
-     "Secure HMAC (SHA-256) interface", {TEST_PASSED} },
+     "Secure HMAC (SHA-256) interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_SHA_512
     {&tfm_crypto_test_1021, "TFM_S_CRYPTO_TEST_1021",
-     "Secure HMAC (SHA-384) interface", {TEST_PASSED} },
+     "Secure HMAC (SHA-384) interface"},
     {&tfm_crypto_test_1022, "TFM_S_CRYPTO_TEST_1022",
-     "Secure HMAC (SHA-512) interface", {TEST_PASSED} },
+     "Secure HMAC (SHA-512) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
     {&tfm_crypto_test_1024, "TFM_S_CRYPTO_TEST_1024",
-     "Secure HMAC with long key (SHA-224) interface", {TEST_PASSED} },
+     "Secure HMAC with long key (SHA-224) interface"},
 #ifdef TFM_CRYPTO_TEST_ALG_CCM
     {&tfm_crypto_test_1030, "TFM_S_CRYPTO_TEST_1030",
-     "Secure AEAD (AES-128-CCM) interface", {TEST_PASSED} },
+     "Secure AEAD (AES-128-CCM) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CCM */
 #ifdef TFM_CRYPTO_TEST_ALG_GCM
     {&tfm_crypto_test_1031, "TFM_S_CRYPTO_TEST_1031",
-     "Secure AEAD (AES-128-GCM) interface", {TEST_PASSED} },
+     "Secure AEAD (AES-128-GCM) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_GCM */
     {&tfm_crypto_test_1032, "TFM_S_CRYPTO_TEST_1032",
-     "Secure key policy interface", {TEST_PASSED} },
+     "Secure key policy interface"},
     {&tfm_crypto_test_1033, "TFM_S_CRYPTO_TEST_1033",
-     "Secure key policy check permissions", {TEST_PASSED} },
+     "Secure key policy check permissions"},
     {&tfm_crypto_test_1034, "TFM_S_CRYPTO_TEST_1034",
-     "Secure persistent key interface", {TEST_PASSED} },
+     "Secure persistent key interface"},
     {&tfm_crypto_test_1035, "TFM_S_CRYPTO_TEST_1035",
-     "Key access control", {TEST_PASSED} },
+     "Key access control"},
 #ifdef TFM_CRYPTO_TEST_ALG_CCM
     {&tfm_crypto_test_1036, "TFM_S_CRYPTO_TEST_1036",
-     "Secure AEAD interface with truncated auth tag (AES-128-CCM-8)",
-     {TEST_PASSED} },
+     "Secure AEAD interface with truncated auth tag (AES-128-CCM-8)"},
 #endif /* TFM_CRYPTO_TEST_ALG_CCM */
     {&tfm_crypto_test_1037, "TFM_S_CRYPTO_TEST_1037",
-     "Secure TLS 1.2 PRF key derivation", {TEST_PASSED} },
+     "Secure TLS 1.2 PRF key derivation"},
     {&tfm_crypto_test_1038, "TFM_S_CRYPTO_TEST_1038",
-     "Secure TLS-1.2 PSK-to-MasterSecret key derivation", {TEST_PASSED} },
+     "Secure TLS-1.2 PSK-to-MasterSecret key derivation"},
 #ifdef TFM_CRYPTO_TEST_HKDF
     {&tfm_crypto_test_1039, "TFM_S_CRYPTO_TEST_1039",
-     "Secure HKDF key derivation", {TEST_PASSED} },
+     "Secure HKDF key derivation"},
 #endif /* TFM_CRYPTO_TEST_HKDF */
 #ifdef TFM_CRYPTO_TEST_ECDH
     {&tfm_crypto_test_1040, "TFM_S_CRYPTO_TEST_1040",
-     "Secure ECDH key agreement", {TEST_PASSED} },
+     "Secure ECDH key agreement"},
 #endif /* TFM_CRYPTO_TEST_ECDH */
 #ifdef TFM_CRYPTO_TEST_ALG_OFB
     {&tfm_crypto_test_1041, "TFM_S_CRYPTO_TEST_1041",
-     "Secure Symmetric encryption (AES-128-OFB) interface",
-    {TEST_PASSED} },
+     "Secure Symmetric encryption (AES-128-OFB) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_OFB */
 #ifdef TFM_CRYPTO_TEST_ALG_ECB
     {&tfm_crypto_test_1042, "TFM_S_CRYPTO_TEST_1042",
-     "Secure Symmetric encryption (AES-128-ECB) interface",
-    {TEST_PASSED} },
+     "Secure Symmetric encryption (AES-128-ECB) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_ECB */
 #ifdef TFM_CRYPTO_TEST_ASYM_ENCRYPT
     {&tfm_crypto_test_1043, "TFM_S_CRYPTO_TEST_1043",
-     "Secure Asymmetric encryption interface (RSA_OAEP)", {TEST_PASSED} },
+     "Secure Asymmetric encryption interface (RSA_OAEP)"},
     {&tfm_crypto_test_1044, "TFM_S_CRYPTO_TEST_1044",
-     "Secure Asymmetric encryption interface (RSA_PKCS1V15)", {TEST_PASSED} },
+     "Secure Asymmetric encryption interface (RSA_PKCS1V15)"},
     {&tfm_crypto_test_1045, "TFM_S_CRYPTO_TEST_1045",
-     "Secure Sign and verify message interface (ECDSA-SECP256R1-SHA256)",
-     {TEST_PASSED} },
+     "Secure Sign and verify message interface (ECDSA-SECP256R1-SHA256)"},
 #endif /* TFM_CRYPTO_TEST_ASYM_ENCRYPT */
 #ifdef TFM_CRYPTO_TEST_ALG_CBC
     {&tfm_crypto_test_1046, "TFM_S_CRYPTO_TEST_1046",
-     "Secure Symmetric encryption (AES-128-CBC-PKCS7) interface",
-     {TEST_PASSED} },
+     "Secure Symmetric encryption (AES-128-CBC-PKCS7) interface"},
     {&tfm_crypto_test_1047, "TFM_S_CRYPTO_TEST_1047",
-     "Secure Symmetric encryption (AES-128-CBC-PKCS7) interface, shorter",
-     {TEST_PASSED} },
+     "Secure Symmetric encryption (AES-128-CBC-PKCS7) interface, shorter"},
     {&tfm_crypto_test_1048, "TFM_S_CRYPTO_TEST_1048",
-     "Secure Symmetric encryption (AES-128-CBC-PKCS7) interface, longer",
-     {TEST_PASSED} },
+     "Secure Symmetric encryption (AES-128-CBC-PKCS7) interface, longer"},
 #endif /* TFM_CRYPTO_TEST_ALG_CBC */
 #ifdef TFM_CRYPTO_TEST_CHACHA20
     {&tfm_crypto_test_1049, "TFM_S_CRYPTO_TEST_1049",
-     "Secure Symmetric encryption (CHACHA20-256) interface", {TEST_PASSED} },
+     "Secure Symmetric encryption (CHACHA20-256) interface"},
 #endif /* TFM_CRYPTO_TEST_CHACHA20 */
 #ifdef TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305
     {&tfm_crypto_test_1050, "TFM_S_CRYPTO_TEST_1050",
-     "Secure AEAD (CHACHA20-256-POLY1305) interface", {TEST_PASSED} },
+     "Secure AEAD (CHACHA20-256-POLY1305) interface"},
 #endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
 };
 
diff --git a/test/secure_fw/suites/extra/non_secure/extra_ns_tests.c b/test/secure_fw/suites/extra/non_secure/extra_ns_tests.c
index d9ce4c3..a842226 100644
--- a/test/secure_fw/suites/extra/non_secure/extra_ns_tests.c
+++ b/test/secure_fw/suites/extra/non_secure/extra_ns_tests.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -28,7 +28,7 @@
 
 static struct test_t extra_ns_interface_tests[] = {
     {&extra_ns_tests_entry, "TFM_EXTRA_TEST_1001",
-     "Extra Non-Secure test", {TEST_PASSED} },
+     "Extra Non-Secure test"},
 };
 
 void register_testsuite_extra_ns_interface(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/extra/secure/extra_s_tests.c b/test/secure_fw/suites/extra/secure/extra_s_tests.c
index a88841c..89c016c 100644
--- a/test/secure_fw/suites/extra/secure/extra_s_tests.c
+++ b/test/secure_fw/suites/extra/secure/extra_s_tests.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -28,7 +28,7 @@
 
 static struct test_t extra_s_interface_tests[] = {
     {&extra_s_tests_entry, "TFM_EXTRA_TEST_1001",
-     "Extra Secure test", {TEST_PASSED} },
+     "Extra Secure test"},
 };
 
 void register_testsuite_extra_s_interface(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/fpu/non_secure/fpu_ns_interface_testsuite.c b/test/secure_fw/suites/fpu/non_secure/fpu_ns_interface_testsuite.c
index a72cde6..ded6ca0 100644
--- a/test/secure_fw/suites/fpu/non_secure/fpu_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/fpu/non_secure/fpu_ns_interface_testsuite.c
@@ -22,24 +22,20 @@
 static struct test_t fpu_ns_tests[] = {
     {
         &tfm_fpu_test_clear_client_fp_data, "TFM_NS_FPU_TEST_1001",
-        "Clear FP registers in FPU client partition",
-        {TEST_PASSED}
+        "Clear FP registers in FPU client partition"
     },
     {
         &tfm_fpu_test_fp_protection_psa_call, "TFM_NS_FPU_TEST_1002",
-        "Test FP context protection after psa calls",
-        {TEST_PASSED}
+        "Test FP context protection after psa calls"
     },
     {
         &tfm_fpu_test_fp_protection_secure_interrupt, "TFM_NS_FPU_TEST_1003",
-        "Test FP context protection in S interrupt after interrupt return",
-        {TEST_PASSED}
+        "Test FP context protection in S interrupt after interrupt return"
     },
     {
         &tfm_fpu_test_fp_protection_non_secure_interrupt,
         "TFM_NS_FPU_TEST_1004",
-        "Test FP context protection in S thread after NS interrupt",
-        {TEST_PASSED}
+        "Test FP context protection in S thread after NS interrupt"
     }
 };
 
diff --git a/test/secure_fw/suites/fpu/secure/fpu_s_interface_testsuite.c b/test/secure_fw/suites/fpu/secure/fpu_s_interface_testsuite.c
index 17d83e4..35a9190 100755
--- a/test/secure_fw/suites/fpu/secure/fpu_s_interface_testsuite.c
+++ b/test/secure_fw/suites/fpu/secure/fpu_s_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -11,23 +11,19 @@
 static struct test_t fpu_s_tests[] = {
     {
         &tfm_fpu_test_clear_client_fp_data, "TFM_S_FPU_TEST_1001",
-        "Clear FP registers in FPU client partition",
-        {TEST_PASSED}
+        "Clear FP registers in FPU client partition"
     },
     {
         &tfm_fpu_test_fp_protection_psa_call, "TFM_S_FPU_TEST_1002",
-        "Test FP context protection after psa calls",
-        {TEST_PASSED}
+        "Test FP context protection after psa calls"
     },
     {
         &tfm_fpu_test_clear_service_fp_data, "TFM_S_FPU_TEST_1003",
-        "Clear FP registers in FPU service partition for next test",
-        {TEST_PASSED}
+        "Clear FP registers in FPU service partition for next test"
     },
     {
         &tfm_fpu_test_fp_protection_psa_call_loop, "TFM_S_FPU_TEST_1004",
-        "Test reliability of FP context protection after psa calls",
-        {TEST_PASSED}
+        "Test reliability of FP context protection after psa calls"
     }
 };
 
diff --git a/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c b/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c
index 780a08b..a5e7014 100644
--- a/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -11,46 +11,46 @@
 
 static struct test_t psa_fwu_ns_tests[] = {
     {&tfm_fwu_test_common_001, "TFM_NS_FWU_TEST_1001",
-     "Write, install and abort interface", {TEST_PASSED} },
+     "Write, install and abort interface"},
 #if defined TFM_FWU_TEST_WRITE_WITH_NULL
     {&tfm_fwu_test_common_002, "TFM_NS_FWU_TEST_1002",
-     "Write interface with NULL block pointer", {TEST_PASSED} },
+     "Write interface with NULL block pointer"},
 #endif
     {&tfm_fwu_test_common_003, "TFM_NS_FWU_TEST_1003",
-     "Write interface with image_offset + block_size overflow", {TEST_PASSED} },
+     "Write interface with image_offset + block_size overflow"},
     {&tfm_fwu_test_common_004, "TFM_NS_FWU_TEST_1004",
-     "Install interface with NULL dependency uuid", {TEST_PASSED} },
+     "Install interface with NULL dependency uuid"},
     {&tfm_fwu_test_common_005, "TFM_NS_FWU_TEST_1005",
-     "Install interface with NULL dependency version", {TEST_PASSED} },
+     "Install interface with NULL dependency version"},
     {&tfm_fwu_test_common_006, "TFM_NS_FWU_TEST_1006",
-     "Install before write", {TEST_PASSED} },
+     "Install before write"},
     {&tfm_fwu_test_common_007, "TFM_NS_FWU_TEST_1007",
-     "Install after abort", {TEST_PASSED} },
+     "Install after abort"},
     {&tfm_fwu_test_common_008, "TFM_NS_FWU_TEST_1008",
-     "Abort interface with no image is being installing", {TEST_PASSED} },
+     "Abort interface with no image is being installing"},
     {&tfm_fwu_test_common_009, "TFM_NS_FWU_TEST_1009",
-     "Query interface with the active image", {TEST_PASSED} },
+     "Query interface with the active image"},
 #if defined TFM_FWU_TEST_QUERY_WITH_NULL
     {&tfm_fwu_test_common_010, "TFM_NS_FWU_TEST_1010",
-     "Query interface with NULL info", {TEST_PASSED} },
+     "Query interface with NULL info"},
 #endif
     {&tfm_fwu_test_common_011, "TFM_NS_FWU_TEST_1011",
-     "Query interface invald image id", {TEST_PASSED} },
+     "Query interface invald image id"},
     {&tfm_fwu_test_common_012, "TFM_NS_FWU_TEST_1012",
-     "Accept interface", {TEST_PASSED} },
+     "Accept interface"},
 #ifdef TFM_FWU_TEST_REQUEST_REBOOT
     {&tfm_fwu_test_common_013, "TFM_NS_FWU_TEST_1013",
-     "Reboot interface", {TEST_PASSED} },
+     "Reboot interface"},
 #endif
 #if (MCUBOOT_IMAGE_NUMBER > 1)
     {&tfm_fwu_test_common_014, "TFM_NS_FWU_TEST_1014",
-     "Image update with dependency, no new image is required", {TEST_PASSED} },
+     "Image update with dependency, no new image is required"},
     {&tfm_fwu_test_common_015, "TFM_NS_FWU_TEST_1015",
-     "Image update with dependency, new image is required", {TEST_PASSED} },
+     "Image update with dependency, new image is required"},
 #endif
 #ifdef TFM_PSA_API
     {&tfm_fwu_test_common_016, "TFM_NS_FWU_TEST_1016",
-     "psa_fwu_write boundary test", {TEST_PASSED} },
+     "psa_fwu_write boundary test"},
 #endif
 };
 
diff --git a/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c b/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c
index ecad424..35ffc59 100644
--- a/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c
+++ b/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -14,46 +14,46 @@
 
 static struct test_t psa_fwu_s_tests[] = {
     {&tfm_fwu_test_common_001, "TFM_S_FWU_TEST_1001",
-     "Write, install and abort interface", {TEST_PASSED} },
+     "Write, install and abort interface"},
 #if defined TFM_FWU_TEST_WRITE_WITH_NULL
     {&tfm_fwu_test_common_002, "TFM_S_FWU_TEST_1002",
-     "Write interface with NULL block pointer", {TEST_PASSED} },
+     "Write interface with NULL block pointer"},
 #endif
     {&tfm_fwu_test_common_003, "TFM_S_FWU_TEST_1003",
-     "Write interface with image_offset + block_size overflow", {TEST_PASSED} },
+     "Write interface with image_offset + block_size overflow"},
     {&tfm_fwu_test_common_004, "TFM_S_FWU_TEST_1004",
-     "Install interface with NULL dependency uuid", {TEST_PASSED} },
+     "Install interface with NULL dependency uuid"},
     {&tfm_fwu_test_common_005, "TFM_S_FWU_TEST_1005",
-     "Install interface with NULL dependency version", {TEST_PASSED} },
+     "Install interface with NULL dependency version"},
     {&tfm_fwu_test_common_006, "TFM_S_FWU_TEST_1006",
-     "Install before write", {TEST_PASSED} },
+     "Install before write"},
     {&tfm_fwu_test_common_007, "TFM_S_FWU_TEST_1007",
-     "Install after abort", {TEST_PASSED} },
+     "Install after abort"},
     {&tfm_fwu_test_common_008, "TFM_S_FWU_TEST_1008",
-     "Abort interface with no image is being installing", {TEST_PASSED} },
+     "Abort interface with no image is being installing"},
     {&tfm_fwu_test_common_009, "TFM_S_FWU_TEST_1009",
-     "Query interface with the active image", {TEST_PASSED} },
+     "Query interface with the active image"},
 #if defined TFM_FWU_TEST_QUERY_WITH_NULL
     {&tfm_fwu_test_common_010, "TFM_S_FWU_TEST_1010",
-     "Query interface with NULL info", {TEST_PASSED} },
+     "Query interface with NULL info"},
 #endif
     {&tfm_fwu_test_common_011, "TFM_S_FWU_TEST_1011",
-     "Query interface invald image id", {TEST_PASSED} },
+     "Query interface invald image id"},
     {&tfm_fwu_test_common_012, "TFM_S_FWU_TEST_1012",
-     "Accept interface", {TEST_PASSED} },
+     "Accept interface"},
 #ifdef TFM_FWU_TEST_REQUEST_REBOOT
     {&tfm_fwu_test_common_013, "TFM_S_FWU_TEST_1013",
-     "Reboot interface", {TEST_PASSED} },
+     "Reboot interface"},
 #endif
 #if (MCUBOOT_IMAGE_NUMBER > 1)
     {&tfm_fwu_test_common_014, "TFM_S_FWU_TEST_1014",
-     "Image update with dependency, no new image is required", {TEST_PASSED} },
+     "Image update with dependency, no new image is required"},
     {&tfm_fwu_test_common_015, "TFM_S_FWU_TEST_1015",
-     "Image update with dependency, new image is required", {TEST_PASSED} },
+     "Image update with dependency, new image is required"},
 #endif
 #ifdef TFM_PSA_API
     {&tfm_fwu_test_common_016, "TFM_S_FWU_TEST_1016",
-     "psa_fwu_write boundary test", {TEST_PASSED} },
+     "psa_fwu_write boundary test"},
 #endif
 };
 
diff --git a/test/secure_fw/suites/its/secure/psa_its_s_reliability_testsuite.c b/test/secure_fw/suites/its/secure/psa_its_s_reliability_testsuite.c
index 45fffa1..bd385d4 100644
--- a/test/secure_fw/suites/its/secure/psa_its_s_reliability_testsuite.c
+++ b/test/secure_fw/suites/its/secure/psa_its_s_reliability_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -35,9 +35,9 @@
 
 static struct test_t reliability_tests[] = {
     {&tfm_its_test_2001, "TFM_S_ITS_TEST_2001",
-     "repetitive sets and gets in/from an asset", {TEST_PASSED} },
+     "repetitive sets and gets in/from an asset"},
     {&tfm_its_test_2002, "TFM_S_ITS_TEST_2002",
-     "repetitive sets, gets and removes", {TEST_PASSED} },
+     "repetitive sets, gets and removes"},
 };
 
 void register_testsuite_s_psa_its_reliability(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/multi_core/non_secure/multi_core_ns_interface_testsuite.c b/test/secure_fw/suites/multi_core/non_secure/multi_core_ns_interface_testsuite.c
index 62e14fe..52aeabb 100644
--- a/test/secure_fw/suites/multi_core/non_secure/multi_core_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/multi_core/non_secure/multi_core_ns_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -61,16 +61,13 @@
 static struct test_t multi_core_tests[] = {
     {&multi_client_call_light_test,
      "MULTI_CLIENT_CALL_LIGHT_TEST",
-     "Multiple outstanding NS PSA client calls lightweight test",
-     {TEST_PASSED}},
+     "Multiple outstanding NS PSA client calls lightweight test"},
     {&multi_client_call_heavy_test,
      "MULTI_CLIENT_CALL_HEAVY_TEST",
-     "Multiple outstanding NS PSA client calls heavyweight test",
-     {TEST_PASSED}},
+     "Multiple outstanding NS PSA client calls heavyweight test"},
     {&multi_client_call_ooo_test,
      "MULTI_CLIENT_CALL_OOO_TEST",
-     "Multiple outstanding NS PSA client calls test with out-of-order calls",
-     {TEST_PASSED}},
+     "Multiple outstanding NS PSA client calls test with out-of-order calls"},
 };
 
 void register_testsuite_multi_core_ns_interface(
diff --git a/test/secure_fw/suites/nsid/nsid_testsuite.c b/test/secure_fw/suites/nsid/nsid_testsuite.c
index 30cbb93..2137d28 100755
--- a/test/secure_fw/suites/nsid/nsid_testsuite.c
+++ b/test/secure_fw/suites/nsid/nsid_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -981,52 +981,52 @@
 static struct test_t nsid_test_cases[] = {
     /* Normal test */
     {&tfm_nsid_test_case_1, "TFM_NS_NSID_TEST_1001",
-     "NSID management initialize ctx pass", {TEST_PASSED}},
+     "NSID management initialize ctx pass"},
     {&tfm_nsid_test_case_2, "TFM_NS_NSID_TEST_1002",
-     "NSID management normal full sequence pass", {TEST_PASSED}},
+     "NSID management normal full sequence pass"},
     {&tfm_nsid_test_case_3, "TFM_NS_NSID_TEST_1003",
-     "NSID management acquire-release sequence pass", {TEST_PASSED}},
+     "NSID management acquire-release sequence pass"},
     {&tfm_nsid_test_case_4, "TFM_NS_NSID_TEST_1004",
-     "NSID management acquire-load-release sequence pass", {TEST_PASSED}},
+     "NSID management acquire-load-release sequence pass"},
     {&tfm_nsid_test_case_5, "TFM_NS_NSID_TEST_1005",
-     "NSID management switching contexts pass", {TEST_PASSED}},
+     "NSID management switching contexts pass"},
     {&tfm_nsid_test_case_6, "TFM_NS_NSID_TEST_1006",
-     "NSID management releasing inactive context pass", {TEST_PASSED}},
+     "NSID management releasing inactive context pass"},
     /* Corner case test */
     {&tfm_nsid_test_case_7, "TFM_NS_NSID_TEST_1007",
-     "NSID management pass with max valid NSID", {TEST_PASSED}},
+     "NSID management pass with max valid NSID"},
     {&tfm_nsid_test_case_8, "TFM_NS_NSID_TEST_1008",
-     "NSID management pass with min valid NSID", {TEST_PASSED}},
+     "NSID management pass with min valid NSID"},
     {&tfm_nsid_test_case_9, "TFM_NS_NSID_TEST_1009",
-     "NSID management pass with min TID", {TEST_PASSED}},
+     "NSID management pass with min TID"},
     {&tfm_nsid_test_case_10, "TFM_NS_NSID_TEST_1010",
-     "NSID management pass with max TID", {TEST_PASSED}},
+     "NSID management pass with max TID"},
     {&tfm_nsid_test_case_11, "TFM_NS_NSID_TEST_1011",
-     "NSID management pass when loading B without saving A", {TEST_PASSED}},
+     "NSID management pass when loading B without saving A"},
     /* Error test */
     /* Wrong params */
     {&tfm_nsid_test_case_12, "TFM_NS_NSID_TEST_1012",
-     "NSID management loading fail with non-negative NSID", {TEST_PASSED}},
+     "NSID management loading fail with non-negative NSID"},
     {&tfm_nsid_test_case_13, "TFM_NS_NSID_TEST_1013",
-     "NSID management fail when loading with invalid token", {TEST_PASSED}},
+     "NSID management fail when loading with invalid token"},
     {&tfm_nsid_test_case_14, "TFM_NS_NSID_TEST_1014",
-     "NSID management fail when saving with invalid token", {TEST_PASSED}},
+     "NSID management fail when saving with invalid token"},
     {&tfm_nsid_test_case_15, "TFM_NS_NSID_TEST_1015",
-     "NSID management fail when releasing with invalid token", {TEST_PASSED}},
+     "NSID management fail when releasing with invalid token"},
     {&tfm_nsid_test_case_16, "TFM_NS_NSID_TEST_1016",
-     "NSID management fail when acquiring with undefault GID", {TEST_PASSED}},
+     "NSID management fail when acquiring with undefault GID"},
     {&tfm_nsid_test_case_17, "TFM_NS_NSID_TEST_1017",
-     "NSID management fail with token containing wrong info", {TEST_PASSED}},
+     "NSID management fail with token containing wrong info"},
     /* Wrong sequence */
     {&tfm_nsid_test_case_18, "TFM_NS_NSID_TEST_1018",
-     "NSID management fail when saving without loading", {TEST_PASSED}},
+     "NSID management fail when saving without loading"},
     {&tfm_nsid_test_case_19, "TFM_NS_NSID_TEST_1019",
-     "NSID management fail when saving released token", {TEST_PASSED}},
+     "NSID management fail when saving released token"},
     {&tfm_nsid_test_case_20, "TFM_NS_NSID_TEST_1020",
-     "NSID management fail when saving inactive token", {TEST_PASSED}},
+     "NSID management fail when saving inactive token"},
     /* Other tests */
     {&tfm_nsid_test_case_21, "TFM_NS_NSID_TEST_1021",
-     "NSID management fail when called in thread mode", {TEST_PASSED}},
+     "NSID management fail when called in thread mode"},
 };
 
 void register_testsuite_nsid_test(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/platform/non_secure/platform_ns_interface_testsuite.c b/test/secure_fw/suites/platform/non_secure/platform_ns_interface_testsuite.c
index d078e7b..1e32682 100644
--- a/test/secure_fw/suites/platform/non_secure/platform_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/platform/non_secure/platform_ns_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -11,7 +11,7 @@
 
 static struct test_t platform_interface_tests[] = {
     {&tfm_platform_test_common_001, "TFM_NS_PLATFORM_TEST_1001",
-     "Minimal platform service test", {TEST_PASSED} },
+     "Minimal platform service test"},
 };
 
 void
diff --git a/test/secure_fw/suites/platform/secure/platform_s_interface_testsuite.c b/test/secure_fw/suites/platform/secure/platform_s_interface_testsuite.c
index 15ee4ca..abb27ed 100644
--- a/test/secure_fw/suites/platform/secure/platform_s_interface_testsuite.c
+++ b/test/secure_fw/suites/platform/secure/platform_s_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -11,7 +11,7 @@
 
 static struct test_t platform_interface_tests[] = {
     {&tfm_platform_test_common_001, "TFM_S_PLATFORM_TEST_1001",
-     "Minimal platform service test", {TEST_PASSED} },
+     "Minimal platform service test"},
 };
 
 void
diff --git a/test/secure_fw/suites/ps/secure/ps_rollback_protection_testsuite.c b/test/secure_fw/suites/ps/secure/ps_rollback_protection_testsuite.c
index f2d6eff..7e0fc18 100644
--- a/test/secure_fw/suites/ps/secure/ps_rollback_protection_testsuite.c
+++ b/test/secure_fw/suites/ps/secure/ps_rollback_protection_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -65,29 +65,29 @@
 
 static struct test_t interface_tests[] = {
     {&tfm_ps_test_3001, "TFM_S_PS_TEST_3001",
-     "Check PS area version when NV counters 1/2/3 have the same value", {TEST_PASSED}},
+     "Check PS area version when NV counters 1/2/3 have the same value"},
     {&tfm_ps_test_3002, "TFM_S_PS_TEST_3002",
-     "Check PS area version when it is different from NV counters 1/2/3", {TEST_PASSED}},
+     "Check PS area version when it is different from NV counters 1/2/3"},
     {&tfm_ps_test_3003, "TFM_S_PS_TEST_3003",
      "Check PS area version when NV counters 1 and 2 are equals, 3 is "
-     "different, and PS area version match NV counters 1 and 2", {TEST_PASSED}},
+     "different, and PS area version match NV counters 1 and 2"},
     {&tfm_ps_test_3004, "TFM_S_PS_TEST_3004",
      "Check PS area version when NV counters 2 and 3 are equals, 1 is "
-     "different and PS area version match NV counter 2 and 3", {TEST_PASSED}},
+     "different and PS area version match NV counter 2 and 3"},
     {&tfm_ps_test_3005, "TFM_S_PS_TEST_3005",
      "Check PS area version when NV counters 2 and 3 are equals, 1 is "
-     "different and PS area version match NV counter 1", {TEST_PASSED}},
+     "different and PS area version match NV counter 1"},
     {&tfm_ps_test_3006, "TFM_S_PS_TEST_3006",
      "Check PS area version when NV counters 1, 2 and 3 have different values "
-     "and PS area version match NV counter 1 value", {TEST_PASSED}},
+     "and PS area version match NV counter 1 value"},
     {&tfm_ps_test_3007, "TFM_S_PS_TEST_3007",
      "Check PS area version when NV counters 1, 2 and 3 have different values "
-     "and PS area version match NV counter 2 value", {TEST_PASSED}},
+     "and PS area version match NV counter 2 value"},
     {&tfm_ps_test_3008, "TFM_S_PS_TEST_3008",
      "Check PS area version when NV counters 1, 2 and 3 have different values "
-     "and PS area version match NV counter 3 value", {TEST_PASSED}},
+     "and PS area version match NV counter 3 value"},
     {&tfm_ps_test_3009, "TFM_S_PS_TEST_3009",
-     "Check PS area version when NV counter 1 cannot be incremented", {TEST_PASSED}},
+     "Check PS area version when NV counter 1 cannot be incremented"},
 };
 
 void register_testsuite_s_rollback_protection(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/ps/secure/psa_ps_s_reliability_testsuite.c b/test/secure_fw/suites/ps/secure/psa_ps_s_reliability_testsuite.c
index 65f56b5..605e521 100644
--- a/test/secure_fw/suites/ps/secure/psa_ps_s_reliability_testsuite.c
+++ b/test/secure_fw/suites/ps/secure/psa_ps_s_reliability_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -36,9 +36,9 @@
 
 static struct test_t reliability_tests[] = {
     {&tfm_ps_test_2001, "TFM_S_PS_TEST_2001",
-     "repetitive sets and gets in/from an asset", {TEST_PASSED} },
+     "repetitive sets and gets in/from an asset"},
     {&tfm_ps_test_2002, "TFM_S_PS_TEST_2002",
-     "repetitive sets, gets and removes", {TEST_PASSED} },
+     "repetitive sets, gets and removes"},
 };
 
 void register_testsuite_s_psa_ps_reliability(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/qcbor/non_secure/qcbor_ns_testsuite.c b/test/secure_fw/suites/qcbor/non_secure/qcbor_ns_testsuite.c
index 6491cd4..b6877fd 100644
--- a/test/secure_fw/suites/qcbor/non_secure/qcbor_ns_testsuite.c
+++ b/test/secure_fw/suites/qcbor/non_secure/qcbor_ns_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -28,7 +28,7 @@
 
 static struct test_t qcbor_regression_test[] = {
     {&tfm_qcbor_test_1001, "TFM_NS_QCBOR_TEST_1001",
-     "Regression test of QCBOR library", {TEST_PASSED} },
+     "Regression test of QCBOR library"},
 };
 
 /* To execute only selected test cases, then remove unwanted ones from the array
diff --git a/test/secure_fw/suites/spm/ipc/non_secure/ipc_ns_interface_testsuite.c b/test/secure_fw/suites/spm/ipc/non_secure/ipc_ns_interface_testsuite.c
index abe415e..72d7347 100644
--- a/test/secure_fw/suites/spm/ipc/non_secure/ipc_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/spm/ipc/non_secure/ipc_ns_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -53,44 +53,44 @@
 
 static struct test_t ipc_veneers_tests[] = {
     {&tfm_ipc_test_1001, "TFM_NS_IPC_TEST_1001",
-     "Get PSA framework version", {TEST_PASSED}},
+     "Get PSA framework version"},
     {&tfm_ipc_test_1002, "TFM_NS_IPC_TEST_1002",
-     "Get version of an RoT Service", {TEST_PASSED}},
+     "Get version of an RoT Service"},
     {&tfm_ipc_test_1003, "TFM_NS_IPC_TEST_1003",
-     "Connect to an RoT Service", {TEST_PASSED}},
+     "Connect to an RoT Service"},
     {&tfm_ipc_test_1004, "TFM_NS_IPC_TEST_1004",
-     "Call an RoT Service", {TEST_PASSED}},
+     "Call an RoT Service"},
     {&tfm_ipc_test_1005, "TFM_NS_IPC_TEST_1005",
-     "Call IPC_INIT_BASIC_TEST service", {TEST_PASSED}},
+     "Call IPC_INIT_BASIC_TEST service"},
     {&tfm_ipc_test_1006, "TFM_NS_IPC_TEST_1006",
-     "Call PSA RoT access APP RoT memory test service", {TEST_PASSED}},
+     "Call PSA RoT access APP RoT memory test service"},
 #ifdef TFM_IPC_ISOLATION_2_TEST_READ_ONLY_MEM
     {&tfm_ipc_test_1007, "TFM_NS_IPC_TEST_1007",
-     "Call PSA RoT access APP RoT readonly memory test service", {TEST_PASSED}},
+     "Call PSA RoT access APP RoT readonly memory test service"},
 #endif
 #ifdef TFM_IPC_ISOLATION_2_APP_ACCESS_PSA_MEM
     {&tfm_ipc_test_1008, "TFM_NS_IPC_TEST_1008",
-     "Call APP RoT access PSA RoT memory test service", {TEST_PASSED}},
+     "Call APP RoT access PSA RoT memory test service"},
 #endif
 #ifdef TFM_IPC_ISOLATION_2_MEM_CHECK
     {&tfm_ipc_test_1009, "TFM_NS_IPC_TEST_1009",
-     "Call APP RoT memory check test service", {TEST_PASSED}},
+     "Call APP RoT memory check test service"},
 #endif
     {&tfm_ipc_test_1010, "TFM_NS_IPC_TEST_1010",
-     "Test psa_call with the status of PSA_ERROR_PROGRAMMER_ERROR", {TEST_PASSED}},
+     "Test psa_call with the status of PSA_ERROR_PROGRAMMER_ERROR"},
 #ifdef TFM_IPC_ISOLATION_3_RETRIEVE_APP_MEM
     {&tfm_ipc_test_1011, "TFM_NS_IPC_TEST_1011",
-     "Call APP RoT access another APP RoT memory test service", {TEST_PASSED}},
+     "Call APP RoT access another APP RoT memory test service"},
 #endif
     {&tfm_ipc_test_1012, "TFM_NS_IPC_TEST_1012",
-     "Accessing stateless service from non-secure client", {TEST_PASSED}},
+     "Accessing stateless service from non-secure client"},
 #if PSA_FRAMEWORK_HAS_MM_IOVEC
     {&tfm_ipc_test_1013, "TFM_NS_IPC_TEST_1013",
-     "Mapping input vectors and unmapping them", {TEST_PASSED}},
+     "Mapping input vectors and unmapping them"},
     {&tfm_ipc_test_1014, "TFM_NS_IPC_TEST_1014",
-     "Mapping output vectors and unmapping them", {TEST_PASSED}},
+     "Mapping output vectors and unmapping them"},
     {&tfm_ipc_test_1015, "TFM_NS_IPC_TEST_1015",
-     "Mapping output vectors and not unmapping them", {TEST_PASSED}},
+     "Mapping output vectors and not unmapping them"},
 #endif
 };
 
diff --git a/test/secure_fw/suites/spm/ipc/secure/ipc_s_interface_testsuite.c b/test/secure_fw/suites/spm/ipc/secure/ipc_s_interface_testsuite.c
index 9a64d3b..f351f7e 100644
--- a/test/secure_fw/suites/spm/ipc/secure/ipc_s_interface_testsuite.c
+++ b/test/secure_fw/suites/spm/ipc/secure/ipc_s_interface_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -15,7 +15,7 @@
 
 static struct test_t ipc_veneers_tests[] = {
     {&tfm_ipc_test_1001, "TFM_S_IPC_TEST_1001",
-     "Accessing stateless service from secure partition", {TEST_PASSED}},
+     "Accessing stateless service from secure partition"},
 };
 
 void register_testsuite_s_ipc_interface(struct test_suite_t *p_test_suite)
diff --git a/test/secure_fw/suites/spm/irq/irq_testsuite.c b/test/secure_fw/suites/spm/irq/irq_testsuite.c
index 7cb1586..f4e92a5 100644
--- a/test/secure_fw/suites/spm/irq/irq_testsuite.c
+++ b/test/secure_fw/suites/spm/irq/irq_testsuite.c
@@ -35,13 +35,13 @@
 static struct test_t irq_test_cases[] = {
 #ifdef TEST_NS_SLIH_IRQ
     {&tfm_irq_test_slih_case_1, "TFM_NS_IRQ_TEST_SLIH_1001",
-     "SLIH HANDLING Case 1", {TEST_PASSED}},
+     "SLIH HANDLING Case 1"},
 #endif /* TEST_NS_SLIH_IRQ */
 #ifdef TEST_NS_FLIH_IRQ
     {&tfm_irq_test_flih_case_1, "TFM_NS_IRQ_TEST_FLIH_1101",
-     "FLIH HANDLING not returning signal", {TEST_PASSED}},
+     "FLIH HANDLING not returning signal"},
     {&tfm_irq_test_flih_case_2, "TFM_NS_IRQ_TEST_FLIH_1102",
-     "FLIH HANDLING returning Signal", {TEST_PASSED}},
+     "FLIH HANDLING returning Signal"},
 #endif /* TEST_NS_FLIH_IRQ */
 };
 
diff --git a/test/secure_fw/suites/spm/sfn/non_secure/sfn_backend_ns_testsuite.c b/test/secure_fw/suites/spm/sfn/non_secure/sfn_backend_ns_testsuite.c
index 2e3600d..fa499c2 100644
--- a/test/secure_fw/suites/spm/sfn/non_secure/sfn_backend_ns_testsuite.c
+++ b/test/secure_fw/suites/spm/sfn/non_secure/sfn_backend_ns_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2021-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -30,20 +30,20 @@
 
 static struct test_t sfn_veneers_tests[] = {
     {&tfm_sfn_test_1001, "TFM_NS_SFN_TEST_1001",
-     "Get PSA framework version", {TEST_PASSED}},
+     "Get PSA framework version"},
     {&tfm_sfn_test_1002, "TFM_NS_SFN_TEST_1002",
-     "Get version of an RoT Service", {TEST_PASSED}},
+     "Get version of an RoT Service"},
     {&tfm_sfn_test_1003, "TFM_NS_SFN_TEST_1003",
-     "Request a connection-based RoT Service", {TEST_PASSED}},
+     "Request a connection-based RoT Service"},
     {&tfm_sfn_test_1004, "TFM_NS_SFN_TEST_1004",
-     "Request a stateless RoT Service", {TEST_PASSED}},
+     "Request a stateless RoT Service"},
 #if PSA_FRAMEWORK_HAS_MM_IOVEC
     {&tfm_sfn_test_1005, "TFM_NS_SFN_TEST_1005",
-     "Mapping input vectors and unmapping them. ", {TEST_PASSED}},
+     "Mapping input vectors and unmapping them. "},
     {&tfm_sfn_test_1006, "TFM_NS_SFN_TEST_1006",
-     "Mapping output vectors and unmapping them. ", {TEST_PASSED}},
+     "Mapping output vectors and unmapping them. "},
     {&tfm_sfn_test_1007, "TFM_NS_SFN_TEST_1007",
-     "Mapping output vectors and not unmapping them. ", {TEST_PASSED}},
+     "Mapping output vectors and not unmapping them. "},
 #endif
 };
 
diff --git a/test/secure_fw/suites/t_cose/non_secure/t_cose_ns_testsuite.c b/test/secure_fw/suites/t_cose/non_secure/t_cose_ns_testsuite.c
index a65577b..ab60df8 100644
--- a/test/secure_fw/suites/t_cose/non_secure/t_cose_ns_testsuite.c
+++ b/test/secure_fw/suites/t_cose/non_secure/t_cose_ns_testsuite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2022, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -25,7 +25,7 @@
 
 static struct test_t t_cose_regression_test[] = {
     {&tfm_t_cose_test_1001, "TFM_NS_T_COSE_TEST_1001",
-     "Regression test of t_cose library", {TEST_PASSED} },
+     "Regression test of t_cose library"},
 };
 
 /* To execute all test cases, then pass this array to RunTestsTCose()