diff --git a/doc/data/messages/r/redundant-typehint-argument/pylintrc b/doc/data/messages/r/redundant-typehint-argument/pylintrc
index 75114c1482..825e13ec0b 100644
--- a/doc/data/messages/r/redundant-typehint-argument/pylintrc
+++ b/doc/data/messages/r/redundant-typehint-argument/pylintrc
@@ -1,5 +1,2 @@
 [main]
 load-plugins=pylint.extensions.typing
-
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/a/access/access_to_protected_members_typing.rc b/tests/functional/a/access/access_to_protected_members_typing.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/a/access/access_to_protected_members_typing.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/a/assigning/assigning_non_slot_4509.rc b/tests/functional/a/assigning/assigning_non_slot_4509.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/a/assigning/assigning_non_slot_4509.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/a/await_outside_async.rc b/tests/functional/a/await_outside_async.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/a/await_outside_async.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/d/dataclass/dataclass_typecheck.rc b/tests/functional/d/dataclass/dataclass_typecheck.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/d/dataclass/dataclass_typecheck.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/d/dataclass/dataclass_with_default_factory.rc b/tests/functional/d/dataclass/dataclass_with_default_factory.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/d/dataclass/dataclass_with_default_factory.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/d/dataclass/dataclass_with_field.rc b/tests/functional/d/dataclass/dataclass_with_field.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/d/dataclass/dataclass_with_field.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/ext/typing/redundant_typehint_argument.rc b/tests/functional/ext/typing/redundant_typehint_argument.rc
index 7ffc1704bb..762a13dca5 100644
--- a/tests/functional/ext/typing/redundant_typehint_argument.rc
+++ b/tests/functional/ext/typing/redundant_typehint_argument.rc
@@ -1,8 +1,5 @@
 [main]
 load-plugins=pylint.extensions.typing
 
-[testoptions]
-min_pyver=3.7
-
 [TYPING]
 runtime-typing=no
diff --git a/tests/functional/ext/typing/typing_broken_callable.rc b/tests/functional/ext/typing/typing_broken_callable.rc
index 5841196f24..d075a593ef 100644
--- a/tests/functional/ext/typing/typing_broken_callable.rc
+++ b/tests/functional/ext/typing/typing_broken_callable.rc
@@ -1,6 +1,3 @@
 [main]
 py-version=3.9
 load-plugins=pylint.extensions.typing
-
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.rc b/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.rc
index 5841196f24..d075a593ef 100644
--- a/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.rc
+++ b/tests/functional/ext/typing/typing_broken_callable_deprecated_alias.rc
@@ -1,6 +1,3 @@
 [main]
 py-version=3.9
 load-plugins=pylint.extensions.typing
-
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/ext/typing/typing_broken_callable_future_import.rc b/tests/functional/ext/typing/typing_broken_callable_future_import.rc
index 5841196f24..d075a593ef 100644
--- a/tests/functional/ext/typing/typing_broken_callable_future_import.rc
+++ b/tests/functional/ext/typing/typing_broken_callable_future_import.rc
@@ -1,6 +1,3 @@
 [main]
 py-version=3.9
 load-plugins=pylint.extensions.typing
-
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/ext/typing/typing_broken_noreturn_future_import.rc b/tests/functional/ext/typing/typing_broken_noreturn_future_import.rc
index 282a65d62e..eb28fc75b9 100644
--- a/tests/functional/ext/typing/typing_broken_noreturn_future_import.rc
+++ b/tests/functional/ext/typing/typing_broken_noreturn_future_import.rc
@@ -1,6 +1,3 @@
 [main]
 py-version=3.7
 load-plugins=pylint.extensions.typing
