diff --git a/test/libpldmresponder_bios_config_test.cpp b/test/libpldmresponder_bios_config_test.cpp
index 371658c..e0025fd 100644
--- a/test/libpldmresponder_bios_config_test.cpp
+++ b/test/libpldmresponder_bios_config_test.cpp
@@ -1,4 +1,4 @@
-#include "bios_utils.hpp"
+#include "common/bios_utils.hpp"
 #include "libpldmresponder/bios_config.hpp"
 #include "libpldmresponder/bios_string_attribute.hpp"
 #include "mocked_bios.hpp"
diff --git a/test/libpldmresponder_dbus_to_host_effecter_test.cpp b/test/libpldmresponder_dbus_to_host_effecter_test.cpp
index 56b62e9..0cc963a 100644
--- a/test/libpldmresponder_dbus_to_host_effecter_test.cpp
+++ b/test/libpldmresponder_dbus_to_host_effecter_test.cpp
@@ -1,6 +1,6 @@
+#include "common/utils.hpp"
 #include "host-bmc/dbus_to_host_effecters.hpp"
 #include "mocked_utils.hpp"
-#include "utils.hpp"
 
 #include <nlohmann/json.hpp>
 
diff --git a/test/libpldmresponder_platform_test.cpp b/test/libpldmresponder_platform_test.cpp
index f487d3b..fdb5544 100644
--- a/test/libpldmresponder_platform_test.cpp
+++ b/test/libpldmresponder_platform_test.cpp
@@ -1,3 +1,4 @@
+#include "common/utils.hpp"
 #include "libpldmresponder/event_parser.hpp"
 #include "libpldmresponder/pdr.hpp"
 #include "libpldmresponder/pdr_utils.hpp"
@@ -5,7 +6,6 @@
 #include "libpldmresponder/platform_numeric_effecter.hpp"
 #include "libpldmresponder/platform_state_effecter.hpp"
 #include "mocked_utils.hpp"
-#include "utils.hpp"
 
 #include <iostream>
 
diff --git a/test/mocked_utils.hpp b/test/mocked_utils.hpp
index 0813830..838e542 100644
--- a/test/mocked_utils.hpp
+++ b/test/mocked_utils.hpp
@@ -1,4 +1,4 @@
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
diff --git a/test/pldm_utils_test.cpp b/test/pldm_utils_test.cpp
index c9c5dd8..a65b33b 100644
--- a/test/pldm_utils_test.cpp
+++ b/test/pldm_utils_test.cpp
@@ -1,6 +1,6 @@
 #include "libpldm/platform.h"
 
-#include "utils.hpp"
+#include "common/utils.hpp"
 
 #include <gtest/gtest.h>