diff --git a/TESTS/lorawan/loraradio/main.cpp b/TESTS/lorawan/loraradio/main.cpp
index ce42d25321..5c7ba2f83a 100644
--- a/TESTS/lorawan/loraradio/main.cpp
+++ b/TESTS/lorawan/loraradio/main.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] LORADIO test cases requires RTOS to run.
+#error [NOT_SUPPORTED] LORADIO test cases require a RTOS to run.
 #else
 
 #include "utest.h"
diff --git a/TESTS/netsocket/dns/asynchronous_dns.cpp b/TESTS/netsocket/dns/asynchronous_dns.cpp
index 0d713224b0..bcabd5f2f1 100644
--- a/TESTS/netsocket/dns/asynchronous_dns.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns.cpp
@@ -42,4 +42,4 @@ void ASYNCHRONOUS_DNS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/asynchronous_dns_cache.cpp b/TESTS/netsocket/dns/asynchronous_dns_cache.cpp
index bc5f8ac01e..24dfb5f2fb 100644
--- a/TESTS/netsocket/dns/asynchronous_dns_cache.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns_cache.cpp
@@ -67,4 +67,4 @@ void ASYNCHRONOUS_DNS_CACHE()
                dns_test_hosts[0], data.addr.get_ip_address(), delay_ms);
     }
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/asynchronous_dns_cancel.cpp b/TESTS/netsocket/dns/asynchronous_dns_cancel.cpp
index abf02d7db4..1069ec0b90 100644
--- a/TESTS/netsocket/dns/asynchronous_dns_cancel.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns_cancel.cpp
@@ -87,4 +87,4 @@ void ASYNCHRONOUS_DNS_CANCEL()
 
     ThisThread::sleep_for(5000);
 }
-#endif // #if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/asynchronous_dns_simultaneous.cpp b/TESTS/netsocket/dns/asynchronous_dns_simultaneous.cpp
index 24d812986c..1a221daf57 100644
--- a/TESTS/netsocket/dns/asynchronous_dns_simultaneous.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns_simultaneous.cpp
@@ -43,4 +43,4 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/asynchronous_dns_simultaneous_cache.cpp b/TESTS/netsocket/dns/asynchronous_dns_simultaneous_cache.cpp
index a4966f01c0..0be6f77f63 100644
--- a/TESTS/netsocket/dns/asynchronous_dns_simultaneous_cache.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns_simultaneous_cache.cpp
@@ -44,4 +44,4 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS_CACHE()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/asynchronous_dns_simultaneous_repeat.cpp b/TESTS/netsocket/dns/asynchronous_dns_simultaneous_repeat.cpp
index f66a82de6c..f424104d7d 100644
--- a/TESTS/netsocket/dns/asynchronous_dns_simultaneous_repeat.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns_simultaneous_repeat.cpp
@@ -46,4 +46,4 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS_REPEAT()
         TEST_ASSERT_EQUAL(0, result_exp_timeout);
     }
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/dns_tests.h b/TESTS/netsocket/dns/dns_tests.h
index f6ea697c8b..887e3a091f 100644
--- a/TESTS/netsocket/dns/dns_tests.h
+++ b/TESTS/netsocket/dns/dns_tests.h
@@ -17,7 +17,6 @@
 
 #ifndef DNS_TESTS_H
 #define DNS_TESTS_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "nsapi_dns.h"
 
@@ -93,5 +92,4 @@ void SYNCHRONOUS_DNS();
 void SYNCHRONOUS_DNS_MULTIPLE();
 void SYNCHRONOUS_DNS_CACHE();
 void SYNCHRONOUS_DNS_INVALID();
-#endif /* defined(MBED_CONF_RTOS_PRESENT) */
 #endif
diff --git a/TESTS/netsocket/dns/main.cpp b/TESTS/netsocket/dns/main.cpp
index 46b7a613ac..13ec86f1ac 100644
--- a/TESTS/netsocket/dns/main.cpp
+++ b/TESTS/netsocket/dns/main.cpp
@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] dns test cases requires RTOS to run.
+#error [NOT_SUPPORTED] dns test cases require a RTOS to run.
 #else
 
 #define WIFI 2
