diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0bbc353..8cf9607 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,10 +31,10 @@ add_executable(
     EXCLUDE_FROM_ALL
         main_test_core.c
         test_core.c
-        test_internal.c
-        test_platform.c
+        test_core_internal.c
+        test_core_platform.c
+        core_utils.c
         stream_buffer.c
-        utils.c
         ../src/gmio_core/internal/string_parse.c)
 target_link_libraries(test_core gmio)
 
@@ -47,8 +47,8 @@ add_executable(
         main_test_stl.c
         test_stl_io.c
         test_stl_internal.c
+        core_utils.c
         stl_utils.c
-        utils.c
         ../src/gmio_stl/internal/stl_rw_common.c)
 target_link_libraries(test_stl gmio)
 
diff --git a/tests/utils.c b/tests/core_utils.c
similarity index 98%
rename from tests/utils.c
rename to tests/core_utils.c
index 9e67823..57d0051 100644
--- a/tests/utils.c
+++ b/tests/core_utils.c
@@ -13,7 +13,7 @@
 ** "http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html".
 ****************************************************************************/
 
-#include "utils.h"
+#include "core_utils.h"
 
 gmio_bool_t gmio_float32_equals_by_ulp(
         gmio_float32_t a, gmio_float32_t b, uint32_t max_ulp_diff)
diff --git a/tests/utils.h b/tests/core_utils.h
similarity index 94%
rename from tests/utils.h
rename to tests/core_utils.h
index 6393d85..47d4d99 100644
--- a/tests/utils.h
+++ b/tests/core_utils.h
@@ -13,8 +13,8 @@
 ** "http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html".
 ****************************************************************************/
 
-#ifndef GMIO_TESTS_UTILS_H
-#define GMIO_TESTS_UTILS_H
+#ifndef GMIO_TESTS_CORE_UTILS_H
+#define GMIO_TESTS_CORE_UTILS_H
 
 #include "../src/gmio_core/global.h"
 #include "../src/gmio_core/internal/string_utils.h"
@@ -50,4 +50,4 @@ GMIO_INLINE int gmio_float32_sign(gmio_float32_t v)
 /*! Trim whitespaces in string \p str from end */
 void gmio_string_trim_from_end(char* str, size_t len);
 
-#endif /* GMIO_TESTS_UTILS_H */
+#endif /* GMIO_TESTS_CORE_UTILS_H */
diff --git a/tests/stl_utils.c b/tests/stl_utils.c
index 261f0c9..15895b3 100644
--- a/tests/stl_utils.c
+++ b/tests/stl_utils.c
@@ -15,8 +15,7 @@
 
 #include "stl_utils.h"
 
-#include "utils.h"
-
+#include "core_utils.h"
 #include "../src/gmio_core/internal/min_max.h"
 #include "../src/gmio_core/internal/safe_cast.h"
 
diff --git a/tests/test_internal.c b/tests/test_core_internal.c
similarity index 99%
rename from tests/test_internal.c
rename to tests/test_core_internal.c
index 3111514..bdcc7c1 100644
--- a/tests/test_internal.c
+++ b/tests/test_core_internal.c
@@ -15,6 +15,9 @@
 
 #include "utest_assert.h"
 
+#include "core_utils.h"
+#include "stream_buffer.h"
+
 #include "../src/gmio_core/internal/byte_codec.h"
 #include "../src/gmio_core/internal/byte_swap.h"
 #include "../src/gmio_core/internal/convert.h"
@@ -23,9 +26,6 @@
 #include "../src/gmio_core/internal/string_parse.h"
 #include "../src/gmio_core/internal/string_utils.h"
 
-#include "stream_buffer.h"
-#include "utils.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/test_platform.c b/tests/test_core_platform.c
similarity index 100%
rename from tests/test_platform.c
rename to tests/test_core_platform.c
diff --git a/tests/test_stl_io.c b/tests/test_stl_io.c
index 8b09609..3ece2a2 100644
--- a/tests/test_stl_io.c
+++ b/tests/test_stl_io.c
@@ -15,8 +15,8 @@
 
 #include "utest_assert.h"
 
+#include "core_utils.h"
 #include "stl_utils.h"
-#include "utils.h"
 
 #include "../src/gmio_core/error.h"
 #include "../src/gmio_core/internal/min_max.h"