diff --git a/test/blob_mock.hpp b/test/blob_mock.hpp
deleted file mode 100644
index 3396048..0000000
--- a/test/blob_mock.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <blobs-ipmid/blobs.hpp>
-
-#include <gmock/gmock.h>
-
-namespace blobs
-{
-
-class BlobMock : public GenericBlobInterface
-{
-  public:
-    virtual ~BlobMock() = default;
-
-    MOCK_METHOD1(canHandleBlob, bool(const std::string&));
-    MOCK_METHOD0(getBlobIds, std::vector<std::string>());
-    MOCK_METHOD1(deleteBlob, bool(const std::string&));
-    MOCK_METHOD2(stat, bool(const std::string&, struct BlobMeta*));
-    MOCK_METHOD3(open, bool(uint16_t, uint16_t, const std::string&));
-    MOCK_METHOD3(read, std::vector<uint8_t>(uint16_t, uint32_t, uint32_t));
-    MOCK_METHOD3(write, bool(uint16_t, uint32_t, const std::vector<uint8_t>&));
-    MOCK_METHOD2(commit, bool(uint16_t, const std::vector<uint8_t>&));
-    MOCK_METHOD1(close, bool(uint16_t));
-    MOCK_METHOD2(stat, bool(uint16_t, struct BlobMeta*));
-    MOCK_METHOD1(expire, bool(uint16_t));
-};
-} // namespace blobs
diff --git a/test/ipmi_close_unittest.cpp b/test/ipmi_close_unittest.cpp
index e34f731..f315ea0 100644
--- a/test/ipmi_close_unittest.cpp
+++ b/test/ipmi_close_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_commit_unittest.cpp b/test/ipmi_commit_unittest.cpp
index 1cc47a4..34ff10d 100644
--- a/test/ipmi_commit_unittest.cpp
+++ b/test/ipmi_commit_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_delete_unittest.cpp b/test/ipmi_delete_unittest.cpp
index 25fb06b..409635d 100644
--- a/test/ipmi_delete_unittest.cpp
+++ b/test/ipmi_delete_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_enumerate_unittest.cpp b/test/ipmi_enumerate_unittest.cpp
index 232fe7a..041a8cb 100644
--- a/test/ipmi_enumerate_unittest.cpp
+++ b/test/ipmi_enumerate_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_getcount_unittest.cpp b/test/ipmi_getcount_unittest.cpp
index c6d74e6..267ae43 100644
--- a/test/ipmi_getcount_unittest.cpp
+++ b/test/ipmi_getcount_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <vector>
 
diff --git a/test/ipmi_open_unittest.cpp b/test/ipmi_open_unittest.cpp
index db2a34f..523025d 100644
--- a/test/ipmi_open_unittest.cpp
+++ b/test/ipmi_open_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_read_unittest.cpp b/test/ipmi_read_unittest.cpp
index b6dab55..ef36646 100644
--- a/test/ipmi_read_unittest.cpp
+++ b/test/ipmi_read_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <vector>
 
