diff --git a/test/functional/abc-cmdline.py b/test/functional/abc_cmdline.py
rename from test/functional/abc-cmdline.py
rename to test/functional/abc_cmdline.py
diff --git a/test/functional/abc-finalize-block.py b/test/functional/abc_finalize_block.py
rename from test/functional/abc-finalize-block.py
rename to test/functional/abc_finalize_block.py
diff --git a/test/functional/abc-get-invalid-block.py b/test/functional/abc_get_invalid_block.py
rename from test/functional/abc-get-invalid-block.py
rename to test/functional/abc_get_invalid_block.py
diff --git a/test/functional/abc-invalid-chains.py b/test/functional/abc_invalid_chains.py
rename from test/functional/abc-invalid-chains.py
rename to test/functional/abc_invalid_chains.py
diff --git a/test/functional/abc-invalid-message.py b/test/functional/abc_invalid_message.py
rename from test/functional/abc-invalid-message.py
rename to test/functional/abc_invalid_message.py
diff --git a/test/functional/abc-magnetic-anomaly-mining.py b/test/functional/abc_magnetic_anomaly_mining.py
rename from test/functional/abc-magnetic-anomaly-mining.py
rename to test/functional/abc_magnetic_anomaly_mining.py
diff --git a/test/functional/abc-mempool-coherence-on-activations.py b/test/functional/abc_mempool_coherence_on_activations.py
rename from test/functional/abc-mempool-coherence-on-activations.py
rename to test/functional/abc_mempool_coherence_on_activations.py
diff --git a/test/functional/abc-minimaldata.py b/test/functional/abc_minimaldata.py
rename from test/functional/abc-minimaldata.py
rename to test/functional/abc_minimaldata.py
diff --git a/test/functional/abc-parkedchain.py b/test/functional/abc_parkedchain.py
rename from test/functional/abc-parkedchain.py
rename to test/functional/abc_parkedchain.py
diff --git a/test/functional/abc-replay-protection.py b/test/functional/abc_replay_protection.py
rename from test/functional/abc-replay-protection.py
rename to test/functional/abc_replay_protection.py
diff --git a/test/functional/abc-schnorr.py b/test/functional/abc_schnorr.py
rename from test/functional/abc-schnorr.py
rename to test/functional/abc_schnorr.py
diff --git a/test/functional/abc-schnorrmultisig.py b/test/functional/abc_schnorrmultisig.py
rename from test/functional/abc-schnorrmultisig.py
rename to test/functional/abc_schnorrmultisig.py
diff --git a/test/functional/abc-segwit-recovery.py b/test/functional/abc_segwit_recovery.py
rename from test/functional/abc-segwit-recovery.py
rename to test/functional/abc_segwit_recovery.py
diff --git a/test/functional/abc-sync-chain.py b/test/functional/abc_sync_chain.py
rename from test/functional/abc-sync-chain.py
rename to test/functional/abc_sync_chain.py
diff --git a/test/functional/abc-transaction-ordering.py b/test/functional/abc_transaction_ordering.py
rename from test/functional/abc-transaction-ordering.py
rename to test/functional/abc_transaction_ordering.py
diff --git a/test/functional/abc-version-message.py b/test/functional/abc_version_message.py
rename from test/functional/abc-version-message.py
rename to test/functional/abc_version_message.py
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -669,7 +669,7 @@
 def check_script_prefixes(all_scripts):
     """Check that no more than `EXPECTED_VIOLATION_COUNT` of the
        test scripts don't start with one of the allowed name prefixes."""
-    EXPECTED_VIOLATION_COUNT = 16
+    EXPECTED_VIOLATION_COUNT = 15
 
     # LEEWAY is provided as a transition measure, so that pull-requests
     # that introduce new tests that don't conform with the naming