diff --git a/tests/utests/basic/test_common.c b/tests/utests/basic/test_common.c
index 46b80ab..36269e7 100644
--- a/tests/utests/basic/test_common.c
+++ b/tests/utests/basic/test_common.c
@@ -14,7 +14,7 @@
 #define _UTEST_MAIN_
 #include "utests.h"
 
-#include "common.h"
+#include "ly_common.h"
 
 static void
 test_utf8(void **UNUSED(state))
diff --git a/tests/utests/basic/test_context.c b/tests/utests/basic/test_context.c
index d1fa2ad..e5d9509 100644
--- a/tests/utests/basic/test_context.c
+++ b/tests/utests/basic/test_context.c
@@ -14,9 +14,9 @@
 #define _UTEST_MAIN_
 #include "utests.h"
 
-#include "common.h"
 #include "context.h"
 #include "in.h"
+#include "ly_common.h"
 #include "schema_compile.h"
 #include "tests_config.h"
 #include "tree_schema_internal.h"
diff --git a/tests/utests/basic/test_hash_table.c b/tests/utests/basic/test_hash_table.c
index 78950cd..68759e5 100644
--- a/tests/utests/basic/test_hash_table.c
+++ b/tests/utests/basic/test_hash_table.c
@@ -16,8 +16,8 @@
 
 #include <stdlib.h>
 
-#include "common.h"
 #include "hash_table.h"
+#include "ly_common.h"
 
 static void
 test_invalid_arguments(void **state)
diff --git a/tests/utests/basic/test_inout.c b/tests/utests/basic/test_inout.c
index 3f83568..af8cc81 100644
--- a/tests/utests/basic/test_inout.c
+++ b/tests/utests/basic/test_inout.c
@@ -21,9 +21,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "in.h"
 #include "log.h"
+#include "ly_common.h"
 #include "out.h"
 
 #define TEST_INPUT_FILE TESTS_BIN "/libyang_test_input"
diff --git a/tests/utests/basic/test_plugins.c b/tests/utests/basic/test_plugins.c
index de13c0b..d533a07 100644
--- a/tests/utests/basic/test_plugins.c
+++ b/tests/utests/basic/test_plugins.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
+#include "ly_config.h"
 #include "plugins.h"
 #include "plugins_internal.h"
 
diff --git a/tests/utests/data/test_tree_data.c b/tests/utests/data/test_tree_data.c
index b65e8e3..bf21486 100644
--- a/tests/utests/data/test_tree_data.c
+++ b/tests/utests/data/test_tree_data.c
@@ -14,8 +14,8 @@
 #define _UTEST_MAIN_
 #include "utests.h"
 
-#include "common.h"
 #include "libyang.h"
+#include "ly_common.h"
 #include "path.h"
 #include "xpath.h"
 
diff --git a/tests/utests/schema/test_printer_tree.c b/tests/utests/schema/test_printer_tree.c
index 40fb15f..5438c61 100644
--- a/tests/utests/schema/test_printer_tree.c
+++ b/tests/utests/schema/test_printer_tree.c
@@ -14,8 +14,8 @@
 #define _UTEST_MAIN_
 #include "utests.h"
 
-#include "common.h"
 #include "context.h"
+#include "ly_common.h"
 #include "out.h"
 #include "printer_schema.h"
 #include "tree_schema.h"
diff --git a/tests/utests/schema/test_tree_schema_compile.c b/tests/utests/schema/test_tree_schema_compile.c
index 5ddafaa..4507411 100644
--- a/tests/utests/schema/test_tree_schema_compile.c
+++ b/tests/utests/schema/test_tree_schema_compile.c
@@ -15,8 +15,8 @@
 #define _UTEST_MAIN_
 #include "utests.h"
 
-#include "common.h"
 #include "in.h"
+#include "ly_common.h"
 #include "parser_internal.h"
 #include "path.h"
 #include "plugins_types.h"
diff --git a/tests/utests/schema/test_yang.c b/tests/utests/schema/test_yang.c
index 6d1c2ae..01ebbbd 100644
--- a/tests/utests/schema/test_yang.c
+++ b/tests/utests/schema/test_yang.c
@@ -18,8 +18,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "common.h"
 #include "in_internal.h"
+#include "ly_common.h"
 #include "parser_internal.h"
 #include "schema_compile.h"
 #include "tree_edit.h"
diff --git a/tests/utests/schema/test_yin.c b/tests/utests/schema/test_yin.c
index a531b64..13b32b3 100644
--- a/tests/utests/schema/test_yin.c
+++ b/tests/utests/schema/test_yin.c
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "common.h"
 #include "in.h"
+#include "ly_common.h"
 #include "parser_internal.h"
 #include "schema_compile.h"
 #include "tree.h"