diff --git a/.travis.yml b/.travis.yml
index ba250ec83b..b6739e1dd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,7 @@ script:
     - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
     - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
     - if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi
-    - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
+    - if [ "$RUN_TESTS" = "true" ]; then functional/pull-tester/rpc-tests.py --coverage; fi
 after_script:
     - echo $TRAVIS_COMMIT_RANGE
     - echo $TRAVIS_COMMIT_LOG
diff --git a/Makefile.am b/Makefile.am
index a8fa1d6c3a..0316d9254f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
 
 COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
   leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
-  baseline_filtered.info rpc_test.info rpc_test_filtered.info \
+  baseline_filtered.info functional_test.info functional_test_filtered.info \
   leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
 
 dist-hook:
@@ -194,20 +194,20 @@ test_bitcoin.info: baseline_filtered_combined.info
 test_bitcoin_filtered.info: test_bitcoin.info
 	$(LCOV) -r $< "/usr/include/*" -o $@
 
-rpc_test.info: test_bitcoin_filtered.info
+functional_test.info: test_bitcoin_filtered.info
 	-@TIMEOUT=15 python test/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS)
-	$(LCOV) -c -d $(abs_builddir)/src --t rpc-tests -o $@
+	$(LCOV) -c -d $(abs_builddir)/src --t functional-tests -o $@
 	$(LCOV) -z -d $(abs_builddir)/src
 	$(LCOV) -z -d $(abs_builddir)/src/leveldb
 
-rpc_test_filtered.info: rpc_test.info
+functional_test_filtered.info: functional_test.info
 	$(LCOV) -r $< "/usr/include/*" -o $@
 
 test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
 	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
 
-total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info rpc_test_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
+total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info functional_test_filtered.info
+	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 
 test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
 	$(GENHTML) -s $< -o $(@D)
@@ -223,7 +223,7 @@ endif
 
 dist_noinst_SCRIPTS = autogen.sh
 
-EXTRA_DIST = $(top_srcdir)/share/genbuild.sh test/pull-tester/rpc-tests.py test/rpc-tests $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh test/pull-tester/rpc-tests.py test/functional $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
 
 CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
 
diff --git a/README.md b/README.md
index 4de30e0df0..ccaf8d914e 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ submit new unit tests for old code. Unit tests can be compiled and run
 (assuming they weren't disabled in configure) with: `make check`. Further details on running
 and extending unit tests can be found in [/src/test/README.md](/src/test/README.md).
 
-There are also [regression and integration tests](/test) of the RPC interface, written
+There are also [regression and integration tests](/test), written
 in Python, that are run automatically on the build server.
 These tests can be run (if the [test dependencies](/test) are installed) with: `test/pull-tester/rpc-tests.py`
 
diff --git a/configure.ac b/configure.ac
index b32daf0a20..3671a406d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1147,8 +1147,7 @@ AC_SUBST(EVENT_PTHREADS_LIBS)
 AC_SUBST(ZMQ_LIBS)
 AC_SUBST(PROTOBUF_LIBS)
 AC_SUBST(QR_LIBS)
-AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
-AC_CONFIG_FILES([test/pull-tester/tests_config.ini],[chmod +x test/pull-tester/tests_config.ini])
+AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py test/pull-tester/tests_config.ini])
 AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
 AC_CONFIG_LINKS([test/pull-tester/rpc-tests.py:test/pull-tester/rpc-tests.py])
 
diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
index 1b70879348..6d801d3ac7 100755
--- a/contrib/devtools/copyright_header.py
+++ b/contrib/devtools/copyright_header.py
@@ -32,7 +32,7 @@ EXCLUDE = [
     'src/tinyformat.h',
     'src/leveldb/util/env_win.cc',
     'src/crypto/ctaes/bench.c',
-    'test/rpc-tests/test_framework/bignum.py',
+    'test/functional/test_framework/bignum.py',
     # python init:
     '*__init__.py',
 ]
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index ec608cfbde..797507cd3e 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -132,7 +132,7 @@ Run with the -testnet option to run with "play bitcoins" on the test network, if
 are testing multi-machine code that needs to operate across the internet.
 
 If you are testing something that can run on one machine, run with the -regtest option.
