diff --git a/src/test/erase/pattern_test.cpp b/src/test/erase/pattern_test.cpp
index 358f873..98eb374 100644
--- a/src/test/erase/pattern_test.cpp
+++ b/src/test/erase/pattern_test.cpp
@@ -15,6 +15,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+namespace estoraged_test
+{
+
+using estoraged::Pattern;
 using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
 
 TEST(pattern, patternPass)
@@ -65,3 +69,5 @@
     EXPECT_NO_THROW(pass.writePattern(size - sizeof(dummyValue)));
     EXPECT_THROW(pass.verifyPattern(size), InternalFailure);
 }
+
+} // namespace estoraged_test
diff --git a/src/test/erase/verifyGeometry_test.cpp b/src/test/erase/verifyGeometry_test.cpp
index de4d3fa..8b362f3 100644
--- a/src/test/erase/verifyGeometry_test.cpp
+++ b/src/test/erase/verifyGeometry_test.cpp
@@ -7,6 +7,9 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+namespace estoraged_test
+{
+using estoraged::VerifyDriveGeometry;
 using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
 
 TEST(VerifyGeometry, TooBigFail)
@@ -28,3 +31,5 @@
     VerifyDriveGeometry passVerify("");
     EXPECT_NO_THROW(passVerify.geometryOkay(ERASE_MIN_GEOMETRY + 1));
 }
+
+} // namespace estoraged_test