diff --git a/test/ipmi_sessionstat_unittest.cpp b/test/ipmi_sessionstat_unittest.cpp
index e1e1aad..70c36ec 100644
--- a/test/ipmi_sessionstat_unittest.cpp
+++ b/test/ipmi_sessionstat_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_stat_unittest.cpp b/test/ipmi_stat_unittest.cpp
index a6f1dfe..75f90c4 100644
--- a/test/ipmi_stat_unittest.cpp
+++ b/test/ipmi_stat_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_validate_unittest.cpp b/test/ipmi_validate_unittest.cpp
index 6bf4200..5a1cbfe 100644
--- a/test/ipmi_validate_unittest.cpp
+++ b/test/ipmi_validate_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_write_unittest.cpp b/test/ipmi_write_unittest.cpp
index 55a1e3b..7b5e45f 100644
--- a/test/ipmi_write_unittest.cpp
+++ b/test/ipmi_write_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_close_unittest.cpp b/test/manager_close_unittest.cpp
index 85ad81b..02b5dfe 100644
--- a/test/manager_close_unittest.cpp
+++ b/test/manager_close_unittest.cpp
@@ -1,6 +1,5 @@
-#include "blob_mock.hpp"
-
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_commit_unittest.cpp b/test/manager_commit_unittest.cpp
index e576707..48e6b67 100644
--- a/test/manager_commit_unittest.cpp
+++ b/test/manager_commit_unittest.cpp
@@ -1,6 +1,5 @@
-#include "blob_mock.hpp"
-
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_delete_unittest.cpp b/test/manager_delete_unittest.cpp
index 62a2e4c..e35355d 100644
--- a/test/manager_delete_unittest.cpp
+++ b/test/manager_delete_unittest.cpp
@@ -1,6 +1,5 @@
-#include "blob_mock.hpp"
-
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_mock.hpp b/test/manager_mock.hpp
deleted file mode 100644
index 3a9d065..0000000
--- a/test/manager_mock.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <blobs-ipmid/blobs.hpp>
-#include <blobs-ipmid/manager.hpp>
-#include <memory>
-#include <string>
-
-#include <gmock/gmock.h>
-
-namespace blobs
-{
-
-class ManagerMock : public ManagerInterface
-{
-  public:
-    virtual ~ManagerMock() = default;
-
-    MOCK_METHOD1(registerHandler, bool(std::unique_ptr<GenericBlobInterface>));
-    MOCK_METHOD0(buildBlobList, uint32_t());
-    MOCK_METHOD1(getBlobId, std::string(uint32_t));
-    MOCK_METHOD3(open, bool(uint16_t, const std::string&, uint16_t*));
-    MOCK_METHOD2(stat, bool(const std::string&, struct BlobMeta*));
-    MOCK_METHOD2(stat, bool(uint16_t, struct BlobMeta*));
-    MOCK_METHOD2(commit, bool(uint16_t, const std::vector<uint8_t>&));
-    MOCK_METHOD1(close, bool(uint16_t));
-    MOCK_METHOD3(read, std::vector<uint8_t>(uint16_t, uint32_t, uint32_t));
-    MOCK_METHOD3(write, bool(uint16_t, uint32_t, const std::vector<uint8_t>&));
-    MOCK_METHOD1(deleteBlob, bool(const std::string&));
-};
-} // namespace blobs
diff --git a/test/manager_open_unittest.cpp b/test/manager_open_unittest.cpp
index 441c204..72aff85 100644
--- a/test/manager_open_unittest.cpp
+++ b/test/manager_open_unittest.cpp
@@ -1,6 +1,5 @@
-#include "blob_mock.hpp"
-
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 #include <string>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_read_unittest.cpp b/test/manager_read_unittest.cpp
index 5858658..23df9d4 100644
--- a/test/manager_read_unittest.cpp
+++ b/test/manager_read_unittest.cpp
@@ -1,6 +1,5 @@
-#include "blob_mock.hpp"
-
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_sessionstat_unittest.cpp b/test/manager_sessionstat_unittest.cpp
index 8e4c233..019d95b 100644
--- a/test/manager_sessionstat_unittest.cpp
+++ b/test/manager_sessionstat_unittest.cpp
@@ -1,6 +1,5 @@
-#include "blob_mock.hpp"
-
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_stat_unittest.cpp b/test/manager_stat_unittest.cpp
index 15b779e..0ae7822 100644
--- a/test/manager_stat_unittest.cpp
+++ b/test/manager_stat_unittest.cpp
@@ -1,6 +1,5 @@
-#include "blob_mock.hpp"
-
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_unittest.cpp b/test/manager_unittest.cpp
index c0157e6..a4c7a8c 100644
--- a/test/manager_unittest.cpp
+++ b/test/manager_unittest.cpp
@@ -1,7 +1,6 @@
-#include "blob_mock.hpp"
-
 #include <algorithm>
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 #include <string>
 #include <vector>
 
diff --git a/test/manager_write_unittest.cpp b/test/manager_write_unittest.cpp
index 50ea7a4..84b3400 100644
--- a/test/manager_write_unittest.cpp
+++ b/test/manager_write_unittest.cpp
@@ -1,6 +1,5 @@
-#include "blob_mock.hpp"
-
 #include <blobs-ipmid/manager.hpp>
+#include <blobs-ipmid/test/blob_mock.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/process_unittest.cpp b/test/process_unittest.cpp
index 2ffb023..63e6f5e 100644
--- a/test/process_unittest.cpp
+++ b/test/process_unittest.cpp
@@ -1,9 +1,9 @@
 #include "crc.hpp"
 #include "crc_mock.hpp"
 #include "ipmi.hpp"
-#include "manager_mock.hpp"
 #include "process.hpp"
 
+#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>