diff --git a/test/functional/abc-rpc.py b/test/functional/abc_rpc_excessiveblock.py
rename from test/functional/abc-rpc.py
rename to test/functional/abc_rpc_excessiveblock.py
--- a/test/functional/abc-rpc.py
+++ b/test/functional/abc_rpc_excessiveblock.py
@@ -19,7 +19,7 @@
     LEGACY_MAX_BLOCK_SIZE)
 
 
-class ABC_RPC_Test (BitcoinTestFramework):
+class ExcessiveBlockSizeRPCTest(BitcoinTestFramework):
 
     def set_test_params(self):
         self.num_nodes = 1
@@ -90,4 +90,4 @@
 
 
 if __name__ == '__main__':
-    ABC_RPC_Test().main()
+    ExcessiveBlockSizeRPCTest().main()
diff --git a/test/functional/abc-rpc-mocktime.py b/test/functional/abc_rpc_mocktime.py
rename from test/functional/abc-rpc-mocktime.py
rename to test/functional/abc_rpc_mocktime.py
diff --git a/test/functional/abc-wallet-standardness.py b/test/functional/abc_wallet_standardness.py
rename from test/functional/abc-wallet-standardness.py
rename to test/functional/abc_wallet_standardness.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
@@ -657,7 +657,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 = 27
+    EXPECTED_VIOLATION_COUNT = 24
 
     # LEEWAY is provided as a transition measure, so that pull-requests
     # that introduce new tests that don't conform with the naming