diff --git a/TESTS/netsocket/dns/synchronous_dns.cpp b/TESTS/netsocket/dns/synchronous_dns.cpp
index 70968d1db2..ef3d5f1456 100644
--- a/TESTS/netsocket/dns/synchronous_dns.cpp
+++ b/TESTS/netsocket/dns/synchronous_dns.cpp
@@ -41,4 +41,4 @@ void SYNCHRONOUS_DNS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/synchronous_dns_cache.cpp b/TESTS/netsocket/dns/synchronous_dns_cache.cpp
index 935d3f5716..9d50b72aaf 100644
--- a/TESTS/netsocket/dns/synchronous_dns_cache.cpp
+++ b/TESTS/netsocket/dns/synchronous_dns_cache.cpp
@@ -56,4 +56,4 @@ void SYNCHRONOUS_DNS_CACHE()
                dns_test_hosts[0], address.get_ip_address(), delay_ms);
     }
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/synchronous_dns_invalid.cpp b/TESTS/netsocket/dns/synchronous_dns_invalid.cpp
index b956e98949..baf2428ca3 100644
--- a/TESTS/netsocket/dns/synchronous_dns_invalid.cpp
+++ b/TESTS/netsocket/dns/synchronous_dns_invalid.cpp
@@ -61,4 +61,4 @@ void SYNCHRONOUS_DNS_INVALID()
     TEST_ASSERT_EQUAL(expected_failures, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/dns/synchronous_dns_multiple.cpp b/TESTS/netsocket/dns/synchronous_dns_multiple.cpp
index 1891bf50ec..e7ae53814f 100644
--- a/TESTS/netsocket/dns/synchronous_dns_multiple.cpp
+++ b/TESTS/netsocket/dns/synchronous_dns_multiple.cpp
@@ -41,4 +41,4 @@ void SYNCHRONOUS_DNS_MULTIPLE()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/main.cpp b/TESTS/netsocket/tcp/main.cpp
index eb3111ea5d..210f6c5be6 100644
--- a/TESTS/netsocket/tcp/main.cpp
+++ b/TESTS/netsocket/tcp/main.cpp
@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] tcp test cases requires RTOS to run
+#error [NOT_SUPPORTED] tcp test cases require a RTOS to run
 #else
 
 #define WIFI 2
diff --git a/TESTS/netsocket/tcp/tcp_tests.h b/TESTS/netsocket/tcp/tcp_tests.h
index fd7f0d8970..08b3a22d71 100644
--- a/TESTS/netsocket/tcp/tcp_tests.h
+++ b/TESTS/netsocket/tcp/tcp_tests.h
@@ -17,7 +17,6 @@
 
 #ifndef TCP_TESTS_H
 #define TCP_TESTS_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "../test_params.h"
 
@@ -89,4 +88,3 @@ void TCPSOCKET_THREAD_PER_SOCKET_SAFETY();
 void TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID();
 
 #endif //TCP_TESTS_H
-#endif //!defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp
index dcd9ee28d3..78a8bf6e0d 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp
@@ -44,4 +44,4 @@ void TCPSOCKET_BIND_ADDRESS()
 
     delete sock;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp
index 49222d9ac2..489175ac6b 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp
@@ -51,4 +51,4 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp
index d4b8348948..37008c8599 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp
@@ -43,4 +43,4 @@ void TCPSOCKET_BIND_ADDRESS_NULL()
 
     delete sock;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp
index b6ea7ca5ca..feba0e5396 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp
@@ -43,4 +43,4 @@ void TCPSOCKET_BIND_ADDRESS_PORT()
 
     delete sock;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp
index bd5a693088..1c2e2514f8 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp
@@ -43,4 +43,4 @@ void TCPSOCKET_BIND_PORT()
 
     delete sock;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp
index 33461b9317..2087761ecb 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp
@@ -53,4 +53,4 @@ void TCPSOCKET_BIND_PORT_FAIL()
     delete sock;
     delete sock2;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp
index c4eab7b69c..53a5474b47 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp
@@ -42,4 +42,4 @@ void TCPSOCKET_BIND_UNOPENED()
 
     delete sock;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp
index 4abc4f73ab..0a6cf9ece4 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp
@@ -52,4 +52,4 @@ void TCPSOCKET_BIND_WRONG_TYPE()
 
     delete sock;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp b/TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp
index 3fb81d7bc7..02be4dbc57 100644
--- a/TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp
@@ -38,4 +38,4 @@ void TCPSOCKET_CONNECT_INVALID()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_echotest.cpp b/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
index f05cf5ef75..b472da2f8b 100644
--- a/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
@@ -202,4 +202,4 @@ END:
     tc_exec_time.stop();
     free(stack_mem);
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp b/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp
index 532d9015b5..d1629a8d39 100644
--- a/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp
@@ -142,4 +142,4 @@ void TCPSOCKET_ECHOTEST_BURST_NONBLOCK()
 END:
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp b/TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp
index a04b95fa2e..cf54f00fd3 100644
--- a/TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp
@@ -89,4 +89,4 @@ void TCPSOCKET_ENDPOINT_CLOSE()
     tc_exec_time.stop();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp b/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp
