diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 329cb9538..334f19077 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -94,6 +94,7 @@ BITCOIN_TESTS =\
   test/streams_tests.cpp \
   test/test_dash.cpp \
   test/test_dash.h \
+  test/test_random.h \
   test/testutil.cpp \
   test/testutil.h \
   test/timedata_tests.cpp \
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 81b070e1d..72c93350a 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -3,12 +3,12 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "coins.h"
-#include "test_random.h"
 #include "script/standard.h"
 #include "uint256.h"
 #include "undo.h"
 #include "utilstrencodings.h"
 #include "test/test_dash.h"
+#include "test/test_random.h"
 #include "validation.h"
 #include "consensus/validation.h"
 
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index ef29ed04b..36d573814 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -9,9 +9,9 @@
 #include "crypto/sha512.h"
 #include "crypto/hmac_sha256.h"
 #include "crypto/hmac_sha512.h"
-#include "test_random.h"
 #include "utilstrencodings.h"
 #include "test/test_dash.h"
+#include "test/test_random.h"
 
 #include <vector>
 
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
index 11a45f292..5eec20b7e 100644
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -4,7 +4,7 @@
 
 #include "consensus/merkle.h"
 #include "test/test_dash.h"
-#include "test_random.h"
+#include "test/test_random.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
index 94c3e0c8f..5465e27b7 100644
--- a/src/test/pmt_tests.cpp
+++ b/src/test/pmt_tests.cpp
@@ -9,8 +9,8 @@
 #include "uint256.h"
 #include "arith_uint256.h"
 #include "version.h"
-#include "test_random.h"
 #include "test/test_dash.h"
+#include "test/test_random.h"
 
 #include <vector>
 
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index 135251fee..a916619fd 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -4,12 +4,12 @@
 
 #include <vector>
 #include "prevector.h"
-#include "test_random.h"
 
 #include "serialize.h"
 #include "streams.h"
 
 #include "test/test_dash.h"
+#include "test/test_random.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index abfa3dca6..703d13ffb 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -6,12 +6,12 @@
 #include "data/sighash.json.h"
 #include "hash.h"
 #include "validation.h" // For CheckTransaction
-#include "test_random.h"
 #include "script/interpreter.h"
 #include "script/script.h"
 #include "serialize.h"
 #include "streams.h"
 #include "test/test_dash.h"
+#include "test/test_random.h"
 #include "util.h"
 #include "utilstrencodings.h"
 #include "version.h"
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
index 8e9fde456..4692e5d6a 100644
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -3,9 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chain.h"
-#include "test_random.h"
 #include "util.h"
 #include "test/test_dash.h"
+#include "test/test_random.h"
 
 #include <vector>
 
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 0050827e7..15135b7be 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -6,11 +6,11 @@
 
 #include "clientversion.h"
 #include "primitives/transaction.h"
-#include "test_random.h"
 #include "sync.h"
 #include "utilstrencodings.h"
 #include "utilmoneystr.h"
 #include "test/test_dash.h"
+#include "test/test_random.h"
 
 #include <stdint.h>
 #include <vector>
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp
index c35d7e85f..c38501dae 100644
--- a/src/test/versionbits_tests.cpp
+++ b/src/test/versionbits_tests.cpp
@@ -3,9 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "chain.h"
-#include "test_random.h"
 #include "versionbits.h"
 #include "test/test_dash.h"
+#include "test/test_random.h"
 #include "chainparams.h"
 #include "validation.h"
 #include "consensus/params.h"