diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
--- a/src/test/scheduler_tests.cpp
+++ b/src/test/scheduler_tests.cpp
@@ -2,10 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "random.h"
-#include "scheduler.h"
+#include <scheduler.h>
 
-#include "test/test_bitcoin.h"
+#include <random.h>
+
+#include <test/test_bitcoin.h>
 
 #include <boost/bind.hpp>
 #include <boost/random/mersenne_twister.hpp>
diff --git a/src/test/schnorr_tests.cpp b/src/test/schnorr_tests.cpp
--- a/src/test/schnorr_tests.cpp
+++ b/src/test/schnorr_tests.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "test/lcg.h"
-#include "test/test_bitcoin.h"
+#include <script/interpreter.h>
 
-#include "script/interpreter.h"
+#include <test/lcg.h>
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -2,22 +2,23 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "consensus/tx_verify.h"
-#include "core_io.h"
-#include "key.h"
-#include "keystore.h"
-#include "policy/policy.h"
-#include "script/ismine.h"
-#include "script/script.h"
-#include "script/script_error.h"
-#include "script/sign.h"
-#include "test/test_bitcoin.h"
-#include "validation.h"
-
-#include <vector>
+#include <consensus/tx_verify.h>
+#include <core_io.h>
+#include <key.h>
+#include <keystore.h>
+#include <policy/policy.h>
+#include <script/ismine.h>
+#include <script/script.h>
+#include <script/script_error.h>
+#include <script/sign.h>
+#include <validation.h>
+
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
+#include <vector>
+
 // Helpers:
 static std::vector<uint8_t> Serialize(const CScript &s) {
     std::vector<uint8_t> sSerialized(s.begin(), s.end());
diff --git a/src/test/script_commitment_tests.cpp b/src/test/script_commitment_tests.cpp
--- a/src/test/script_commitment_tests.cpp
+++ b/src/test/script_commitment_tests.cpp
@@ -2,13 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "script/script.h"
-#include "test/test_bitcoin.h"
+#include <script/script.h>
 
-#include "chainparams.h"
-#include "config.h"
-#include "consensus/validation.h"
-#include "validation.h"
+#include <chainparams.h>
+#include <config.h>
+#include <consensus/validation.h>
+#include <validation.h>
+
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -3,36 +3,37 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "data/script_tests.json.h"
-
-#include "core_io.h"
-#include "key.h"
-#include "keystore.h"
-#include "rpc/server.h"
-#include "script/script.h"
-#include "script/script_error.h"
-#include "script/sighashtype.h"
-#include "script/sign.h"
-#include "test/jsonutil.h"
-#include "test/scriptflags.h"
-#include "test/sigutil.h"
-#include "test/test_bitcoin.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include <script/script.h>
+#include <script/script_error.h>
+#include <script/sighashtype.h>
+#include <script/sign.h>
+
+#include <core_io.h>
+#include <data/script_tests.json.h>
+#include <key.h>
+#include <keystore.h>
+#include <rpc/server.h>
+#include <util.h>
+#include <utilstrencodings.h>
 
 #if defined(HAVE_CONSENSUS_LIB)
-#include "script/bitcoinconsensus.h"
+#include <script/bitcoinconsensus.h>
 #endif
 
-#include <cstdint>
-#include <fstream>
-#include <string>
-#include <vector>
+#include <test/jsonutil.h>
+#include <test/scriptflags.h>
+#include <test/sigutil.h>
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
 #include <univalue.h>
 
+#include <cstdint>
+#include <fstream>
+#include <string>
+#include <vector>
+
 // Uncomment if you want to output updated JSON tests.
 // #define UPDATE_JSON_TESTS
 
diff --git a/src/test/scriptflags.cpp b/src/test/scriptflags.cpp
--- a/src/test/scriptflags.cpp
+++ b/src/test/scriptflags.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "test/scriptflags.h"
+#include <script/interpreter.h>
 
-#include "script/interpreter.h"
+#include <test/scriptflags.h>
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
--- a/src/test/scriptnum_tests.cpp
+++ b/src/test/scriptnum_tests.cpp
@@ -2,11 +2,13 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "script/script.h"
-#include "scriptnum10.h"
-#include "test/test_bitcoin.h"
+#include <script/script.h>
+
+#include <test/scriptnum10.h>
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
+
 #include <climits>
 #include <cstdint>
 
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -2,16 +2,18 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "hash.h"
-#include "serialize.h"
-#include "streams.h"
-#include "test/test_bitcoin.h"
+#include <serialize.h>
 
-#include <cstdint>
-#include <limits>
+#include <hash.h>
+#include <streams.h>
+
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
+#include <cstdint>
+#include <limits>
+
 BOOST_FIXTURE_TEST_SUITE(serialize_tests, BasicTestingSetup)
 
 class CSerializeMethodsTestSingle {
diff --git a/src/test/sigcache_tests.cpp b/src/test/sigcache_tests.cpp
--- a/src/test/sigcache_tests.cpp
+++ b/src/test/sigcache_tests.cpp
@@ -4,13 +4,14 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 // (based on key_tests.cpp)
 
-#include "script/sigcache.h"
+#include <script/sigcache.h>
 
-#include "base58.h"
-#include "dstencode.h"
-#include "key.h"
-#include "test/test_bitcoin.h"
-#include "utilstrencodings.h"
+#include <base58.h>
+#include <dstencode.h>
+#include <key.h>
+#include <utilstrencodings.h>
+
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sigencoding_tests.cpp b/src/test/sigencoding_tests.cpp
--- a/src/test/sigencoding_tests.cpp
+++ b/src/test/sigencoding_tests.cpp
@@ -2,12 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "test/test_bitcoin.h"
+#include <script/sigencoding.h>
 
-#include "script/script_flags.h"
-#include "script/sigencoding.h"
+#include <script/script_flags.h>
 
-#include "test/lcg.h"
+#include <test/lcg.h>
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -2,26 +2,27 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "consensus/tx_verify.h"
-#include "consensus/validation.h"
-#include "data/sighash.json.h"
-#include "hash.h"
-#include "script/interpreter.h"
-#include "script/script.h"
-#include "serialize.h"
-#include "streams.h"
-#include "test/jsonutil.h"
-#include "test/test_bitcoin.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "version.h"
-
-#include <iostream>
+#include <consensus/tx_verify.h>
+#include <consensus/validation.h>
+#include <data/sighash.json.h>
+#include <hash.h>
+#include <script/interpreter.h>
+#include <script/script.h>
+#include <serialize.h>
+#include <streams.h>
+#include <util.h>
+#include <utilstrencodings.h>
+#include <version.h>
+
+#include <test/jsonutil.h>
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
 #include <univalue.h>
 
+#include <iostream>
+
 // Old script.cpp SignatureHash function
 static uint256 SignatureHashOld(CScript scriptCode, const CTransaction &txTo,
                                 unsigned int nIn, uint32_t nHashType) {
diff --git a/src/test/sighashtype_tests.cpp b/src/test/sighashtype_tests.cpp
--- a/src/test/sighashtype_tests.cpp
+++ b/src/test/sighashtype_tests.cpp
@@ -2,8 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "script/sighashtype.h"
-#include "test/test_bitcoin.h"
+#include <script/sighashtype.h>
+
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -2,23 +2,24 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "consensus/consensus.h"
-#include "consensus/tx_verify.h"
-#include "consensus/validation.h"
-#include "key.h"
-#include "policy/policy.h" // For STANDARD_CHECKDATASIG_VERIFY_FLAGS.
-#include "pubkey.h"
-#include "script/interpreter.h"
-#include "script/script.h"
-#include "script/standard.h"
-#include "test/test_bitcoin.h"
-#include "uint256.h"
+#include <consensus/consensus.h>
+#include <consensus/tx_verify.h>
+#include <consensus/validation.h>
+#include <key.h>
+#include <policy/policy.h> // For STANDARD_CHECKDATASIG_VERIFY_FLAGS.
+#include <pubkey.h>
+#include <script/interpreter.h>
+#include <script/script.h>
+#include <script/standard.h>
+#include <uint256.h>
+
+#include <test/test_bitcoin.h>
+
+#include <boost/test/unit_test.hpp>
 
 #include <limits>
 #include <vector>
 
-#include <boost/test/unit_test.hpp>
-
 // Helpers:
 static std::vector<uint8_t> Serialize(const CScript &s) {
     std::vector<uint8_t> sSerialized(s.begin(), s.end());
diff --git a/src/test/sigutil.cpp b/src/test/sigutil.cpp
--- a/src/test/sigutil.cpp
+++ b/src/test/sigutil.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "test/sigutil.h"
+#include <test/sigutil.h>
 
 #include <cassert>
 
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -2,14 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "chain.h"
-#include "test/test_bitcoin.h"
-#include "util.h"
+#include <chain.h>
+#include <util.h>
 
-#include <vector>
+#include <test/test_bitcoin.h>
 
 #include <boost/test/unit_test.hpp>
 
+#include <vector>
+
 #define SKIPLIST_LENGTH 300000
 
 BOOST_FIXTURE_TEST_SUITE(skiplist_tests, BasicTestingSetup)