diff --git a/src/Makefile.am b/src/Makefile.am
index 499d389..3de0204 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,4 +20,5 @@
 libipmiblob_la_SOURCES += ipmiblob/internal/sys.cpp
 
 nobase_include_HEADERS += ipmiblob/test/blob_interface_mock.hpp
+nobase_include_HEADERS += ipmiblob/test/crc_mock.hpp
 nobase_include_HEADERS += ipmiblob/test/ipmi_interface_mock.hpp
diff --git a/test/crc_mock.hpp b/src/ipmiblob/test/crc_mock.hpp
similarity index 90%
rename from test/crc_mock.hpp
rename to src/ipmiblob/test/crc_mock.hpp
index 293ec24..41c2135 100644
--- a/test/crc_mock.hpp
+++ b/src/ipmiblob/test/crc_mock.hpp
@@ -5,6 +5,9 @@
 
 #include <gmock/gmock.h>
 
+namespace ipmiblob
+{
+
 class CrcInterface
 {
   public:
@@ -21,3 +24,5 @@
     MOCK_CONST_METHOD1(generateCrc,
                        std::uint16_t(const std::vector<std::uint8_t>&));
 };
+
+} // namespace ipmiblob
diff --git a/test/tools_blob_unittest.cpp b/test/tools_blob_unittest.cpp
index 6e35920..e958630 100644
--- a/test/tools_blob_unittest.cpp
+++ b/test/tools_blob_unittest.cpp
@@ -1,6 +1,5 @@
-#include "crc_mock.hpp"
-
 #include <ipmiblob/blob_handler.hpp>
+#include <ipmiblob/test/crc_mock.hpp>
 #include <ipmiblob/test/ipmi_interface_mock.hpp>
 
 #include <gtest/gtest.h>