diff --git a/test/controller_mock.hpp b/test/controller_mock.hpp
index 94c7cb5..52c21a9 100644
--- a/test/controller_mock.hpp
+++ b/test/controller_mock.hpp
@@ -11,8 +11,7 @@
 
     ControllerMock(const std::string& id, PIDZone* owner) :
         PIDController(id, owner)
-    {
-    }
+    {}
 
     MOCK_METHOD0(inputProc, double());
     MOCK_METHOD0(setptProc, double());
diff --git a/test/dbus_active_unittest.cpp b/test/dbus_active_unittest.cpp
index e6dcc9d..142cc1a 100644
--- a/test/dbus_active_unittest.cpp
+++ b/test/dbus_active_unittest.cpp
@@ -2,6 +2,7 @@
 #include "test/dbushelper_mock.hpp"
 
 #include <sdbusplus/test/sdbus_mock.hpp>
+
 #include <string>
 
 #include <gmock/gmock.h>
diff --git a/test/dbus_passive_unittest.cpp b/test/dbus_passive_unittest.cpp
index 7b82c74..d4e9e98 100644
--- a/test/dbus_passive_unittest.cpp
+++ b/test/dbus_passive_unittest.cpp
@@ -2,8 +2,9 @@
 #include "dbus/dbuspassive.hpp"
 #include "test/dbushelper_mock.hpp"
 
-#include <functional>
 #include <sdbusplus/test/sdbus_mock.hpp>
+
+#include <functional>
 #include <string>
 #include <variant>
 
diff --git a/test/dbushelper_mock.hpp b/test/dbushelper_mock.hpp
index 62e88f1..120c44d 100644
--- a/test/dbushelper_mock.hpp
+++ b/test/dbushelper_mock.hpp
@@ -3,6 +3,7 @@
 #include "util.hpp"
 
 #include <sdbusplus/bus.hpp>
+
 #include <string>
 
 #include <gmock/gmock.h>
diff --git a/test/helpers.hpp b/test/helpers.hpp
index b95200c..1ac21ca 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <sdbusplus/test/sdbus_mock.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/test/pid_zone_unittest.cpp b/test/pid_zone_unittest.cpp
index 121f44c..8593b97 100644
--- a/test/pid_zone_unittest.cpp
+++ b/test/pid_zone_unittest.cpp
@@ -5,9 +5,10 @@
 #include "test/helpers.hpp"
 #include "test/sensor_mock.hpp"
 
+#include <sdbusplus/test/sdbus_mock.hpp>
+
 #include <chrono>
 #include <cstring>
-#include <sdbusplus/test/sdbus_mock.hpp>
 #include <vector>
 
 #include <gmock/gmock.h>
diff --git a/test/sensor_host_unittest.cpp b/test/sensor_host_unittest.cpp
index 14c09f0..8bb9cc7 100644
--- a/test/sensor_host_unittest.cpp
+++ b/test/sensor_host_unittest.cpp
@@ -1,9 +1,10 @@
 #include "sensors/host.hpp"
 #include "test/helpers.hpp"
 
+#include <sdbusplus/test/sdbus_mock.hpp>
+
 #include <chrono>
 #include <memory>
-#include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 #include <vector>
 
diff --git a/test/sensor_mock.hpp b/test/sensor_mock.hpp
index 2cc8d28..b067c7c 100644
--- a/test/sensor_mock.hpp
+++ b/test/sensor_mock.hpp
@@ -11,8 +11,7 @@
     virtual ~SensorMock() = default;
 
     SensorMock(const std::string& name, int64_t timeout) : Sensor(name, timeout)
-    {
-    }
+    {}
 
     MOCK_METHOD0(read, ReadReturn());
     MOCK_METHOD1(write, void(double));
diff --git a/test/writeinterface_mock.hpp b/test/writeinterface_mock.hpp
index 6e5b350..d25e332 100644
--- a/test/writeinterface_mock.hpp
+++ b/test/writeinterface_mock.hpp
@@ -10,8 +10,7 @@
     virtual ~WriteInterfaceMock() = default;
 
     WriteInterfaceMock(int64_t min, int64_t max) : WriteInterface(min, max)
-    {
-    }
+    {}
 
     MOCK_METHOD1(write, void(double));
 };