diff --git a/phosphor-power-supply/test/mock.hpp b/phosphor-power-supply/test/mock.hpp
index f99b33f..c1f8986 100644
--- a/phosphor-power-supply/test/mock.hpp
+++ b/phosphor-power-supply/test/mock.hpp
@@ -31,6 +31,7 @@
 {
 namespace psu
 {
+
 class MockedUtil : public UtilBase
 {
   public:
@@ -41,20 +42,9 @@
                 (const, override));
 };
 
-static std::unique_ptr<MockedUtil> util;
-inline const UtilBase& getUtils()
-{
-    if (!util)
-    {
-        util = std::make_unique<MockedUtil>();
-    }
-    return *util;
-}
+const UtilBase& getUtils();
 
-inline void freeUtils()
-{
-    util.reset();
-}
+void freeUtils();
 
 } // namespace psu
 } // namespace power