diff --git a/test/functional/abc-p2p-avalanche.py b/test/functional/abc_p2p_avalanche.py
rename from test/functional/abc-p2p-avalanche.py
rename to test/functional/abc_p2p_avalanche.py
diff --git a/test/functional/abc-p2p-compactblocks.py b/test/functional/abc_p2p_compactblocks.py
rename from test/functional/abc-p2p-compactblocks.py
rename to test/functional/abc_p2p_compactblocks.py
diff --git a/test/functional/abc-p2p-fullblocktest.py b/test/functional/abc_p2p_fullblocktest.py
rename from test/functional/abc-p2p-fullblocktest.py
rename to test/functional/abc_p2p_fullblocktest.py
diff --git a/test/functional/abc-p2p-fullblocktest-sigops.py b/test/functional/abc_p2p_fullblocktest_sigops.py
rename from test/functional/abc-p2p-fullblocktest-sigops.py
rename to test/functional/abc_p2p_fullblocktest_sigops.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 = 29
+    EXPECTED_VIOLATION_COUNT = 27
 
     # LEEWAY is provided as a transition measure, so that pull-requests
     # that introduce new tests that don't conform with the naming
@@ -665,7 +665,7 @@
     LEEWAY = 10
 
     good_prefixes_re = re.compile(
-        "(example|feature|interface|mempool|mining|p2p|rpc|wallet|tool)_")
+        "(abc_)?(example|feature|interface|mempool|mining|p2p|rpc|wallet|tool)_")
     bad_script_names = [
         script for script in all_scripts if good_prefixes_re.match(script) is None]