-In regression test mode, blocks can be created on-demand; see test/rpc-tests/ for tests
+In regression test mode, blocks can be created on-demand; see test/functional/ for tests
 that run in -regtest mode.
 
 **DEBUG_LOCKORDER**
@@ -252,7 +252,7 @@ Wallet
 
   - *Rationale*: In RPC code that conditionally uses the wallet (such as
     `validateaddress`) it is easy to forget that global pointer `pwalletMain`
-    can be NULL. See `test/rpc-tests/disablewallet.py` for functional tests
+    can be NULL. See `test/functional/disablewallet.py` for functional tests
     exercising the API with `-disablewallet`
 
 - Include `db_cxx.h` (BerkeleyDB header) only when `ENABLE_WALLET` is set
diff --git a/test/README.md b/test/README.md
index d71030df56..15ebf3204e 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,5 +1,5 @@
 The [pull-tester](/test/pull-tester/) folder contains a script to call
-multiple tests from the [rpc-tests](/test/rpc-tests/) folder.
+multiple tests from the [functional](/test/functional/) folder.
 
 Every pull request to the bitcoin repository is built and run through
 the regression test suite. You can also run all or only individual
@@ -83,5 +83,5 @@ killall bitcoind
 Writing tests
 =============
 You are encouraged to write tests for new or existing features.
-Further information about the test framework and individual RPC
-tests is found in [test/rpc-tests](/test/rpc-tests).
+Further information about the test framework and individual functional
+tests is found in [test/functional](/test/functional).
diff --git a/test/rpc-tests/.gitignore b/test/functional/.gitignore
similarity index 100%
rename from test/rpc-tests/.gitignore
rename to test/functional/.gitignore
diff --git a/test/rpc-tests/README.md b/test/functional/README.md
similarity index 100%
rename from test/rpc-tests/README.md
rename to test/functional/README.md
diff --git a/test/rpc-tests/abandonconflict.py b/test/functional/abandonconflict.py
similarity index 100%
rename from test/rpc-tests/abandonconflict.py
rename to test/functional/abandonconflict.py
diff --git a/test/rpc-tests/assumevalid.py b/test/functional/assumevalid.py
similarity index 100%
rename from test/rpc-tests/assumevalid.py
rename to test/functional/assumevalid.py
diff --git a/test/rpc-tests/bip65-cltv-p2p.py b/test/functional/bip65-cltv-p2p.py
similarity index 100%
rename from test/rpc-tests/bip65-cltv-p2p.py
rename to test/functional/bip65-cltv-p2p.py
diff --git a/test/rpc-tests/bip65-cltv.py b/test/functional/bip65-cltv.py
similarity index 100%
rename from test/rpc-tests/bip65-cltv.py
rename to test/functional/bip65-cltv.py
diff --git a/test/rpc-tests/bip68-112-113-p2p.py b/test/functional/bip68-112-113-p2p.py
similarity index 100%
rename from test/rpc-tests/bip68-112-113-p2p.py
rename to test/functional/bip68-112-113-p2p.py
diff --git a/test/rpc-tests/bip68-sequence.py b/test/functional/bip68-sequence.py
similarity index 100%
rename from test/rpc-tests/bip68-sequence.py
rename to test/functional/bip68-sequence.py
diff --git a/test/rpc-tests/bip9-softforks.py b/test/functional/bip9-softforks.py
similarity index 100%
rename from test/rpc-tests/bip9-softforks.py
rename to test/functional/bip9-softforks.py
diff --git a/test/rpc-tests/bipdersig-p2p.py b/test/functional/bipdersig-p2p.py
similarity index 100%
rename from test/rpc-tests/bipdersig-p2p.py
rename to test/functional/bipdersig-p2p.py
diff --git a/test/rpc-tests/bipdersig.py b/test/functional/bipdersig.py
similarity index 100%
rename from test/rpc-tests/bipdersig.py
rename to test/functional/bipdersig.py
diff --git a/test/rpc-tests/blockchain.py b/test/functional/blockchain.py
similarity index 100%
rename from test/rpc-tests/blockchain.py
rename to test/functional/blockchain.py
diff --git a/test/rpc-tests/bumpfee.py b/test/functional/bumpfee.py
similarity index 100%
rename from test/rpc-tests/bumpfee.py
rename to test/functional/bumpfee.py
diff --git a/test/rpc-tests/create_cache.py b/test/functional/create_cache.py
similarity index 89%
rename from test/rpc-tests/create_cache.py
rename to test/functional/create_cache.py
index 13eac92bbc..e4b6dbc2d1 100755
--- a/test/rpc-tests/create_cache.py
+++ b/test/functional/create_cache.py
@@ -5,7 +5,7 @@
 """Create a blockchain cache.
 
 Creating a cache of the blockchain speeds up test execution when running
-multiple qa tests. This helper script is executed by rpc-tests when multiple
+multiple functional tests. This helper script is executed by rpc-tests when multiple
 tests are being run in parallel.
 """
 
