diff --git a/src/qt/test/bitcoinaddressvalidatortests.cpp b/src/qt/test/bitcoinaddressvalidatortests.cpp
--- a/src/qt/test/bitcoinaddressvalidatortests.cpp
+++ b/src/qt/test/bitcoinaddressvalidatortests.cpp
@@ -2,9 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/test/bitcoinaddressvalidatortests.h"
-#include "chainparams.h"
-#include "qt/bitcoinaddressvalidator.h"
+#include <qt/bitcoinaddressvalidator.h>
+#include <qt/test/bitcoinaddressvalidatortests.h>
+
+#include <chainparams.h>
+
 #include <QValidator>
 
 void BitcoinAddressValidatorTests::inputTests() {
diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp
--- a/src/qt/test/compattests.cpp
+++ b/src/qt/test/compattests.cpp
@@ -2,11 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "paymentrequestplus.h" // this includes protobuf's port.h which defines its own bswap macos
+#include <qt/test/compattests.h>
 
-#include "compattests.h"
-
-#include "compat/byteswap.h"
+#include <compat/byteswap.h>
+#include <qt/paymentrequestplus.h> // this includes protobuf's port.h which defines its own bswap macos
 
 void CompatTests::bswapTests() {
     // Sibling in bitcoin/src/test/bswap_tests.cpp
diff --git a/src/qt/test/guiutiltests.cpp b/src/qt/test/guiutiltests.cpp
--- a/src/qt/test/guiutiltests.cpp
+++ b/src/qt/test/guiutiltests.cpp
@@ -2,11 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "guiutiltests.h"
-#include "chainparams.h"
-#include "config.h"
-#include "dstencode.h"
-#include "guiutil.h"
+#include <qt/test/guiutiltests.h>
+
+#include <chainparams.h>
+#include <config.h>
+#include <dstencode.h>
+#include <qt/guiutil.h>
 
 namespace {
 
diff --git a/src/qt/test/paymentservertests.h b/src/qt/test/paymentservertests.h
--- a/src/qt/test/paymentservertests.h
+++ b/src/qt/test/paymentservertests.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_QT_TEST_PAYMENTSERVERTESTS_H
 #define BITCOIN_QT_TEST_PAYMENTSERVERTESTS_H
 
-#include "../paymentserver.h"
+#include <qt/paymentserver.h>
 
 #include <QObject>
 #include <QTest>
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp
--- a/src/qt/test/paymentservertests.cpp
+++ b/src/qt/test/paymentservertests.cpp
@@ -2,18 +2,18 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "paymentservertests.h"
-
-#include "optionsmodel.h"
-#include "paymentrequestdata.h"
-
-#include "amount.h"
-#include "interfaces/node.h"
-#include "random.h"
-#include "script/script.h"
-#include "script/standard.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include <qt/test/paymentservertests.h>
+
+#include <amount.h>
+#include <interfaces/node.h>
+#include <qt/optionsmodel.h>
+#include <random.h>
+#include <script/script.h>
+#include <script/standard.h>
+#include <util.h>
+#include <utilstrencodings.h>
+
+#include <qt/test/paymentrequestdata.h>
 
 #include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
diff --git a/src/qt/test/rpcnestedtests.h b/src/qt/test/rpcnestedtests.h
--- a/src/qt/test/rpcnestedtests.h
+++ b/src/qt/test/rpcnestedtests.h
@@ -5,12 +5,12 @@
 #ifndef BITCOIN_QT_TEST_RPC_NESTED_TESTS_H
 #define BITCOIN_QT_TEST_RPC_NESTED_TESTS_H
 
+#include <txdb.h>
+#include <txmempool.h>
+
 #include <QObject>
 #include <QTest>
 
-#include "txdb.h"
-#include "txmempool.h"
-
 class RPCNestedTests : public QObject {
     Q_OBJECT
 
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.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/rpcnestedtests.h>
+#include <qt/test/rpcnestedtests.h>
 
 #include <chainparams.h>
 #include <config.h>
@@ -12,14 +12,16 @@
 #include <qt/rpcconsole.h>
 #include <rpc/register.h>
 #include <rpc/server.h>
-#include <test/test_bitcoin.h>
-#include <univalue.h>
 #include <util.h>
 #include <validation.h>
 
+#include <test/test_bitcoin.h>
+
 #include <QDir>
 #include <QtGlobal>
 
+#include <univalue.h>
+
 static UniValue rpcNestedTest_rpc(const Config &config,
                                   const JSONRPCRequest &request) {
     if (request.fHelp) {
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -3,23 +3,22 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #if defined(HAVE_CONFIG_H)
-#include "config/bitcoin-config.h"
+#include <config/bitcoin-config.h>
 #endif
 
-#include "compat/setenv.h"
-
-#include "bitcoinaddressvalidatortests.h"
-#include "chainparams.h"
-#include "compattests.h"
-#include "guiutiltests.h"
-#include "key.h"
-#include "rpcnestedtests.h"
-#include "uritests.h"
-#include "util.h"
+#include <chainparams.h>
+#include <compat/setenv.h>
+#include <key.h>
+#include <util.h>
 
+#include <qt/test/bitcoinaddressvalidatortests.h>
+#include <qt/test/compattests.h>
+#include <qt/test/guiutiltests.h>
+#include <qt/test/rpcnestedtests.h>
+#include <qt/test/uritests.h>
 #ifdef ENABLE_WALLET
-#include "paymentservertests.h"
-#include "wallettests.h"
+#include <qt/test/paymentservertests.h>
+#include <qt/test/wallettests.h>
 #endif
 
 #include <QApplication>
diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp
--- a/src/qt/test/uritests.cpp
+++ b/src/qt/test/uritests.cpp
@@ -3,12 +3,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "uritests.h"
+#include <qt/test/uritests.h>
 
-#include "chainparams.h"
-#include "config.h"
-#include "guiutil.h"
-#include "walletmodel.h"
+#include <chainparams.h>
+#include <config.h>
+#include <qt/guiutil.h>
+#include <qt/walletmodel.h>
 
 #include <QUrl>
 
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -1,24 +1,25 @@
-#include "wallettests.h"
-
-#include "chainparams.h"
-#include "config.h"
-#include "dstencode.h"
-#include "interfaces/node.h"
-#include "qt/bitcoinamountfield.h"
-#include "qt/optionsmodel.h"
-#include "qt/overviewpage.h"
-#include "qt/platformstyle.h"
-#include "qt/qvalidatedlineedit.h"
-#include "qt/receivecoinsdialog.h"
-#include "qt/receiverequestdialog.h"
-#include "qt/recentrequeststablemodel.h"
-#include "qt/sendcoinsdialog.h"
-#include "qt/sendcoinsentry.h"
-#include "qt/transactiontablemodel.h"
-#include "qt/walletmodel.h"
-#include "test/test_bitcoin.h"
-#include "validation.h"
-#include "wallet/wallet.h"
+#include <qt/test/wallettests.h>
+
+#include <chainparams.h>
+#include <config.h>
+#include <dstencode.h>
+#include <interfaces/node.h>
+#include <qt/bitcoinamountfield.h>
+#include <qt/optionsmodel.h>
+#include <qt/overviewpage.h>
+#include <qt/platformstyle.h>
+#include <qt/qvalidatedlineedit.h>
+#include <qt/receivecoinsdialog.h>
+#include <qt/receiverequestdialog.h>
+#include <qt/recentrequeststablemodel.h>
+#include <qt/sendcoinsdialog.h>
+#include <qt/sendcoinsentry.h>
+#include <qt/transactiontablemodel.h>
+#include <qt/walletmodel.h>
+#include <validation.h>
+#include <wallet/wallet.h>
+
+#include <test/test_bitcoin.h>
 
 #include <QAbstractButton>
 #include <QApplication>