-
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/f/forgotten_debug_statement_py37.py b/tests/functional/f/forgotten_debug_statement.py
similarity index 100%
rename from tests/functional/f/forgotten_debug_statement_py37.py
rename to tests/functional/f/forgotten_debug_statement.py
diff --git a/tests/functional/f/forgotten_debug_statement_py37.txt b/tests/functional/f/forgotten_debug_statement.txt
similarity index 100%
rename from tests/functional/f/forgotten_debug_statement_py37.txt
rename to tests/functional/f/forgotten_debug_statement.txt
diff --git a/tests/functional/f/forgotten_debug_statement_py37.rc b/tests/functional/f/forgotten_debug_statement_py37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/f/forgotten_debug_statement_py37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/f/function_redefined_2540.rc b/tests/functional/f/function_redefined_2540.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/f/function_redefined_2540.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/g/generic_alias/generic_alias_collections_py37.rc b/tests/functional/g/generic_alias/generic_alias_collections_py37.rc
index 59df8e3c3b..d584aa9595 100644
--- a/tests/functional/g/generic_alias/generic_alias_collections_py37.rc
+++ b/tests/functional/g/generic_alias/generic_alias_collections_py37.rc
@@ -1,3 +1,2 @@
 [testoptions]
-min_pyver=3.7
 max_pyver=3.9
diff --git a/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.rc b/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.rc
index 59df8e3c3b..d584aa9595 100644
--- a/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.rc
+++ b/tests/functional/g/generic_alias/generic_alias_collections_py37_with_typing.rc
@@ -1,3 +1,2 @@
 [testoptions]
-min_pyver=3.7
 max_pyver=3.9
diff --git a/tests/functional/g/generic_alias/generic_alias_mixed_py37.rc b/tests/functional/g/generic_alias/generic_alias_mixed_py37.rc
index 59df8e3c3b..d584aa9595 100644
--- a/tests/functional/g/generic_alias/generic_alias_mixed_py37.rc
+++ b/tests/functional/g/generic_alias/generic_alias_mixed_py37.rc
@@ -1,3 +1,2 @@
 [testoptions]
-min_pyver=3.7
 max_pyver=3.9
diff --git a/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.rc b/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.rc
index 59df8e3c3b..d584aa9595 100644
--- a/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.rc
+++ b/tests/functional/g/generic_alias/generic_alias_postponed_evaluation_py37.rc
@@ -1,3 +1,2 @@
 [testoptions]
-min_pyver=3.7
 max_pyver=3.9
diff --git a/tests/functional/g/generic_alias/generic_alias_related.rc b/tests/functional/g/generic_alias/generic_alias_related.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/g/generic_alias/generic_alias_related.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/g/generic_alias/generic_alias_typing.rc b/tests/functional/g/generic_alias/generic_alias_typing.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/g/generic_alias/generic_alias_typing.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/i/invalid/invalid_field_call.rc b/tests/functional/i/invalid/invalid_field_call.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/i/invalid/invalid_field_call.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.rc b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.rc
index c8bdd0efd6..3fcf4d0a67 100644
--- a/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.rc
+++ b/tests/functional/i/invalid/invalid_name/invalid_name_issue_3405.rc
@@ -4,6 +4,3 @@ enable=invalid-name
 [BASIC]
 attr-rgx=^x$
 class-attribute-rgx=^y$
-
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/l/logging/logging_fstring_interpolation_py37.rc b/tests/functional/l/logging/logging_fstring_interpolation_py37.rc
index 7a78f5277f..90ff3a0e2c 100644
--- a/tests/functional/l/logging/logging_fstring_interpolation_py37.rc
+++ b/tests/functional/l/logging/logging_fstring_interpolation_py37.rc
@@ -1,5 +1,4 @@
 [testoptions]
-min_pyver=3.7
 exclude_from_minimal_messages_config=true
 
 [LOGGING]
