diff --git a/TESTS/psa/attestation/main.cpp b/TESTS/psa/attestation/main.cpp
index ec13fcaf66..52430eea28 100755
--- a/TESTS/psa/attestation/main.cpp
+++ b/TESTS/psa/attestation/main.cpp
@@ -17,7 +17,7 @@
 */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA attestation test case requires RTOS to run.
+#error [NOT_SUPPORTED] PSA attestation test cases require RTOS to run.
 #else
 
 #include "psa/crypto.h"
diff --git a/TESTS/psa/its_ps/main.cpp b/TESTS/psa/its_ps/main.cpp
index ef35212ddf..06ff59304c 100644
--- a/TESTS/psa/its_ps/main.cpp
+++ b/TESTS/psa/its_ps/main.cpp
@@ -16,8 +16,12 @@
 * limitations under the License.
 */
 
-#if !defined(TARGET_PSA) || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] ITS/PS tests can run only on PSA-enabled targets and RTOS.
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] ITS/PS test cases require RTOS to run.
+#else
+
+#ifndef TARGET_PSA
+#error [NOT_SUPPORTED] ITS/PS tests can run only on PSA-enabled targets.
 #else
 
 #include "greentea-client/test_env.h"
@@ -238,4 +242,5 @@ int main()
     return !Harness::run(specification);
 }
 
-#endif // TARGET_PSA || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // TARGET_PSA
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c b/components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c
index c424d37aac..893da7cbe7 100644
--- a/components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance attestation test cases requires RTOS to run.
+#error [NOT_SUPPORTED] PSA compliance attestation test cases require RTOS to run.
 #else
 void test_entry_a001(val_api_t *val_api, psa_api_t *psa_api); 
 
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c
index 4c9ddd7758..ce0cca197e 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
     test_start(test_entry_p001, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c
index 859e6508b1..e22458371e 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 #include "lifecycle.h"
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
     test_start(test_entry_p002, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c
index 14c6000c4f..d3ac176d2c 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c
@@ -1,7 +1,7 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -18,4 +18,4 @@ int main(void)
     test_start(test_entry_p004, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c
index 036511facf..b1ff1589a0 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
     test_start(test_entry_p005, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c
index be2f0a7033..9b4b485b4e 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
     test_start(test_entry_p006, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c
index 33b88ce915..c903e268db 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
     test_start(test_entry_p007, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c
index d1a254138e..a24935119c 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
     test_start(test_entry_p008, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c
index 595ebb1e6e..b5575cdb3f 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
     test_start(test_entry_p009, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c
index 6c99bd5f7d..d71e401396 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c
@@ -2,7 +2,7 @@
 #include "pal_mbed_os_intf.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
+#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
 #else
 
 #ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
     test_start(test_entry_p010, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif
+#endif // !defined(MBED_CONF_RTOS_PRESENT)