diff --git a/bmc/test/firmware_close_unittest.cpp b/bmc/test/firmware_close_unittest.cpp
index 6ab2b8d..6d1fe55 100644
--- a/bmc/test/firmware_close_unittest.cpp
+++ b/bmc/test/firmware_close_unittest.cpp
@@ -16,7 +16,6 @@
 namespace
 {
 
-using ::testing::Eq;
 using ::testing::Return;
 using ::testing::StrEq;
 
diff --git a/bmc/test/firmware_commit_unittest.cpp b/bmc/test/firmware_commit_unittest.cpp
index 6e24107..cb50b8e 100644
--- a/bmc/test/firmware_commit_unittest.cpp
+++ b/bmc/test/firmware_commit_unittest.cpp
@@ -14,12 +14,9 @@
 {
 namespace
 {
-using ::testing::_;
-using ::testing::IsNull;
-using ::testing::NotNull;
+
 using ::testing::Return;
 using ::testing::StrEq;
-using ::testing::StrictMock;
 
 class FirmwareHandlerCommitTest : public ::testing::Test
 {
diff --git a/bmc/test/firmware_sessionstat_unittest.cpp b/bmc/test/firmware_sessionstat_unittest.cpp
index 896dd70..0736293 100644
--- a/bmc/test/firmware_sessionstat_unittest.cpp
+++ b/bmc/test/firmware_sessionstat_unittest.cpp
@@ -11,7 +11,7 @@
 
 namespace ipmi_flash
 {
-using ::testing::Eq;
+
 using ::testing::Return;
 
 class FirmwareSessionStateTestIpmiOnly : public IpmiOnlyFirmwareTest
diff --git a/bmc/test/firmware_state_verificationcompleted_unittest.cpp b/bmc/test/firmware_state_verificationcompleted_unittest.cpp
index f926223..bdac123 100644
--- a/bmc/test/firmware_state_verificationcompleted_unittest.cpp
+++ b/bmc/test/firmware_state_verificationcompleted_unittest.cpp
@@ -20,7 +20,6 @@
 {
 
 using ::testing::IsEmpty;
-using ::testing::Return;
 using ::testing::UnorderedElementsAreArray;
 
 /*