diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
index 0df752ef65d..6b2c527e529 100644
--- a/src/bench/checkqueue.cpp
+++ b/src/bench/checkqueue.cpp
@@ -3,11 +3,13 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <boost/thread/thread.hpp>
 #include <checkqueue.h>
 #include <prevector.h>
 #include <random.h>
 #include <util/system.h>
+
+#include <boost/thread/thread.hpp>
+
 #include <vector>
 
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index 0f5cadb04d7..bc6b38c6826 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -2,17 +2,18 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #include <addrman.h>
-#include <boost/test/unit_test.hpp>
-#include <string>
 #include <test/data/asmap.raw.h>
 #include <test/util/setup_common.h>
 #include <util/asmap.h>
 #include <util/string.h>
-
 #include <hash.h>
 #include <netbase.h>
 #include <random.h>
 
+#include <boost/test/unit_test.hpp>
+
+#include <string>
+
 class CAddrManTest : public CAddrMan
 {
 private:
diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp
index bd75debdd98..a135c93786f 100644
--- a/src/test/arith_uint256_tests.cpp
+++ b/src/test/arith_uint256_tests.cpp
@@ -3,15 +3,17 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <arith_uint256.h>
+#include <test/util/setup_common.h>
+#include <uint256.h>
+
 #include <boost/test/unit_test.hpp>
+
 #include <cmath>
 #include <iomanip>
 #include <limits>
 #include <sstream>
 #include <stdint.h>
 #include <string>
-#include <test/util/setup_common.h>
-#include <uint256.h>
 
 BOOST_FIXTURE_TEST_SUITE(arith_uint256_tests, BasicTestingSetup)
 
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index 868b908fb39..05659822156 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -2,22 +2,22 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <checkqueue.h>
+#include <test/util/setup_common.h>
 #include <util/memory.h>
 #include <util/system.h>
 #include <util/time.h>
 
-#include <atomic>
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
-#include <checkqueue.h>
+
+#include <atomic>
 #include <condition_variable>
 #include <mutex>
-#include <test/util/setup_common.h>
 #include <thread>
-#include <vector>
-
 #include <unordered_set>
 #include <utility>
+#include <vector>
 
 BOOST_FIXTURE_TEST_SUITE(checkqueue_tests, TestingSetup)
 
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
index bc961e386c6..121b80ab2d7 100644
--- a/src/test/descriptor_tests.cpp
+++ b/src/test/descriptor_tests.cpp
@@ -2,13 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <boost/test/unit_test.hpp>
 #include <script/descriptor.h>
 #include <script/sign.h>
 #include <script/standard.h>
-#include <string>
 #include <test/util/setup_common.h>
 #include <util/strencodings.h>
+
+#include <boost/test/unit_test.hpp>
+
+#include <string>
 #include <vector>
 
 namespace {
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index e1b84c1d09a..84bf5934971 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -4,20 +4,21 @@
 
 #include <addrdb.h>
 #include <addrman.h>
-#include <boost/test/unit_test.hpp>
 #include <chainparams.h>
 #include <clientversion.h>
 #include <net.h>
 #include <netbase.h>
 #include <serialize.h>
 #include <streams.h>
-#include <string>
 #include <test/util/setup_common.h>
 #include <util/memory.h>
 #include <util/string.h>
 #include <util/system.h>
 
+#include <boost/test/unit_test.hpp>
+
 #include <memory>
+#include <string>
 
 class CAddrManSerializationMock : public CAddrMan
 {
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
index 0881e8a3839..c0ae2f8cf2d 100644
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -9,6 +9,7 @@
 #include <version.h>
 
 #include <boost/test/unit_test.hpp>
+
 #include <iomanip>
 #include <sstream>
 #include <string>