diff --git a/test/rpc-tests/decodescript.py b/test/functional/decodescript.py
similarity index 100%
rename from test/rpc-tests/decodescript.py
rename to test/functional/decodescript.py
diff --git a/test/rpc-tests/disablewallet.py b/test/functional/disablewallet.py
similarity index 100%
rename from test/rpc-tests/disablewallet.py
rename to test/functional/disablewallet.py
diff --git a/test/rpc-tests/forknotify.py b/test/functional/forknotify.py
similarity index 100%
rename from test/rpc-tests/forknotify.py
rename to test/functional/forknotify.py
diff --git a/test/rpc-tests/fundrawtransaction.py b/test/functional/fundrawtransaction.py
similarity index 100%
rename from test/rpc-tests/fundrawtransaction.py
rename to test/functional/fundrawtransaction.py
diff --git a/test/rpc-tests/getblocktemplate_longpoll.py b/test/functional/getblocktemplate_longpoll.py
similarity index 100%
rename from test/rpc-tests/getblocktemplate_longpoll.py
rename to test/functional/getblocktemplate_longpoll.py
diff --git a/test/rpc-tests/getblocktemplate_proposals.py b/test/functional/getblocktemplate_proposals.py
similarity index 100%
rename from test/rpc-tests/getblocktemplate_proposals.py
rename to test/functional/getblocktemplate_proposals.py
diff --git a/test/rpc-tests/getchaintips.py b/test/functional/getchaintips.py
similarity index 100%
rename from test/rpc-tests/getchaintips.py
rename to test/functional/getchaintips.py
diff --git a/test/rpc-tests/httpbasics.py b/test/functional/httpbasics.py
similarity index 100%
rename from test/rpc-tests/httpbasics.py
rename to test/functional/httpbasics.py
diff --git a/test/rpc-tests/import-rescan.py b/test/functional/import-rescan.py
similarity index 100%
rename from test/rpc-tests/import-rescan.py
rename to test/functional/import-rescan.py
diff --git a/test/rpc-tests/importmulti.py b/test/functional/importmulti.py
similarity index 100%
rename from test/rpc-tests/importmulti.py
rename to test/functional/importmulti.py
diff --git a/test/rpc-tests/importprunedfunds.py b/test/functional/importprunedfunds.py
similarity index 100%
rename from test/rpc-tests/importprunedfunds.py
rename to test/functional/importprunedfunds.py
diff --git a/test/rpc-tests/invalidateblock.py b/test/functional/invalidateblock.py
similarity index 100%
rename from test/rpc-tests/invalidateblock.py
rename to test/functional/invalidateblock.py
diff --git a/test/rpc-tests/invalidblockrequest.py b/test/functional/invalidblockrequest.py
similarity index 100%
rename from test/rpc-tests/invalidblockrequest.py
rename to test/functional/invalidblockrequest.py
diff --git a/test/rpc-tests/invalidtxrequest.py b/test/functional/invalidtxrequest.py
similarity index 100%
rename from test/rpc-tests/invalidtxrequest.py
rename to test/functional/invalidtxrequest.py
diff --git a/test/rpc-tests/keypool.py b/test/functional/keypool.py
similarity index 100%
rename from test/rpc-tests/keypool.py
rename to test/functional/keypool.py
diff --git a/test/rpc-tests/listsinceblock.py b/test/functional/listsinceblock.py
similarity index 100%
rename from test/rpc-tests/listsinceblock.py
rename to test/functional/listsinceblock.py
diff --git a/test/rpc-tests/listtransactions.py b/test/functional/listtransactions.py
similarity index 100%
rename from test/rpc-tests/listtransactions.py
rename to test/functional/listtransactions.py
diff --git a/test/rpc-tests/maxblocksinflight.py b/test/functional/maxblocksinflight.py
similarity index 100%
rename from test/rpc-tests/maxblocksinflight.py
rename to test/functional/maxblocksinflight.py
diff --git a/test/rpc-tests/maxuploadtarget.py b/test/functional/maxuploadtarget.py
similarity index 100%
rename from test/rpc-tests/maxuploadtarget.py
rename to test/functional/maxuploadtarget.py
diff --git a/test/rpc-tests/mempool_limit.py b/test/functional/mempool_limit.py
similarity index 100%
rename from test/rpc-tests/mempool_limit.py
rename to test/functional/mempool_limit.py
diff --git a/test/rpc-tests/mempool_packages.py b/test/functional/mempool_packages.py
similarity index 100%
rename from test/rpc-tests/mempool_packages.py
rename to test/functional/mempool_packages.py
diff --git a/test/rpc-tests/mempool_reorg.py b/test/functional/mempool_reorg.py
similarity index 100%
rename from test/rpc-tests/mempool_reorg.py
rename to test/functional/mempool_reorg.py
diff --git a/test/rpc-tests/mempool_resurrect_test.py b/test/functional/mempool_resurrect_test.py
similarity index 100%
rename from test/rpc-tests/mempool_resurrect_test.py
rename to test/functional/mempool_resurrect_test.py
diff --git a/test/rpc-tests/mempool_spendcoinbase.py b/test/functional/mempool_spendcoinbase.py
similarity index 100%
rename from test/rpc-tests/mempool_spendcoinbase.py
rename to test/functional/mempool_spendcoinbase.py
diff --git a/test/rpc-tests/merkle_blocks.py b/test/functional/merkle_blocks.py
similarity index 100%
rename from test/rpc-tests/merkle_blocks.py
rename to test/functional/merkle_blocks.py
diff --git a/test/rpc-tests/multi_rpc.py b/test/functional/multi_rpc.py
similarity index 100%
rename from test/rpc-tests/multi_rpc.py
rename to test/functional/multi_rpc.py
diff --git a/test/rpc-tests/nodehandling.py b/test/functional/nodehandling.py
similarity index 100%
rename from test/rpc-tests/nodehandling.py
rename to test/functional/nodehandling.py
diff --git a/test/rpc-tests/nulldummy.py b/test/functional/nulldummy.py
similarity index 100%
rename from test/rpc-tests/nulldummy.py
rename to test/functional/nulldummy.py
diff --git a/test/rpc-tests/p2p-acceptblock.py b/test/functional/p2p-acceptblock.py
similarity index 100%
rename from test/rpc-tests/p2p-acceptblock.py
rename to test/functional/p2p-acceptblock.py
diff --git a/test/rpc-tests/p2p-compactblocks.py b/test/functional/p2p-compactblocks.py
similarity index 100%
rename from test/rpc-tests/p2p-compactblocks.py
rename to test/functional/p2p-compactblocks.py
diff --git a/test/rpc-tests/p2p-feefilter.py b/test/functional/p2p-feefilter.py
similarity index 100%
rename from test/rpc-tests/p2p-feefilter.py
rename to test/functional/p2p-feefilter.py
diff --git a/test/rpc-tests/p2p-fullblocktest.py b/test/functional/p2p-fullblocktest.py
similarity index 100%
rename from test/rpc-tests/p2p-fullblocktest.py
rename to test/functional/p2p-fullblocktest.py
diff --git a/test/rpc-tests/p2p-leaktests.py b/test/functional/p2p-leaktests.py
similarity index 100%
rename from test/rpc-tests/p2p-leaktests.py
rename to test/functional/p2p-leaktests.py
diff --git a/test/rpc-tests/p2p-mempool.py b/test/functional/p2p-mempool.py
similarity index 100%
rename from test/rpc-tests/p2p-mempool.py
rename to test/functional/p2p-mempool.py
diff --git a/test/rpc-tests/p2p-segwit.py b/test/functional/p2p-segwit.py
similarity index 100%
rename from test/rpc-tests/p2p-segwit.py
rename to test/functional/p2p-segwit.py
diff --git a/test/rpc-tests/p2p-timeouts.py b/test/functional/p2p-timeouts.py
similarity index 100%
rename from test/rpc-tests/p2p-timeouts.py
rename to test/functional/p2p-timeouts.py
diff --git a/test/rpc-tests/p2p-versionbits-warning.py b/test/functional/p2p-versionbits-warning.py
similarity index 100%
rename from test/rpc-tests/p2p-versionbits-warning.py
rename to test/functional/p2p-versionbits-warning.py
diff --git a/test/rpc-tests/preciousblock.py b/test/functional/preciousblock.py
similarity index 100%
rename from test/rpc-tests/preciousblock.py
rename to test/functional/preciousblock.py
diff --git a/test/rpc-tests/prioritise_transaction.py b/test/functional/prioritise_transaction.py
similarity index 100%
rename from test/rpc-tests/prioritise_transaction.py
rename to test/functional/prioritise_transaction.py
diff --git a/test/rpc-tests/proxy_test.py b/test/functional/proxy_test.py
similarity index 100%
rename from test/rpc-tests/proxy_test.py
rename to test/functional/proxy_test.py
diff --git a/test/rpc-tests/pruning.py b/test/functional/pruning.py
similarity index 100%
rename from test/rpc-tests/pruning.py
rename to test/functional/pruning.py
diff --git a/test/rpc-tests/rawtransactions.py b/test/functional/rawtransactions.py
similarity index 100%
rename from test/rpc-tests/rawtransactions.py
rename to test/functional/rawtransactions.py
diff --git a/test/rpc-tests/receivedby.py b/test/functional/receivedby.py
similarity index 100%
rename from test/rpc-tests/receivedby.py
rename to test/functional/receivedby.py
diff --git a/test/rpc-tests/reindex.py b/test/functional/reindex.py
similarity index 100%
rename from test/rpc-tests/reindex.py
rename to test/functional/reindex.py
diff --git a/test/rpc-tests/replace-by-fee.py b/test/functional/replace-by-fee.py
similarity index 100%
rename from test/rpc-tests/replace-by-fee.py
rename to test/functional/replace-by-fee.py
diff --git a/test/rpc-tests/rest.py b/test/functional/rest.py
similarity index 100%
rename from test/rpc-tests/rest.py
rename to test/functional/rest.py
diff --git a/test/rpc-tests/rpcbind_test.py b/test/functional/rpcbind_test.py
similarity index 100%
rename from test/rpc-tests/rpcbind_test.py
rename to test/functional/rpcbind_test.py
diff --git a/test/rpc-tests/rpcnamedargs.py b/test/functional/rpcnamedargs.py
similarity index 100%
rename from test/rpc-tests/rpcnamedargs.py
rename to test/functional/rpcnamedargs.py
diff --git a/test/rpc-tests/segwit.py b/test/functional/segwit.py
similarity index 100%
rename from test/rpc-tests/segwit.py
rename to test/functional/segwit.py
diff --git a/test/rpc-tests/sendheaders.py b/test/functional/sendheaders.py
similarity index 100%
rename from test/rpc-tests/sendheaders.py
rename to test/functional/sendheaders.py
diff --git a/test/rpc-tests/signmessages.py b/test/functional/signmessages.py
similarity index 100%
rename from test/rpc-tests/signmessages.py
rename to test/functional/signmessages.py
diff --git a/test/rpc-tests/signrawtransactions.py b/test/functional/signrawtransactions.py
similarity index 100%
rename from test/rpc-tests/signrawtransactions.py
rename to test/functional/signrawtransactions.py
diff --git a/test/rpc-tests/smartfees.py b/test/functional/smartfees.py
similarity index 100%
rename from test/rpc-tests/smartfees.py
rename to test/functional/smartfees.py
diff --git a/test/rpc-tests/test_framework/__init__.py b/test/functional/test_framework/__init__.py
similarity index 100%
rename from test/rpc-tests/test_framework/__init__.py
rename to test/functional/test_framework/__init__.py
diff --git a/test/rpc-tests/test_framework/address.py b/test/functional/test_framework/address.py
similarity index 100%
rename from test/rpc-tests/test_framework/address.py
rename to test/functional/test_framework/address.py
diff --git a/test/rpc-tests/test_framework/authproxy.py b/test/functional/test_framework/authproxy.py
similarity index 100%
rename from test/rpc-tests/test_framework/authproxy.py
rename to test/functional/test_framework/authproxy.py
diff --git a/test/rpc-tests/test_framework/bignum.py b/test/functional/test_framework/bignum.py
similarity index 100%
rename from test/rpc-tests/test_framework/bignum.py
rename to test/functional/test_framework/bignum.py
diff --git a/test/rpc-tests/test_framework/blockstore.py b/test/functional/test_framework/blockstore.py
similarity index 100%
rename from test/rpc-tests/test_framework/blockstore.py
rename to test/functional/test_framework/blockstore.py
diff --git a/test/rpc-tests/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
similarity index 100%
rename from test/rpc-tests/test_framework/blocktools.py
rename to test/functional/test_framework/blocktools.py
diff --git a/test/rpc-tests/test_framework/comptool.py b/test/functional/test_framework/comptool.py
similarity index 100%
rename from test/rpc-tests/test_framework/comptool.py
rename to test/functional/test_framework/comptool.py
diff --git a/test/rpc-tests/test_framework/coverage.py b/test/functional/test_framework/coverage.py
similarity index 100%
rename from test/rpc-tests/test_framework/coverage.py
rename to test/functional/test_framework/coverage.py
diff --git a/test/rpc-tests/test_framework/key.py b/test/functional/test_framework/key.py
similarity index 100%
rename from test/rpc-tests/test_framework/key.py
rename to test/functional/test_framework/key.py
diff --git a/test/rpc-tests/test_framework/mininode.py b/test/functional/test_framework/mininode.py
similarity index 100%
rename from test/rpc-tests/test_framework/mininode.py
rename to test/functional/test_framework/mininode.py
diff --git a/test/rpc-tests/test_framework/netutil.py b/test/functional/test_framework/netutil.py
similarity index 100%
rename from test/rpc-tests/test_framework/netutil.py
rename to test/functional/test_framework/netutil.py
diff --git a/test/rpc-tests/test_framework/script.py b/test/functional/test_framework/script.py
similarity index 100%
rename from test/rpc-tests/test_framework/script.py
rename to test/functional/test_framework/script.py
diff --git a/test/rpc-tests/test_framework/siphash.py b/test/functional/test_framework/siphash.py
similarity index 100%
rename from test/rpc-tests/test_framework/siphash.py
rename to test/functional/test_framework/siphash.py
diff --git a/test/rpc-tests/test_framework/socks5.py b/test/functional/test_framework/socks5.py
similarity index 100%
rename from test/rpc-tests/test_framework/socks5.py
rename to test/functional/test_framework/socks5.py
diff --git a/test/rpc-tests/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
similarity index 100%
rename from test/rpc-tests/test_framework/test_framework.py
rename to test/functional/test_framework/test_framework.py
diff --git a/test/rpc-tests/test_framework/util.py b/test/functional/test_framework/util.py
similarity index 100%
rename from test/rpc-tests/test_framework/util.py
rename to test/functional/test_framework/util.py
diff --git a/test/rpc-tests/txn_clone.py b/test/functional/txn_clone.py
similarity index 100%
rename from test/rpc-tests/txn_clone.py
rename to test/functional/txn_clone.py
diff --git a/test/rpc-tests/txn_doublespend.py b/test/functional/txn_doublespend.py
similarity index 100%
rename from test/rpc-tests/txn_doublespend.py
rename to test/functional/txn_doublespend.py
diff --git a/test/rpc-tests/wallet-accounts.py b/test/functional/wallet-accounts.py
similarity index 100%
rename from test/rpc-tests/wallet-accounts.py
rename to test/functional/wallet-accounts.py
diff --git a/test/rpc-tests/wallet-dump.py b/test/functional/wallet-dump.py
similarity index 100%
rename from test/rpc-tests/wallet-dump.py
rename to test/functional/wallet-dump.py
diff --git a/test/rpc-tests/wallet-hd.py b/test/functional/wallet-hd.py
similarity index 100%
rename from test/rpc-tests/wallet-hd.py
rename to test/functional/wallet-hd.py
diff --git a/test/rpc-tests/wallet.py b/test/functional/wallet.py
similarity index 100%
rename from test/rpc-tests/wallet.py
rename to test/functional/wallet.py
diff --git a/test/rpc-tests/walletbackup.py b/test/functional/walletbackup.py
similarity index 100%
rename from test/rpc-tests/walletbackup.py
rename to test/functional/walletbackup.py
diff --git a/test/rpc-tests/zapwallettxes.py b/test/functional/zapwallettxes.py
similarity index 100%
rename from test/rpc-tests/zapwallettxes.py
rename to test/functional/zapwallettxes.py
diff --git a/test/rpc-tests/zmq_test.py b/test/functional/zmq_test.py
similarity index 100%
rename from test/rpc-tests/zmq_test.py
rename to test/functional/zmq_test.py
diff --git a/test/pull-tester/rpc-tests.py b/test/pull-tester/rpc-tests.py
index 925e19f09a..78a754a28d 100755
--- a/test/pull-tester/rpc-tests.py
+++ b/test/pull-tester/rpc-tests.py
@@ -8,7 +8,7 @@ rpc-tests.py - run regression test suite
 This module calls down into individual test cases via subprocess. It will
 forward all unrecognized arguments onto the individual test scripts.
 
