diff --git a/test/message/append.cpp b/test/message/append.cpp
index edae342..c6eb152 100644
--- a/test/message/append.cpp
+++ b/test/message/append.cpp
@@ -1,9 +1,10 @@
 #include <systemd/sd-bus-protocol.h>
 
-#include <array>
-#include <map>
 #include <sdbusplus/message.hpp>
 #include <sdbusplus/test/sdbus_mock.hpp>
+
+#include <array>
+#include <map>
 #include <set>
 #include <string>
 #include <tuple>
diff --git a/test/message/native_types.cpp b/test/message/native_types.cpp
index 3c9d20a..bcee315 100644
--- a/test/message/native_types.cpp
+++ b/test/message/native_types.cpp
@@ -1,5 +1,6 @@
-#include <map>
 #include <sdbusplus/message.hpp>
+
+#include <map>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/test/message/read.cpp b/test/message/read.cpp
index b973ba4..1d99940 100644
--- a/test/message/read.cpp
+++ b/test/message/read.cpp
@@ -1,10 +1,11 @@
 #include <systemd/sd-bus-protocol.h>
 
-#include <cerrno>
-#include <map>
 #include <sdbusplus/exception.hpp>
 #include <sdbusplus/message.hpp>
 #include <sdbusplus/test/sdbus_mock.hpp>
+
+#include <cerrno>
+#include <map>
 #include <set>
 #include <string>
 #include <tuple>