diff --git a/test/functional/timing.json b/test/functional/timing.json
--- a/test/functional/timing.json
+++ b/test/functional/timing.json
@@ -1,7 +1,7 @@
 [
  {
   "name": "abandonconflict.py",
-  "time": 13
+  "time": 12
  },
  {
   "name": "abc-checkdatasig-activation.py",
@@ -9,35 +9,27 @@
  },
  {
   "name": "abc-cmdline.py",
-  "time": 9
+  "time": 8
  },
  {
   "name": "abc-high_priority_transaction.py",
-  "time": 12
+  "time": 7
  },
  {
   "name": "abc-magnetic-anomaly-activation.py",
-  "time": 7
+  "time": 6
  },
  {
   "name": "abc-mempool-accept-txn.py",
   "time": 4
  },
- {
-  "name": "abc-p2p-compactblocks.py",
-  "time": 167
- },
- {
-  "name": "abc-p2p-fullblocktest.py",
-  "time": 50
- },
  {
   "name": "abc-parkedchain.py",
-  "time": 3
+  "time": 2
  },
  {
   "name": "abc-replay-protection.py",
-  "time": 5
+  "time": 4
  },
  {
   "name": "abc-rpc.py",
@@ -45,47 +37,43 @@
  },
  {
   "name": "abc-transaction-ordering.py",
-  "time": 15
+  "time": 6
  },
  {
   "name": "assumevalid.py",
-  "time": 13
+  "time": 12
  },
  {
   "name": "bip65-cltv-p2p.py",
-  "time": 19
+  "time": 5
  },
  {
   "name": "bip68-112-113-p2p.py",
-  "time": 34
+  "time": 23
  },
  {
   "name": "bip68-sequence.py",
-  "time": 26
+  "time": 20
  },
  {
   "name": "bipdersig-p2p.py",
-  "time": 5
+  "time": 6
  },
  {
   "name": "bitcoin_cli.py",
-  "time": 13
+  "time": 3
  },
  {
   "name": "blockchain.py",
   "time": 10
  },
- {
-  "name": "dbcrash.py",
-  "time": 1257
- },
  {
   "name": "decodescript.py",
   "time": 2
  },
  {
   "name": "deprecated_rpc.py",
-  "time": 18
+  "time": 2
  },
  {
   "name": "disablewallet.py",
@@ -93,23 +81,15 @@
  },
  {
   "name": "disconnect_ban.py",
-  "time": 9
+  "time": 7
  },
  {
   "name": "example_test.py",
-  "time": 5
- },
- {
-  "name": "fundrawtransaction.py",
-  "time": 50
- },
- {
-  "name": "getblocktemplate_longpoll.py",
-  "time": 68
+  "time": 3
  },
  {
   "name": "getchaintips.py",
-  "time": 5
+  "time": 4
  },
  {
   "name": "httpbasics.py",
@@ -117,35 +97,31 @@
  },
  {
   "name": "import-rescan.py",
-  "time": 16
+  "time": 8
  },
  {
   "name": "importmulti.py",
-  "time": 24
+  "time": 6
  },
  {
   "name": "importprunedfunds.py",
-  "time": 8
+  "time": 3
  },
  {
   "name": "invalidateblock.py",
-  "time": 10
+  "time": 8
  },
  {
   "name": "invalidblockrequest.py",
-  "time": 14
+  "time": 4
  },
  {
   "name": "invalidtxrequest.py",
-  "time": 5
- },
- {
-  "name": "keypool-topup.py",
-  "time": 45
+  "time": 3
  },
  {
   "name": "keypool.py",
-  "time": 9
+  "time": 7
  },
  {
   "name": "listsinceblock.py",
@@ -153,35 +129,31 @@
  },
  {
   "name": "listtransactions.py",
-  "time": 10
- },
- {
-  "name": "maxuploadtarget.py",
-  "time": 49
+  "time": 5
  },
  {
   "name": "mempool_limit.py",
-  "time": 7
+  "time": 4
  },
  {
   "name": "mempool_packages.py",
-  "time": 34
+  "time": 18
  },
  {
   "name": "mempool_persist.py",
-  "time": 21
+  "time": 17
  },
  {
   "name": "mempool_reorg.py",
-  "time": 28
+  "time": 7
  },
  {
   "name": "mempool_resurrect_test.py",
-  "time": 18
+  "time": 2
  },
  {
   "name": "mempool_spendcoinbase.py",
-  "time": 17
+  "time": 2
  },
  {
   "name": "merkle_blocks.py",
@@ -189,87 +161,67 @@
  },
  {
   "name": "minchainwork.py",
-  "time": 16
+  "time": 7
  },
  {
   "name": "mining.py",
-  "time": 18
+  "time": 2
  },
  {
   "name": "multi_rpc.py",
-  "time": 5
+  "time": 4
  },
  {
   "name": "multiwallet.py",
-  "time": 8
+  "time": 6
  },
  {
   "name": "net.py",
-  "time": 17
+  "time": 3
  },
  {
   "name": "notifications.py",
-  "time": 7
+  "time": 5
  },
  {
   "name": "nulldummy.py",
-  "time": 17
+  "time": 3
  },
  {
   "name": "p2p-acceptblock.py",
-  "time": 8
- },
- {
-  "name": "p2p-compactblocks.py",
-  "time": 42
+  "time": 6
  },
  {
   "name": "p2p-feefilter.py",
-  "time": 25
- },
- {
-  "name": "p2p-fullblocktest.py",
-  "time": 154
+  "time": 31
  },
  {
   "name": "p2p-leaktests.py",
-  "time": 24
+  "time": 7
  },
  {
   "name": "p2p-mempool.py",
-  "time": 16
- },
- {
-  "name": "p2p-timeouts.py",
-  "time": 65
+  "time": 3
  },
  {
   "name": "preciousblock.py",
-  "time": 5
+  "time": 4
  },
  {
   "name": "prioritise_transaction.py",
-  "time": 10
+  "time": 4
  },
  {
   "name": "proxy_test.py",
-  "time": 5
- },
- {
-  "name": "pruning.py",
-  "time": 1491
+  "time": 4
  },
  {
   "name": "rawtransactions.py",
-  "time": 37
- },
- {
-  "name": "receivedby.py",
-  "time": 13
+  "time": 14
  },
  {
   "name": "reindex.py",
-  "time": 26
+  "time": 13
  },
  {
   "name": "resendwallettransactions.py",
@@ -277,23 +229,19 @@
  },
  {
   "name": "rest.py",
-  "time": 9
- },
- {
-  "name": "rpcbind_test.py",
-  "time": 29
+  "time": 10
  },
  {
   "name": "rpcnamedargs.py",
-  "time": 3
+  "time": 2
  },
  {
   "name": "sendheaders.py",
-  "time": 30
+  "time": 20
  },
  {
   "name": "signmessages.py",
-  "time": 2
+  "time": 3
  },
  {
   "name": "signrawtransactions.py",
@@ -301,15 +249,15 @@
  },
  {
   "name": "txn_clone.py",
-  "time": 7
+  "time": 4
  },
  {
   "name": "txn_clone.py --mineblock",
-  "time": 8
+  "time": 4
  },
  {
   "name": "txn_doublespend.py",
-  "time": 6
+  "time": 4
  },
  {
   "name": "txn_doublespend.py --mineblock",
@@ -317,38 +265,30 @@
  },
  {
   "name": "uptime.py",
-  "time": 3
+  "time": 2
  },
  {
-  "name": "wallet-accounts.py",
-  "time": 40
+  "name": "wallet_accounts.py",
+  "time": 7
  },
  {
-  "name": "wallet-dump.py",
+  "name": "wallet_dump.py",
   "time": 8
  },
  {
-  "name": "wallet-encryption.py",
-  "time": 20
- },
- {
-  "name": "wallet-hd.py",
-  "time": 126
+  "name": "wallet_encryption.py",
+  "time": 8
  },
  {
-  "name": "wallet.py",
-  "time": 44
+  "name": "wallet_hd.py",
+  "time": 46
  },
  {
-  "name": "walletbackup.py",
-  "time": 101
+  "name": "wallet_receivedby.py",
+  "time": 10
  },
  {
   "name": "zapwallettxes.py",
-  "time": 15
- },
- {
-  "name": "zmq_test.py",
-  "time": 9
+  "time": 11
  }
 ]
\ No newline at end of file
diff --git a/test/functional/wallet-accounts.py b/test/functional/wallet_accounts.py
rename from test/functional/wallet-accounts.py
rename to test/functional/wallet_accounts.py
diff --git a/test/functional/wallet-dump.py b/test/functional/wallet_dump.py
rename from test/functional/wallet-dump.py
rename to test/functional/wallet_dump.py
diff --git a/test/functional/wallet-encryption.py b/test/functional/wallet_encryption.py
rename from test/functional/wallet-encryption.py
rename to test/functional/wallet_encryption.py
diff --git a/test/functional/wallet-hd.py b/test/functional/wallet_hd.py
rename from test/functional/wallet-hd.py
rename to test/functional/wallet_hd.py
diff --git a/test/functional/receivedby.py b/test/functional/wallet_receivedby.py
rename from test/functional/receivedby.py
rename to test/functional/wallet_receivedby.py