index efc885851e..f93bcca13f 100644
--- a/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp
@@ -39,4 +39,4 @@ void TCPSOCKET_OPEN_CLOSE_REPEAT()
     }
     delete sock;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp b/TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp
index 508143c416..c8dd5c825f 100644
--- a/TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp
@@ -37,4 +37,4 @@ void TCPSOCKET_OPEN_DESTRUCT()
         delete sock;
     }
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp b/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp
index 454c127260..4d9854820b 100644
--- a/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp
@@ -97,4 +97,4 @@ void TCPSOCKET_OPEN_LIMIT()
     TEST_ASSERT_EQUAL(open_sockets[0], open_sockets[1]);
     TEST_ASSERT(open_sockets[0] >= 4);
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_twice.cpp b/TESTS/netsocket/tcp/tcpsocket_open_twice.cpp
index 8ed0fb273b..63fdd1886b 100644
--- a/TESTS/netsocket/tcp/tcpsocket_open_twice.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_open_twice.cpp
@@ -38,4 +38,4 @@ void TCPSOCKET_OPEN_TWICE()
 
     delete sock;
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp b/TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp
index 3485ebff44..2ca6b165c4 100644
--- a/TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp
@@ -196,4 +196,4 @@ void TCPSOCKET_RECV_100K_NONBLOCK()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp b/TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp
index 6c87c91374..49a43bc649 100644
--- a/TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp
@@ -89,4 +89,4 @@ CLEANUP:
     tc_exec_time.stop();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp b/TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp
index ff7992d39b..8e8a124d89 100644
--- a/TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp
@@ -44,4 +44,4 @@ void TCPSOCKET_SEND_REPEAT()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp b/TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp
index 850a4b56bd..e04a3fac1b 100644
--- a/TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp
@@ -53,4 +53,4 @@ void TCPSOCKET_SEND_TIMEOUT()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp b/TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp
index 8e8c74785c..54fb970d04 100644
--- a/TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp
@@ -50,4 +50,4 @@ void TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID()
     //    TEST_ASSERT_EQUAL(optval, seconds);
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp b/TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp
index 0767af43f9..eb8ca27a3f 100644
--- a/TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp
@@ -168,4 +168,4 @@ void TCPSOCKET_THREAD_PER_SOCKET_SAFETY()
     running = false;
     thread.join();
 }
-#endif
\ No newline at end of file
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/netsocket/tls/main.cpp b/TESTS/netsocket/tls/main.cpp
index 27f3cef164..33186b745f 100644
--- a/TESTS/netsocket/tls/main.cpp
+++ b/TESTS/netsocket/tls/main.cpp
@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] tls test cases requires RTOS to run
+#error [NOT_SUPPORTED] tls test cases require a RTOS to run
 #else
 #define WIFI 2
 #if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
diff --git a/TESTS/netsocket/tls/tls_tests.h b/TESTS/netsocket/tls/tls_tests.h
index 42ea6f0735..85fad115e4 100644
--- a/TESTS/netsocket/tls/tls_tests.h
+++ b/TESTS/netsocket/tls/tls_tests.h
@@ -17,7 +17,6 @@
 
 #ifndef TLS_TESTS_H
 #define TLS_TESTS_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "../test_params.h"
 #include "TLSSocket.h"
@@ -84,5 +83,5 @@ void TLSSOCKET_SIMULTANEOUS();
 void TLSSOCKET_SEND_TIMEOUT();
 
 #endif // defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)
-#endif // !defined(MBED_CONF_RTOS_PRESENT)
+
 #endif //TLS_TESTS_H
diff --git a/TESTS/netsocket/udp/main.cpp b/TESTS/netsocket/udp/main.cpp
index 756a5c8e32..7f9d9d660b 100644
--- a/TESTS/netsocket/udp/main.cpp
+++ b/TESTS/netsocket/udp/main.cpp
@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] udp test cases requires RTOS to run.
+#error [NOT_SUPPORTED] udp test cases require a RTOS to run.
 #else
 
 #define WIFI 2
