diff --git a/test/functional/abandonconflict.py b/test/functional/wallet_abandonconflict.py
rename from test/functional/abandonconflict.py
rename to test/functional/wallet_abandonconflict.py
diff --git a/test/functional/walletbackup.py b/test/functional/wallet_backup.py
rename from test/functional/walletbackup.py
rename to test/functional/wallet_backup.py
diff --git a/test/functional/wallet.py b/test/functional/wallet_basic.py
rename from test/functional/wallet.py
rename to test/functional/wallet_basic.py
diff --git a/test/functional/disablewallet.py b/test/functional/wallet_disable.py
rename from test/functional/disablewallet.py
rename to test/functional/wallet_disable.py
diff --git a/test/functional/import-rescan.py b/test/functional/wallet_import_rescan.py
rename from test/functional/import-rescan.py
rename to test/functional/wallet_import_rescan.py
diff --git a/test/functional/importmulti.py b/test/functional/wallet_importmulti.py
rename from test/functional/importmulti.py
rename to test/functional/wallet_importmulti.py
diff --git a/test/functional/importprunedfunds.py b/test/functional/wallet_importprunedfunds.py
rename from test/functional/importprunedfunds.py
rename to test/functional/wallet_importprunedfunds.py
diff --git a/test/functional/keypool.py b/test/functional/wallet_keypool.py
rename from test/functional/keypool.py
rename to test/functional/wallet_keypool.py
diff --git a/test/functional/keypool-topup.py b/test/functional/wallet_keypool_topup.py
rename from test/functional/keypool-topup.py
rename to test/functional/wallet_keypool_topup.py
diff --git a/test/functional/wallet_receivedby.py b/test/functional/wallet_listreceivedby.py
rename from test/functional/wallet_receivedby.py
rename to test/functional/wallet_listreceivedby.py
diff --git a/test/functional/listsinceblock.py b/test/functional/wallet_listsinceblock.py
rename from test/functional/listsinceblock.py
rename to test/functional/wallet_listsinceblock.py
diff --git a/test/functional/multiwallet.py b/test/functional/wallet_multiwallet.py
rename from test/functional/multiwallet.py
rename to test/functional/wallet_multiwallet.py
diff --git a/test/functional/resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py
rename from test/functional/resendwallettransactions.py
rename to test/functional/wallet_resendwallettransactions.py
diff --git a/test/functional/txn_clone.py b/test/functional/wallet_txn_clone.py
rename from test/functional/txn_clone.py
rename to test/functional/wallet_txn_clone.py
diff --git a/test/functional/txn_doublespend.py b/test/functional/wallet_txn_doublespend.py
rename from test/functional/txn_doublespend.py
rename to test/functional/wallet_txn_doublespend.py
diff --git a/test/functional/zapwallettxes.py b/test/functional/wallet_zapwallettxes.py
rename from test/functional/zapwallettxes.py
rename to test/functional/wallet_zapwallettxes.py