diff --git a/test/functional/rpcbind_test.py b/test/functional/rpc_bind.py
rename from test/functional/rpcbind_test.py
rename to test/functional/rpc_bind.py
diff --git a/test/functional/blockchain.py b/test/functional/rpc_blockchain.py
rename from test/functional/blockchain.py
rename to test/functional/rpc_blockchain.py
diff --git a/test/functional/decodescript.py b/test/functional/rpc_decodescript.py
rename from test/functional/decodescript.py
rename to test/functional/rpc_decodescript.py
diff --git a/test/functional/fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py
rename from test/functional/fundrawtransaction.py
rename to test/functional/rpc_fundrawtransaction.py
diff --git a/test/functional/getchaintips.py b/test/functional/rpc_getchaintips.py
rename from test/functional/getchaintips.py
rename to test/functional/rpc_getchaintips.py
diff --git a/test/functional/invalidateblock.py b/test/functional/rpc_invalidateblock.py
rename from test/functional/invalidateblock.py
rename to test/functional/rpc_invalidateblock.py
diff --git a/test/functional/listtransactions.py b/test/functional/rpc_listtransactions.py
rename from test/functional/listtransactions.py
rename to test/functional/rpc_listtransactions.py
diff --git a/test/functional/rpcnamedargs.py b/test/functional/rpc_named_arguments.py
rename from test/functional/rpcnamedargs.py
rename to test/functional/rpc_named_arguments.py
diff --git a/test/functional/net.py b/test/functional/rpc_net.py
rename from test/functional/net.py
rename to test/functional/rpc_net.py
diff --git a/test/functional/preciousblock.py b/test/functional/rpc_preciousblock.py
rename from test/functional/preciousblock.py
rename to test/functional/rpc_preciousblock.py
diff --git a/test/functional/rawtransactions.py b/test/functional/rpc_rawtransaction.py
rename from test/functional/rawtransactions.py
rename to test/functional/rpc_rawtransaction.py
diff --git a/test/functional/signmessages.py b/test/functional/rpc_signmessage.py
rename from test/functional/signmessages.py
rename to test/functional/rpc_signmessage.py
diff --git a/test/functional/signrawtransactions.py b/test/functional/rpc_signrawtransaction.py
rename from test/functional/signrawtransactions.py
rename to test/functional/rpc_signrawtransaction.py
diff --git a/test/functional/merkle_blocks.py b/test/functional/rpc_txoutproof.py
rename from test/functional/merkle_blocks.py
rename to test/functional/rpc_txoutproof.py
diff --git a/test/functional/uptime.py b/test/functional/rpc_uptime.py
rename from test/functional/uptime.py
rename to test/functional/rpc_uptime.py
diff --git a/test/functional/multi_rpc.py b/test/functional/rpc_users.py
rename from test/functional/multi_rpc.py
rename to test/functional/rpc_users.py