diff --git a/TESTS/network/emac/emac_TestMemoryManager.cpp b/TESTS/network/emac/emac_TestMemoryManager.cpp
index dff17af5f1..e9c02b7f0a 100644
--- a/TESTS/network/emac/emac_TestMemoryManager.cpp
+++ b/TESTS/network/emac/emac_TestMemoryManager.cpp
@@ -554,4 +554,4 @@ EmacTestMemoryManager &EmacTestMemoryManager::get_instance()
     return test_memory_manager;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_TestMemoryManager.h b/TESTS/network/emac/emac_TestMemoryManager.h
index 21e25a64f4..319f14dffe 100644
--- a/TESTS/network/emac/emac_TestMemoryManager.h
+++ b/TESTS/network/emac/emac_TestMemoryManager.h
@@ -17,7 +17,6 @@
 
 #ifndef EMAC_TEST_MEMORY_MANAGER_H
 #define EMAC_TEST_MEMORY_MANAGER_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include <list>
 
@@ -226,5 +225,5 @@ private:
     unsigned int m_alloc_unit;
     bool m_memory_available;
 };
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_TEST_MEMORY_MANAGER_H */
diff --git a/TESTS/network/emac/emac_TestNetworkStack.cpp b/TESTS/network/emac/emac_TestNetworkStack.cpp
index 544cc5c55f..f72ebc96eb 100644
--- a/TESTS/network/emac/emac_TestNetworkStack.cpp
+++ b/TESTS/network/emac/emac_TestNetworkStack.cpp
@@ -203,5 +203,5 @@ OnboardNetworkStack &OnboardNetworkStack::get_default_instance()
 {
     return EmacTestNetworkStack::get_instance();
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
 #endif
diff --git a/TESTS/network/emac/emac_TestNetworkStack.h b/TESTS/network/emac/emac_TestNetworkStack.h
index 3631920508..4cadc194ce 100644
--- a/TESTS/network/emac/emac_TestNetworkStack.h
+++ b/TESTS/network/emac/emac_TestNetworkStack.h
@@ -17,7 +17,6 @@
 
 #ifndef EMAC_TEST_NETWORK_STACK_H
 #define EMAC_TEST_NETWORK_STACK_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "netsocket/nsapi_types.h"
 #include "netsocket/EMAC.h"
@@ -388,5 +387,5 @@ private:
 
     Interface *m_interface;
 };
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_TEST_NETWORK_STACK_H */
diff --git a/TESTS/network/emac/emac_ctp.cpp b/TESTS/network/emac/emac_ctp.cpp
index 377a95e6b2..5e19c3af69 100644
--- a/TESTS/network/emac/emac_ctp.cpp
+++ b/TESTS/network/emac/emac_ctp.cpp
@@ -149,5 +149,5 @@ void emac_if_ctp_msg_build(int eth_frame_len, const unsigned char *dest_addr, co
     emac_if_get()->link_out(buf);
     emac_if_check_memory(false);
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
 
diff --git a/TESTS/network/emac/emac_ctp.h b/TESTS/network/emac/emac_ctp.h
index 9c9a89d10c..e49cc87897 100644
--- a/TESTS/network/emac/emac_ctp.h
+++ b/TESTS/network/emac/emac_ctp.h
@@ -17,7 +17,7 @@
 
 #ifndef EMAC_CTP_H
 #define EMAC_CTP_H
-#if defined(MBED_CONF_RTOS_PRESENT)
+
 enum ctp_function {
     CTP_NONE,
     CTP_FORWARD,
@@ -37,5 +37,5 @@ enum ctp_function {
 ctp_function emac_if_ctp_header_handle(unsigned char *eth_input_frame, unsigned char *eth_output_frame, unsigned char *origin_addr, int *receipt_number);
 void emac_if_ctp_msg_build(int eth_frame_len, const unsigned char *dest_addr, const unsigned char *origin_addr, const unsigned char *forward_addr, int options);
 void emac_if_ctp_reply_handle(int lenght, int invalid_data_index);
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_CTP_H */
diff --git a/TESTS/network/emac/emac_initialize.h b/TESTS/network/emac/emac_initialize.h
index ed3f2729cf..ff54da1844 100644
--- a/TESTS/network/emac/emac_initialize.h
+++ b/TESTS/network/emac/emac_initialize.h
@@ -17,11 +17,10 @@
 
 #ifndef EMAC_INITIALIZE_H
 #define EMAC_INITIALIZE_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 unsigned char *emac_if_get_hw_addr(void);
 bool emac_if_init(EMAC *emac);
 EMAC *emac_if_get(void);
 EmacTestMemoryManager *emac_m_mngr_get(void);
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_INITIALIZE_H */
diff --git a/TESTS/network/emac/emac_membuf.cpp b/TESTS/network/emac/emac_membuf.cpp
index f6c1580acb..19407dd33e 100644
--- a/TESTS/network/emac/emac_membuf.cpp
+++ b/TESTS/network/emac/emac_membuf.cpp
@@ -76,4 +76,4 @@ void emac_if_memory_buffer_write(void *buf, unsigned char *eth_frame, bool write
         }
     }
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_membuf.h b/TESTS/network/emac/emac_membuf.h
index 588c74cc53..17510ae161 100644
--- a/TESTS/network/emac/emac_membuf.h
+++ b/TESTS/network/emac/emac_membuf.h
@@ -17,8 +17,8 @@
 
 #ifndef EMAC_MEMBUF_H
 #define EMAC_MEMBUF_H
-#if defined(MBED_CONF_RTOS_PRESENT)
+
 int emac_if_memory_buffer_read(void *buf, unsigned char *eth_frame);
 void emac_if_memory_buffer_write(void *buf, unsigned char *eth_frame, bool write_data);
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_MEMBUF_H */
diff --git a/TESTS/network/emac/emac_test_broadcast.cpp b/TESTS/network/emac/emac_test_broadcast.cpp
index 6f8f579d01..3d6585f03a 100644
--- a/TESTS/network/emac/emac_test_broadcast.cpp
+++ b/TESTS/network/emac/emac_test_broadcast.cpp
@@ -100,4 +100,4 @@ void test_emac_broadcast(void)
     RESET_OUTGOING_MSG_DATA;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_initialize.cpp b/TESTS/network/emac/emac_test_initialize.cpp
index 91fd40d243..d462fd7e5d 100644
--- a/TESTS/network/emac/emac_test_initialize.cpp
+++ b/TESTS/network/emac/emac_test_initialize.cpp
@@ -118,4 +118,4 @@ bool emac_if_init(EMAC *emac)
 
     return true;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_memory.cpp b/TESTS/network/emac/emac_test_memory.cpp
index 8b1c797a0d..94822954fc 100644
--- a/TESTS/network/emac/emac_test_memory.cpp
+++ b/TESTS/network/emac/emac_test_memory.cpp
@@ -162,4 +162,4 @@ void test_emac_memory()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_multicast_filter.cpp b/TESTS/network/emac/emac_test_multicast_filter.cpp
index 345bcc0f6d..af37a7fcdf 100644
--- a/TESTS/network/emac/emac_test_multicast_filter.cpp
+++ b/TESTS/network/emac/emac_test_multicast_filter.cpp
@@ -173,4 +173,4 @@ void test_emac_multicast_filter()
     RESET_OUTGOING_MSG_DATA;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_unicast.cpp b/TESTS/network/emac/emac_test_unicast.cpp
index 4ab914200b..7aac8da55b 100644
--- a/TESTS/network/emac/emac_test_unicast.cpp
+++ b/TESTS/network/emac/emac_test_unicast.cpp
@@ -77,4 +77,4 @@ void test_emac_unicast()
     RESET_OUTGOING_MSG_DATA;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_unicast_burst.cpp b/TESTS/network/emac/emac_test_unicast_burst.cpp
index 3a193e866c..51c20eb269 100644
--- a/TESTS/network/emac/emac_test_unicast_burst.cpp
+++ b/TESTS/network/emac/emac_test_unicast_burst.cpp
@@ -86,4 +86,4 @@ void test_emac_unicast_burst()
     RESET_OUTGOING_MSG_DATA;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_unicast_frame_len.cpp b/TESTS/network/emac/emac_test_unicast_frame_len.cpp
index 745fb09d67..4d0a583695 100644
--- a/TESTS/network/emac/emac_test_unicast_frame_len.cpp
+++ b/TESTS/network/emac/emac_test_unicast_frame_len.cpp
@@ -80,4 +80,4 @@ void test_emac_unicast_frame_len()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_unicast_long.cpp b/TESTS/network/emac/emac_test_unicast_long.cpp
index 3032341b37..04a9a3acca 100644
--- a/TESTS/network/emac/emac_test_unicast_long.cpp
+++ b/TESTS/network/emac/emac_test_unicast_long.cpp
@@ -82,4 +82,4 @@ void test_emac_unicast_long()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_tests.h b/TESTS/network/emac/emac_tests.h
index a645a3cfe0..6dbcd340a3 100644
--- a/TESTS/network/emac/emac_tests.h
+++ b/TESTS/network/emac/emac_tests.h
@@ -17,7 +17,7 @@
 
 #ifndef EMAC_TESTS_H
 #define EMAC_TESTS_H
-#if defined(MBED_CONF_RTOS_PRESENT)
+
 void test_emac_initialize();
 void test_emac_broadcast();
 void test_emac_unicast();
@@ -26,5 +26,5 @@ void test_emac_unicast_burst();
 void test_emac_unicast_long();
 void test_emac_multicast_filter();
 void test_emac_memory();
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_TESTS_H */
diff --git a/TESTS/network/emac/emac_util.cpp b/TESTS/network/emac/emac_util.cpp
index a1cf7b9046..e74278cbc8 100644
--- a/TESTS/network/emac/emac_util.cpp
+++ b/TESTS/network/emac/emac_util.cpp
@@ -583,4 +583,4 @@ void emac_if_set_mtu_size(int mtu_size)
 {
     eth_mtu_size = mtu_size;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_util.h b/TESTS/network/emac/emac_util.h
index b6eccd6c63..26f5b7339d 100644
--- a/TESTS/network/emac/emac_util.h
+++ b/TESTS/network/emac/emac_util.h
@@ -17,7 +17,6 @@
 
 #ifndef EMAC_UTIL_H
 #define EMAC_UTIL_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #define SECOND_TO_US            1000000
 #define SECOND_TO_MS            1000
@@ -125,5 +124,5 @@ void worker_loop_init(void);
 void worker_loop_start(void (*test_step_cb_fnc)(int opt), int timeout);
 void worker_loop_end(void);
 void worker_loop_link_up_wait(void);
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_UTIL_H */
diff --git a/TESTS/network/emac/main.cpp b/TESTS/network/emac/main.cpp
index fc71288f15..da8028744d 100644
--- a/TESTS/network/emac/main.cpp
+++ b/TESTS/network/emac/main.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] EMAC test cases requires RTOS to run
+#error [NOT_SUPPORTED] EMAC test cases require a RTOS to run
 #else
 
 #if !defined(MBED_CONF_APP_ECHO_SERVER)       || \
diff --git a/TESTS/network/interface/main.cpp b/TESTS/network/interface/main.cpp
index 02b9084434..b7799de2d4 100644
--- a/TESTS/network/interface/main.cpp
+++ b/TESTS/network/interface/main.cpp
@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] network interface test cases requires RTOS to run.
+#error [NOT_SUPPORTED] network interface test cases require a RTOS to run.
 #else
 
 #define WIFI 2
diff --git a/TESTS/network/l3ip/cellular_driver_l3ip.cpp b/TESTS/network/l3ip/cellular_driver_l3ip.cpp
index 6a0cfb4a6a..74a7833935 100644
--- a/TESTS/network/l3ip/cellular_driver_l3ip.cpp
+++ b/TESTS/network/l3ip/cellular_driver_l3ip.cpp
@@ -113,7 +113,7 @@ MBED_WEAK L3IP &L3IP::get_default_instance()
 {
     return Cellular_driver_L3IP::get_instance();
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)
 /**
  * @}
  */
diff --git a/TESTS/network/l3ip/cellular_driver_l3ip.h b/TESTS/network/l3ip/cellular_driver_l3ip.h
index 3ce7d163aa..1772416c44 100644
--- a/TESTS/network/l3ip/cellular_driver_l3ip.h
+++ b/TESTS/network/l3ip/cellular_driver_l3ip.h
@@ -17,7 +17,6 @@
 
 #ifndef CELLULAR_DRIVER_L3IP_H_
 #define CELLULAR_DRIVER_L3IP_H_
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "L3IP.h"
 
@@ -134,4 +133,3 @@ private:
 };
 
 #endif /* CELLULAR_DRIVER_L3IP_H_ */
-#endif
diff --git a/TESTS/network/l3ip/main.cpp b/TESTS/network/l3ip/main.cpp
index 8e6145d22a..8263e87ccd 100644
--- a/TESTS/network/l3ip/main.cpp
+++ b/TESTS/network/l3ip/main.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] l3ip test cases requires RTOS to run
+#error [NOT_SUPPORTED] l3ip test cases require a RTOS to run
 #else
 
 #include "mbed.h"