diff --git a/test_common/harness/ThreadPool.cpp b/test_common/harness/ThreadPool.cpp
index c4abaa2e1a..fb1291d610 100644
--- a/test_common/harness/ThreadPool.cpp
+++ b/test_common/harness/ThreadPool.cpp
@@ -33,9 +33,9 @@
 #include "mingw_compat.h"
 #include <process.h>
 #else // !_WIN32
+#include <errno.h>
 #include <pthread.h>
 #include <unistd.h>
-#include <sys/errno.h>
 #ifdef __linux__
 #include <sched.h>
 #endif
diff --git a/test_common/harness/os_helpers.cpp b/test_common/harness/os_helpers.cpp
index 3989edf684..e866f3e8a9 100644
--- a/test_common/harness/os_helpers.cpp
+++ b/test_common/harness/os_helpers.cpp
@@ -208,7 +208,8 @@ static std::string _err_msg(int err, int level)
     */
 
 #if (defined(__ANDROID__) && __ANDROID_API__ < 23)                             \
-    || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
+    || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)  \
+    || (defined(_GNU_SOURCE) && !defined(__GLIBC__))
 
 // XSI version of strerror_r.
 #warning Not tested!