diff --git a/tests/functional/m/member/member_checks_py37.py b/tests/functional/m/member/member_checks_async.py
similarity index 100%
rename from tests/functional/m/member/member_checks_py37.py
rename to tests/functional/m/member/member_checks_async.py
diff --git a/tests/functional/m/member/member_checks_py37.txt b/tests/functional/m/member/member_checks_async.txt
similarity index 100%
rename from tests/functional/m/member/member_checks_py37.txt
rename to tests/functional/m/member/member_checks_async.txt
diff --git a/tests/functional/m/member/member_checks_py37.rc b/tests/functional/m/member/member_checks_py37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/m/member/member_checks_py37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/n/no/no_member_dataclasses.rc b/tests/functional/n/no/no_member_dataclasses.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/n/no/no_member_dataclasses.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/n/no/no_member_nested_namedtuple.rc b/tests/functional/n/no/no_member_nested_namedtuple.rc
index d115e39866..ca1aa621a9 100644
--- a/tests/functional/n/no/no_member_nested_namedtuple.rc
+++ b/tests/functional/n/no/no_member_nested_namedtuple.rc
@@ -1,6 +1,3 @@
-[testoptions]
-min_pyver=3.7
-
 [MESSAGES CONTROL]
 disable=fixme,
     logging-too-many-args,
diff --git a/tests/functional/n/no/no_member_subclassed_dataclasses.rc b/tests/functional/n/no/no_member_subclassed_dataclasses.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/n/no/no_member_subclassed_dataclasses.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/n/no/no_self_argument.py b/tests/functional/n/no/no_self_argument.py
index 9f51c2a9bb..5be5571d1e 100644
--- a/tests/functional/n/no/no_self_argument.py
+++ b/tests/functional/n/no/no_self_argument.py
@@ -1,5 +1,5 @@
 """Check for method without self as first argument"""
-
+# pylint: disable=missing-docstring,too-few-public-methods
 
 MYSTATICMETHOD = staticmethod
 
@@ -47,3 +47,15 @@ def kwargs(**kwargs):  # [no-self-argument]
 
     def varargs_and_kwargs(*args, **kwargs):  # [no-self-argument]
         """A method without a self argument but with *args and **kwargs."""
+
+
+class Toto:
+
+    def __class_getitem__(cls, params):
+        # This is actually a special method which is always a class method.
+        # See https://www.python.org/dev/peps/pep-0560/#class-getitem
+        pass
+
+    def __class_other__(cls, params):  # [no-self-argument]
+        # This is not a special case and as such is an instance method.
+        pass
diff --git a/tests/functional/n/no/no_self_argument.txt b/tests/functional/n/no/no_self_argument.txt
index 481c41ebba..4bd34f5c6d 100644
--- a/tests/functional/n/no/no_self_argument.txt
+++ b/tests/functional/n/no/no_self_argument.txt
@@ -3,3 +3,4 @@ no-self-argument:19:4:19:12:NoSelfArgument.abdc:"Method 'abdc' should have ""sel
 no-self-argument:42:4:42:15:NoSelfArgument.varargs:"Method 'varargs' should have ""self"" as first argument":UNDEFINED
 no-self-argument:45:4:45:14:NoSelfArgument.kwargs:"Method 'kwargs' should have ""self"" as first argument":UNDEFINED
 no-self-argument:48:4:48:26:NoSelfArgument.varargs_and_kwargs:"Method 'varargs_and_kwargs' should have ""self"" as first argument":UNDEFINED