-RPC tests are disabled on Windows by default. Use --force to run them anyway.
+Functional tests are disabled on Windows by default. Use --force to run them anyway.
 
 For a description of arguments recognized by test scripts, see
 `test/pull-tester/test_framework/test_framework.py:BitcoinTestFramework.main`.
@@ -161,7 +161,7 @@ def main():
         sys.exit(0)
 
     if not (enable_wallet and enable_utils and enable_bitcoind):
-        print("No rpc tests to run. Wallet, utils, and bitcoind must all be enabled")
+        print("No functional tests to run. Wallet, utils, and bitcoind must all be enabled")
         print("Rerun `configure` with -enable-wallet, -with-utils and -with-daemon and rerun make")
         sys.exit(0)
 
@@ -206,7 +206,7 @@ def main():
     if args.help:
         # Print help for rpc-tests.py, then print help of the first script and exit.
         parser.print_help()
-        subprocess.check_call((config["environment"]["SRCDIR"] + '/test/rpc-tests/' + test_list[0]).split() + ['-h'])
+        subprocess.check_call((config["environment"]["SRCDIR"] + '/test/functional/' + test_list[0]).split() + ['-h'])
         sys.exit(0)
 
     run_tests(test_list, config["environment"]["SRCDIR"], config["environment"]["BUILDDIR"], config["environment"]["EXEEXT"], args.jobs, args.coverage, passon_args)
