diff --git a/test/blob_interface_mock.hpp b/test/blob_interface_mock.hpp
index fc1b284..c3b4f4c 100644
--- a/test/blob_interface_mock.hpp
+++ b/test/blob_interface_mock.hpp
@@ -2,6 +2,9 @@
 
 #include <gmock/gmock.h>
 
+namespace host_tool
+{
+
 class BlobInterfaceMock : public BlobInterface
 {
   public:
@@ -12,3 +15,5 @@
                  std::uint16_t(const std::string&,
                                blobs::FirmwareBlobHandler::UpdateFlags));
 };
+
+} // namespace host_tool
diff --git a/test/data_interface_mock.hpp b/test/data_interface_mock.hpp
index 6335ad2..3e8f24a 100644
--- a/test/data_interface_mock.hpp
+++ b/test/data_interface_mock.hpp
@@ -4,6 +4,9 @@
 
 #include <gmock/gmock.h>
 
+namespace host_tool
+{
+
 class DataInterfaceMock : public DataInterface
 {
 
@@ -14,3 +17,5 @@
     MOCK_CONST_METHOD0(supportedType,
                        blobs::FirmwareBlobHandler::UpdateFlags());
 };
+
+} // namespace host_tool
diff --git a/test/ipmi_interface_mock.hpp b/test/ipmi_interface_mock.hpp
index 2fac71d..409ef44 100644
--- a/test/ipmi_interface_mock.hpp
+++ b/test/ipmi_interface_mock.hpp
@@ -4,6 +4,9 @@
 
 #include <gmock/gmock.h>
 
+namespace host_tool
+{
+
 class IpmiInterfaceMock : public IpmiInterface
 {
   public:
@@ -11,3 +14,5 @@
     MOCK_METHOD1(sendPacket,
                  std::vector<std::uint8_t>(const std::vector<std::uint8_t>&));
 };
+
+} // namespace host_tool
diff --git a/test/tools_blob_unittest.cpp b/test/tools_blob_unittest.cpp
index f3a01c1..8205d3a 100644
--- a/test/tools_blob_unittest.cpp
+++ b/test/tools_blob_unittest.cpp
@@ -4,6 +4,8 @@
 
 #include <gtest/gtest.h>
 
+namespace host_tool
+{
 CrcInterface* crcIntf = nullptr;
 
 std::uint16_t generateCrc(const std::vector<std::uint8_t>& data)
@@ -211,3 +213,5 @@
         blob.openBlob("abcd", blobs::FirmwareBlobHandler::UpdateFlags::lpc);
     EXPECT_EQ(0xedfe, session);
 }
+
+} // namespace host_tool
diff --git a/test/tools_updater_unittest.cpp b/test/tools_updater_unittest.cpp
index bc7417c..0f49494 100644
--- a/test/tools_updater_unittest.cpp
+++ b/test/tools_updater_unittest.cpp
@@ -6,6 +6,9 @@
 
 #include <gtest/gtest.h>
 
+namespace host_tool
+{
+
 using ::testing::Eq;
 using ::testing::Return;
 using ::testing::StrEq;
@@ -43,3 +46,5 @@
 
     updaterMain(&blobMock, &handlerMock, firmwareImage, signatureFile);
 }
+
+} // namespace host_tool