+no-self-argument:59:4:59:23:Toto.__class_other__:"Method '__class_other__' should have ""self"" as first argument":UNDEFINED
diff --git a/tests/functional/n/no/no_self_argument_py37.py b/tests/functional/n/no/no_self_argument_py37.py
deleted file mode 100644
index c1b195f078..0000000000
--- a/tests/functional/n/no/no_self_argument_py37.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""Test detection of self as argument of first method in Python 3.7 and above."""
-
-# pylint: disable=missing-docstring,too-few-public-methods
-
-
-class Toto:
-
-    def __class_getitem__(cls, params):
-        # This is actually a special method which is always a class method.
-        # See https://www.python.org/dev/peps/pep-0560/#class-getitem
-        pass
-
-    def __class_other__(cls, params):  # [no-self-argument]
-        # This is not a special case and as such is an instance method.
-        pass
diff --git a/tests/functional/n/no/no_self_argument_py37.rc b/tests/functional/n/no/no_self_argument_py37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/n/no/no_self_argument_py37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/n/no/no_self_argument_py37.txt b/tests/functional/n/no/no_self_argument_py37.txt
deleted file mode 100644
index c4f95a6689..0000000000
--- a/tests/functional/n/no/no_self_argument_py37.txt
+++ /dev/null
@@ -1 +0,0 @@
-no-self-argument:13:4:13:23:Toto.__class_other__:"Method '__class_other__' should have ""self"" as first argument":UNDEFINED
diff --git a/tests/functional/n/not_async_context_manager_py37.rc b/tests/functional/n/not_async_context_manager_py37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/n/not_async_context_manager_py37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/p/postponed/postponed_evaluation_activated.rc b/tests/functional/p/postponed/postponed_evaluation_activated.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/p/postponed/postponed_evaluation_activated.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/p/postponed/postponed_evaluation_activated_with_alias.rc b/tests/functional/p/postponed/postponed_evaluation_activated_with_alias.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/p/postponed/postponed_evaluation_activated_with_alias.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/p/postponed/postponed_evaluation_not_activated.rc b/tests/functional/p/postponed/postponed_evaluation_not_activated.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/p/postponed/postponed_evaluation_not_activated.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/r/redefined/redefined_outer_name_type_checking.rc b/tests/functional/r/redefined/redefined_outer_name_type_checking.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/r/redefined/redefined_outer_name_type_checking.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/r/regression/regression_3507_typing_alias_isinstance.rc b/tests/functional/r/regression/regression_3507_typing_alias_isinstance.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/r/regression/regression_3507_typing_alias_isinstance.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/r/regression_02/regression_5030.rc b/tests/functional/r/regression_02/regression_5030.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/r/regression_02/regression_5030.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/t/too/too_few_public_methods_37.rc b/tests/functional/t/too/too_few_public_methods_37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/t/too/too_few_public_methods_37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/t/too/too_many_instance_attributes_py37.rc b/tests/functional/t/too/too_many_instance_attributes_py37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/t/too/too_many_instance_attributes_py37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/t/try_except_raise_crash.rc b/tests/functional/t/try_except_raise_crash.rc
index 562828352c..10388685f1 100644
--- a/tests/functional/t/try_except_raise_crash.rc
+++ b/tests/functional/t/try_except_raise_crash.rc
@@ -1,3 +1,2 @@
 [testoptions]
-min_pyver=3.7
 exclude_from_minimal_messages_config=true
diff --git a/tests/functional/t/typing_generic.rc b/tests/functional/t/typing_generic.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/t/typing_generic.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/u/unpacking/unpacking_non_sequence_py37.rc b/tests/functional/u/unpacking/unpacking_non_sequence_py37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/u/unpacking/unpacking_non_sequence_py37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/u/unsubscriptable_value_py37.rc b/tests/functional/u/unsubscriptable_value_py37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/u/unsubscriptable_value_py37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/u/used/used_before_assignment_py37.rc b/tests/functional/u/used/used_before_assignment_py37.rc
deleted file mode 100644
index a17bb22daf..0000000000
--- a/tests/functional/u/used/used_before_assignment_py37.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.7
diff --git a/tests/functional/w/wrong_exception_operation_py37.rc b/tests/functional/w/wrong_exception_operation_py37.rc
index dd83cc9536..4e2b748313 100644
--- a/tests/functional/w/wrong_exception_operation_py37.rc
+++ b/tests/functional/w/wrong_exception_operation_py37.rc
@@ -1,3 +1,2 @@
 [testoptions]
-min_pyver=3.7
 max_pyver=3.10