diff --git a/test/firmware_unittest.hpp b/test/firmware_unittest.hpp
index 1f1ae86..d2eaa2c 100644
--- a/test/firmware_unittest.hpp
+++ b/test/firmware_unittest.hpp
@@ -18,21 +18,27 @@
 class IpmiOnlyFirmwareStaticTest : public ::testing::Test
 {
   protected:
-    ImageHandlerMock imageMock;
-    std::vector<HandlerPack> blobs;
-    std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::UpdateFlags::ipmi, nullptr}};
-    std::unique_ptr<blobs::GenericBlobInterface> handler;
-
     void SetUp() override
     {
         blobs = {
             {hashBlobId, &imageMock},
             {staticLayoutBlobId, &imageMock},
         };
+
+        std::unique_ptr<VerificationInterface> verifyMock =
+            std::make_unique<VerificationMock>();
+        verifyMockPtr = reinterpret_cast<VerificationMock*>(verifyMock.get());
+
         handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-            blobs, data, CreateVerifyMock(), CreateUpdateMock());
+            blobs, data, std::move(verifyMock), CreateUpdateMock());
     }
+
+    ImageHandlerMock imageMock;
+    std::vector<HandlerPack> blobs;
+    std::vector<DataHandlerPack> data = {
+        {FirmwareBlobHandler::UpdateFlags::ipmi, nullptr}};
+    std::unique_ptr<blobs::GenericBlobInterface> handler;
+    VerificationMock* verifyMockPtr;
 };
 
 class IpmiOnlyFirmwareTest : public ::testing::Test