diff --git a/doc/functional-tests.md b/doc/functional-tests.md
--- a/doc/functional-tests.md
+++ b/doc/functional-tests.md
@@ -281,7 +281,7 @@
     acceptance is tested against the given outcome.
 
 - For examples of tests written in this framework, see
-  `invalidblockrequest.py` and `p2p-fullblocktest.py`.
+  `invalidblockrequest.py` and `feature_block.py`.
 
 ### test-framework modules
 
diff --git a/test/functional/assumevalid.py b/test/functional/feature_assumevalid.py
rename from test/functional/assumevalid.py
rename to test/functional/feature_assumevalid.py
diff --git a/test/functional/bip68-sequence.py b/test/functional/feature_bip68_sequence.py
rename from test/functional/bip68-sequence.py
rename to test/functional/feature_bip68_sequence.py
diff --git a/test/functional/p2p-fullblocktest.py b/test/functional/feature_block.py
rename from test/functional/p2p-fullblocktest.py
rename to test/functional/feature_block.py
diff --git a/test/functional/bip65-cltv-p2p.py b/test/functional/feature_cltv.py
rename from test/functional/bip65-cltv-p2p.py
rename to test/functional/feature_cltv.py
diff --git a/test/functional/conf_args.py b/test/functional/feature_config_args.py
rename from test/functional/conf_args.py
rename to test/functional/feature_config_args.py
diff --git a/test/functional/bip68-112-113-p2p.py b/test/functional/feature_csv_activation.py
rename from test/functional/bip68-112-113-p2p.py
rename to test/functional/feature_csv_activation.py
diff --git a/test/functional/dbcrash.py b/test/functional/feature_dbcrash.py
rename from test/functional/dbcrash.py
rename to test/functional/feature_dbcrash.py
diff --git a/test/functional/bipdersig-p2p.py b/test/functional/feature_dersig.py
rename from test/functional/bipdersig-p2p.py
rename to test/functional/feature_dersig.py
diff --git a/test/functional/maxuploadtarget.py b/test/functional/feature_maxuploadtarget.py
rename from test/functional/maxuploadtarget.py
rename to test/functional/feature_maxuploadtarget.py
diff --git a/test/functional/minchainwork.py b/test/functional/feature_minchainwork.py
rename from test/functional/minchainwork.py
rename to test/functional/feature_minchainwork.py
diff --git a/test/functional/notifications.py b/test/functional/feature_notifications.py
rename from test/functional/notifications.py
rename to test/functional/feature_notifications.py
diff --git a/test/functional/nulldummy.py b/test/functional/feature_nulldummy.py
rename from test/functional/nulldummy.py
rename to test/functional/feature_nulldummy.py
diff --git a/test/functional/proxy_test.py b/test/functional/feature_proxy.py
rename from test/functional/proxy_test.py
rename to test/functional/feature_proxy.py
diff --git a/test/functional/pruning.py b/test/functional/feature_pruning.py
rename from test/functional/pruning.py
rename to test/functional/feature_pruning.py
diff --git a/test/functional/reindex.py b/test/functional/feature_reindex.py
rename from test/functional/reindex.py
rename to test/functional/feature_reindex.py
diff --git a/test/functional/uacomment.py b/test/functional/feature_uacomment.py
rename from test/functional/uacomment.py
rename to test/functional/feature_uacomment.py