@@ -222,7 +222,7 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal
     if "BITCOIND" not in os.environ:
         os.environ["BITCOIND"] = build_dir + '/src/bitcoind' + exeext
 
-    tests_dir = src_dir + '/test/rpc-tests/'
+    tests_dir = src_dir + '/test/functional/'
 
     flags = ["--srcdir={}/src".format(build_dir)] + args
     flags.append("--cachedir=%s/test/cache" % build_dir)
@@ -243,7 +243,7 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal
     time_sum = 0
     time0 = time.time()
 
-    job_queue = RPCTestHandler(jobs, tests_dir, test_list, flags)
+    job_queue = TestHandler(jobs, tests_dir, test_list, flags)
 
     max_len_name = len(max(test_list, key=len))
     results = BOLD[1] + "%s | %s | %s\n\n" % ("TEST".ljust(max_len_name), "PASSED", "DURATION") + BOLD[0]
@@ -271,7 +271,7 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal
 
     sys.exit(not all_passed)
 
-class RPCTestHandler:
+class TestHandler:
     """
     Trigger the testscrips passed in via the list.
     """
@@ -335,7 +335,7 @@ class RPCCoverage(object):
     After all tests complete, the commands run are combined and diff'd against
     the complete list to calculate uncovered RPC commands.
 
-    See also: test/rpc-tests/test_framework/coverage.py
+    See also: test/functional/test_framework/coverage.py
 
     """
     def __init__(self):
@@ -363,7 +363,7 @@ class RPCCoverage(object):
         Return a set of currently untested RPC commands.
 
         """
-        # This is shared from `test/rpc-tests/test-framework/coverage.py`
+        # This is shared from `test/functional/test-framework/coverage.py`
         reference_filename = 'rpc_interface.txt'
         coverage_file_prefix = 'coverage.'