diff --git a/tools/i2c/meson.build b/tools/i2c/meson.build
index 71a5aab..424a197 100644
--- a/tools/i2c/meson.build
+++ b/tools/i2c/meson.build
@@ -9,3 +9,5 @@
     link_with: libi2c_dev,
     include_directories : libi2c_inc,
     link_args : '-li2c')
+
+subdir('test')
diff --git a/tools/i2c/test/meson.build b/tools/i2c/test/meson.build
new file mode 100644
index 0000000..e732a84
--- /dev/null
+++ b/tools/i2c/test/meson.build
@@ -0,0 +1,13 @@
+libi2c_dev_mock_inc = include_directories('.')
+
+libi2c_dev_mock = static_library(
+    'i2c_dev_mock',
+    'mocked_i2c_interface.cpp',
+    dependencies: [
+        gmock
+    ],
+    include_directories: [
+        libi2c_inc,
+        libi2c_dev_mock_inc
+    ]
+)
diff --git a/tools/i2c/test/mocked_i2c_interface.cpp b/tools/i2c/test/mocked_i2c_interface.cpp
new file mode 100644
index 0000000..2fed41e
--- /dev/null
+++ b/tools/i2c/test/mocked_i2c_interface.cpp
@@ -0,0 +1,15 @@
+#include "mocked_i2c_interface.hpp"
+
+#include <memory>
+
+namespace i2c
+{
+
+std::unique_ptr<I2CInterface>
+    create(uint8_t /*busId*/, uint8_t /*devAddr*/,
+           I2CInterface::InitialState /*initialState*/)
+{
+    return std::make_unique<MockedI2CInterface>();
+}
+
+} // namespace i2c
diff --git a/tools/i2c/test/mocked_i2c_interface.hpp b/tools/i2c/test/mocked_i2c_interface.hpp
index 5f3b3a3..02b44f8 100644
--- a/tools/i2c/test/mocked_i2c_interface.hpp
+++ b/tools/i2c/test/mocked_i2c_interface.hpp
@@ -31,11 +31,4 @@
                 (override));
 };
 
-std::unique_ptr<I2CInterface>
-    create(uint8_t /*busId*/, uint8_t /*devAddr*/,
-           I2CInterface::InitialState /*initialState*/)
-{
-    return std::make_unique<MockedI2CInterface>();
-}
-
 } // namespace i2c
diff --git a/tools/power-utils/test/meson.build b/tools/power-utils/test/meson.build
index 1f23ad0..1d365c3 100644
--- a/tools/power-utils/test/meson.build
+++ b/tools/power-utils/test/meson.build
@@ -29,9 +29,14 @@
             phosphor_logging,
         ],
         implicit_include_directories: false,
-        include_directories: [libpower_inc, libi2c_inc],
+        include_directories: [
+            libpower_inc,
+            libi2c_inc,
+            libi2c_dev_mock_inc
+        ],
         link_with: [
             libpower,
+            libi2c_dev_mock
         ],
         objects: record_manager,
     )
diff --git a/tools/power-utils/test/test_updater.cpp b/tools/power-utils/test/test_updater.cpp
index c51c233..6ad3f73 100644
--- a/tools/power-utils/test/test_updater.cpp
+++ b/tools/power-utils/test/test_updater.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "../updater.hpp"
-#include "test/mocked_i2c_interface.hpp"
+#include "mocked_i2c_interface.hpp"
 
 #include <filesystem>