diff --git a/test/vpd-manager-test/editor_test.cpp b/test/vpd-manager-test/editor_test.cpp
index 1549df8..de7e2ba 100644
--- a/test/vpd-manager-test/editor_test.cpp
+++ b/test/vpd-manager-test/editor_test.cpp
@@ -69,8 +69,9 @@
         for (const auto& itemEEPROM : groupEEPROM)
         {
             fruLocationCode.emplace(
-                itemEEPROM["extraInterfaces"][LOCATION_CODE_INF]["LocationCode"]
-                    .get_ref<const nlohmann::json::string_t&>(),
+                itemEEPROM["extraInterfaces"][IBM_LOCATION_CODE_INF]
+                          ["LocationCode"]
+                              .get_ref<const nlohmann::json::string_t&>(),
                 itemEEPROM["inventoryPath"]
                     .get_ref<const nlohmann::json::string_t&>());
         }
diff --git a/test/vpd-manager-test/reader_test.cpp b/test/vpd-manager-test/reader_test.cpp
index b6cf80c..58d8d2f 100644
--- a/test/vpd-manager-test/reader_test.cpp
+++ b/test/vpd-manager-test/reader_test.cpp
@@ -65,8 +65,9 @@
         for (const auto& itemEEPROM : groupEEPROM)
         {
             fruLocationCode.emplace(
-                itemEEPROM["extraInterfaces"][LOCATION_CODE_INF]["LocationCode"]
-                    .get_ref<const nlohmann::json::string_t&>(),
+                itemEEPROM["extraInterfaces"][IBM_LOCATION_CODE_INF]
+                          ["LocationCode"]
+                              .get_ref<const nlohmann::json::string_t&>(),
                 itemEEPROM["inventoryPath"]
                     .get_ref<const nlohmann::json::string_t&>());
         }
@@ -109,8 +110,8 @@
 {
     // mock the call to read bus property
     MockUtilCalls uCalls;
-    EXPECT_CALL(uCalls, readBusProperty("/system/chassis/motherboard",
-                                        LOCATION_CODE_INF, "LocationCode"))
+    EXPECT_CALL(uCalls, readBusProperty(SYSTEM_OBJECT, IBM_LOCATION_CODE_INF,
+                                        "LocationCode"))
         .Times(1)
         .WillOnce(testing::Return("U78DA.ND1.1234567-P0"));