diff --git a/test/functional/bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py
rename from test/functional/bitcoin_cli.py
rename to test/functional/interface_bitcoin_cli.py
diff --git a/test/functional/httpbasics.py b/test/functional/interface_http.py
rename from test/functional/httpbasics.py
rename to test/functional/interface_http.py
diff --git a/test/functional/rest.py b/test/functional/interface_rest.py
rename from test/functional/rest.py
rename to test/functional/interface_rest.py
diff --git a/test/functional/zmq_test.py b/test/functional/interface_zmq.py
rename from test/functional/zmq_test.py
rename to test/functional/interface_zmq.py
diff --git a/test/functional/mempool_resurrect_test.py b/test/functional/mempool_resurrect.py
rename from test/functional/mempool_resurrect_test.py
rename to test/functional/mempool_resurrect.py
diff --git a/test/functional/mempool_spendcoinbase.py b/test/functional/mempool_spend_coinbase.py
rename from test/functional/mempool_spendcoinbase.py
rename to test/functional/mempool_spend_coinbase.py
diff --git a/test/functional/mining.py b/test/functional/mining_basic.py
rename from test/functional/mining.py
rename to test/functional/mining_basic.py
diff --git a/test/functional/getblocktemplate_longpoll.py b/test/functional/mining_getblocktemplate_longpoll.py
rename from test/functional/getblocktemplate_longpoll.py
rename to test/functional/mining_getblocktemplate_longpoll.py
diff --git a/test/functional/prioritise_transaction.py b/test/functional/mining_prioritisetransaction.py
rename from test/functional/prioritise_transaction.py
rename to test/functional/mining_prioritisetransaction.py