diff --git a/TESTS/netsocket/dns/asynchronous_dns_multi_ip.cpp b/TESTS/netsocket/dns/asynchronous_dns_multi_ip.cpp
index 7b405bb662..c3d6b7c0fe 100644
--- a/TESTS/netsocket/dns/asynchronous_dns_multi_ip.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns_multi_ip.cpp
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if defined(MBED_CONF_RTOS_PRESENT)
+
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -116,3 +118,4 @@ void ASYNCHRONOUS_DNS_MULTI_IP()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
+#endif // defined(MBED_CONF_RTOS_PRESENT)
diff --git a/features/storage/TESTS/kvstore/static_tests/main.cpp b/features/storage/TESTS/kvstore/static_tests/main.cpp
index 673e679c49..e3dc049019 100644
--- a/features/storage/TESTS/kvstore/static_tests/main.cpp
+++ b/features/storage/TESTS/kvstore/static_tests/main.cpp
@@ -24,6 +24,8 @@
 #include "utest/utest.h"
 #include "kvstore_global_api.h"
 
+#include <cstring>
+
 using namespace utest::v1;
 using namespace mbed;