diff --git a/test/message/append.cpp b/test/message/append.cpp
index 58775b8..6485d99 100644
--- a/test/message/append.cpp
+++ b/test/message/append.cpp
@@ -1,16 +1,18 @@
+#include <systemd/sd-bus-protocol.h>
+
 #include <array>
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
 #include <map>
 #include <sdbusplus/message.hpp>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <set>
 #include <string>
-#include <systemd/sd-bus-protocol.h>
 #include <tuple>
 #include <unordered_map>
 #include <vector>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 namespace
 {
 
diff --git a/test/message/native_types.cpp b/test/message/native_types.cpp
index eed7669..29dad22 100644
--- a/test/message/native_types.cpp
+++ b/test/message/native_types.cpp
@@ -1,8 +1,9 @@
-#include <gtest/gtest.h>
-#include <sdbusplus/message.hpp>
-#include <vector>
 #include <map>
+#include <sdbusplus/message.hpp>
 #include <unordered_map>
+#include <vector>
+
+#include <gtest/gtest.h>
 
 /* Suite tests that object_path and signature can be cleanly converted to
  * and from strings and used as container parameters.
diff --git a/test/message/read.cpp b/test/message/read.cpp
index 168865a..07bc984 100644
--- a/test/message/read.cpp
+++ b/test/message/read.cpp
@@ -1,17 +1,19 @@
+#include <systemd/sd-bus-protocol.h>
+
 #include <cerrno>
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
 #include <map>
 #include <sdbusplus/exception.hpp>
 #include <sdbusplus/message.hpp>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <set>
 #include <string>
-#include <systemd/sd-bus-protocol.h>
 #include <tuple>
 #include <unordered_map>
 #include <vector>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 namespace
 {
 
diff --git a/test/message/types.cpp b/test/message/types.cpp
index e779c79..a6df2f4 100644
--- a/test/message/types.cpp
+++ b/test/message/types.cpp
@@ -1,7 +1,8 @@
-#include <gtest/gtest.h>
 #include <sdbusplus/message/types.hpp>
 #include <sdbusplus/utility/tuple_to_array.hpp>
 
+#include <gtest/gtest.h>
+
 template <typename... Args> auto dbus_string(Args&&... args)
 {
     return std::string(sdbusplus::utility::tuple_to_array(