diff --git a/bmc/test/firmware_close_unittest.cpp b/bmc/test/firmware_close_unittest.cpp
index 87de86e..580fcf4 100644
--- a/bmc/test/firmware_close_unittest.cpp
+++ b/bmc/test/firmware_close_unittest.cpp
@@ -21,8 +21,7 @@
 using ::testing::StrEq;
 
 class FirmwareHandlerCloseTest : public FakeLpcFirmwareTest
-{
-};
+{};
 
 TEST_F(FirmwareHandlerCloseTest, CloseSucceedsWithDataHandler)
 {
diff --git a/bmc/test/firmware_open_unittest.cpp b/bmc/test/firmware_open_unittest.cpp
index 21ab97b..77e5ff3 100644
--- a/bmc/test/firmware_open_unittest.cpp
+++ b/bmc/test/firmware_open_unittest.cpp
@@ -16,8 +16,7 @@
 {
 
 class FirmwareOpenFailTest : public ::testing::TestWithParam<std::uint16_t>
-{
-};
+{};
 
 TEST_P(FirmwareOpenFailTest, WithFlags)
 {
diff --git a/bmc/test/firmware_sessionstat_unittest.cpp b/bmc/test/firmware_sessionstat_unittest.cpp
index 9623246..0e2796c 100644
--- a/bmc/test/firmware_sessionstat_unittest.cpp
+++ b/bmc/test/firmware_sessionstat_unittest.cpp
@@ -15,12 +15,10 @@
 using ::testing::Return;
 
 class FirmwareSessionStateTestIpmiOnly : public IpmiOnlyFirmwareTest
-{
-};
+{};
 
 class FirmwareSessionStateTestLpc : public FakeLpcFirmwareTest
-{
-};
+{};
 
 TEST_F(FirmwareSessionStateTestIpmiOnly, DataTypeIpmiNoMetadata)
 {
diff --git a/bmc/test/firmware_state_notyetstarted_unittest.cpp b/bmc/test/firmware_state_notyetstarted_unittest.cpp
index 2a100bd..b3cfc49 100644
--- a/bmc/test/firmware_state_notyetstarted_unittest.cpp
+++ b/bmc/test/firmware_state_notyetstarted_unittest.cpp
@@ -20,8 +20,7 @@
 using ::testing::UnorderedElementsAreArray;
 
 class FirmwareHandlerNotYetStartedTest : public IpmiOnlyFirmwareStaticTest
-{
-};
+{};
 
 /*
  * There are the following calls (parameters may vary):
diff --git a/bmc/test/firmware_state_updatecompleted_unittest.cpp b/bmc/test/firmware_state_updatecompleted_unittest.cpp
index 320d09e..7136223 100644
--- a/bmc/test/firmware_state_updatecompleted_unittest.cpp
+++ b/bmc/test/firmware_state_updatecompleted_unittest.cpp
@@ -39,8 +39,7 @@
  */
 
 class FirmwareHandlerUpdateCompletedTest : public IpmiOnlyFirmwareStaticTest
-{
-};
+{};
 
 /*
  * open(blob)
diff --git a/bmc/test/firmware_state_updatepending_unittest.cpp b/bmc/test/firmware_state_updatepending_unittest.cpp
index d757b3c..16a6498 100644
--- a/bmc/test/firmware_state_updatepending_unittest.cpp
+++ b/bmc/test/firmware_state_updatepending_unittest.cpp
@@ -41,8 +41,7 @@
  */
 
 class FirmwareHandlerUpdatePendingTest : public IpmiOnlyFirmwareStaticTest
-{
-};
+{};
 
 /*
  * There are the following calls (parameters may vary):
diff --git a/bmc/test/firmware_state_updatestarted_unittest.cpp b/bmc/test/firmware_state_updatestarted_unittest.cpp
index 086dcfa..3aa97ed 100644
--- a/bmc/test/firmware_state_updatestarted_unittest.cpp
+++ b/bmc/test/firmware_state_updatestarted_unittest.cpp
@@ -38,8 +38,7 @@
  */
 
 class FirmwareHandlerUpdateStartedTest : public IpmiOnlyFirmwareStaticTest
-{
-};
+{};
 
 /*
  * open(blob)
diff --git a/bmc/test/firmware_state_uploadinprogress_unittest.cpp b/bmc/test/firmware_state_uploadinprogress_unittest.cpp
index 366435b..994ddb1 100644
--- a/bmc/test/firmware_state_uploadinprogress_unittest.cpp
+++ b/bmc/test/firmware_state_uploadinprogress_unittest.cpp
@@ -40,8 +40,7 @@
  * will inform what canHandleBlob will return.
  */
 class FirmwareHandlerUploadInProgressTest : public IpmiOnlyFirmwareStaticTest
-{
-};
+{};
 
 TEST_F(FirmwareHandlerUploadInProgressTest, GetBlobIdsVerifyOutputActiveImage)
 {
diff --git a/bmc/test/firmware_state_verificationcompleted_unittest.cpp b/bmc/test/firmware_state_verificationcompleted_unittest.cpp
index 0c6bae7..f7b0998 100644
--- a/bmc/test/firmware_state_verificationcompleted_unittest.cpp
+++ b/bmc/test/firmware_state_verificationcompleted_unittest.cpp
@@ -42,10 +42,9 @@
  * indicates a successful verification.
  */
 
-class FirmwareHandlerVerificationCompletedTest
-    : public IpmiOnlyFirmwareStaticTest
-{
-};
+class FirmwareHandlerVerificationCompletedTest :
+    public IpmiOnlyFirmwareStaticTest
+{};
 
 /*
  * deleteBlob(blob)
diff --git a/bmc/test/firmware_state_verificationpending_unittest.cpp b/bmc/test/firmware_state_verificationpending_unittest.cpp
index c9b8e92..3b958c1 100644
--- a/bmc/test/firmware_state_verificationpending_unittest.cpp
+++ b/bmc/test/firmware_state_verificationpending_unittest.cpp
@@ -43,8 +43,7 @@
  */
 
 class FirmwareHandlerVerificationPendingTest : public IpmiOnlyFirmwareStaticTest
-{
-};
+{};
 
 /*
  * getBlobIds
diff --git a/bmc/test/firmware_state_verificationstarted_unittest.cpp b/bmc/test/firmware_state_verificationstarted_unittest.cpp
index a974c2b..df2c422 100644
--- a/bmc/test/firmware_state_verificationstarted_unittest.cpp
+++ b/bmc/test/firmware_state_verificationstarted_unittest.cpp
@@ -41,8 +41,7 @@
  */
 
 class FirmwareHandlerVerificationStartedTest : public IpmiOnlyFirmwareStaticTest
-{
-};
+{};
 
 /*
  * canHandleBlob(blob)
diff --git a/bmc/test/firmware_write_unittest.cpp b/bmc/test/firmware_write_unittest.cpp
index 481f3ec..a47134f 100644
--- a/bmc/test/firmware_write_unittest.cpp
+++ b/bmc/test/firmware_write_unittest.cpp
@@ -21,12 +21,10 @@
 using ::testing::Return;
 
 class FirmwareHandlerWriteTestIpmiOnly : public IpmiOnlyFirmwareTest
-{
-};
+{};
 
 class FirmwareHandlerWriteTestLpc : public FakeLpcFirmwareTest
-{
-};
+{};
 
 TEST_F(FirmwareHandlerWriteTestIpmiOnly, DataTypeIpmiWriteSuccess)
 {
diff --git a/bmc/test/firmware_writemeta_unittest.cpp b/bmc/test/firmware_writemeta_unittest.cpp
index ef292b0..22f778d 100644
--- a/bmc/test/firmware_writemeta_unittest.cpp
+++ b/bmc/test/firmware_writemeta_unittest.cpp
@@ -19,8 +19,7 @@
 using ::testing::Return;
 
 class FirmwareHandlerWriteMetaTest : public FakeLpcFirmwareTest
-{
-};
+{};
 
 TEST_F(FirmwareHandlerWriteMetaTest, WriteConfigParametersFailIfOverIPMI)
 {