Create subdirectory for crowded functional tests

386 files changed, 7 insertions, 10 deletions

diff --git a/tests/functional/a/abstract_abc_methods.py b/tests/functional/a/abstract/abstract_abc_methods.py
index d174669a5..d174669a5 100644
--- a/tests/functional/a/abstract_abc_methods.py
+++ b/tests/functional/a/abstract/abstract_abc_methods.py
diff --git a/tests/functional/a/abstract_class_instantiated_in_class.py b/tests/functional/a/abstract/abstract_class_instantiated_in_class.py
index daaa3b689..daaa3b689 100644
--- a/tests/functional/a/abstract_class_instantiated_in_class.py
+++ b/tests/functional/a/abstract/abstract_class_instantiated_in_class.py
diff --git a/tests/functional/a/abstract_class_instantiated_py3.py b/tests/functional/a/abstract/abstract_class_instantiated_py3.py
index c027833e7..c027833e7 100644
--- a/tests/functional/a/abstract_class_instantiated_py3.py
+++ b/tests/functional/a/abstract/abstract_class_instantiated_py3.py
diff --git a/tests/functional/a/abstract_class_instantiated_py3.rc b/tests/functional/a/abstract/abstract_class_instantiated_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/a/abstract_class_instantiated_py3.rc
+++ b/tests/functional/a/abstract/abstract_class_instantiated_py3.rc
diff --git a/tests/functional/a/abstract_class_instantiated_py3.txt b/tests/functional/a/abstract/abstract_class_instantiated_py3.txt
index f08baf86f..f08baf86f 100644
--- a/tests/functional/a/abstract_class_instantiated_py3.txt
+++ b/tests/functional/a/abstract/abstract_class_instantiated_py3.txt
diff --git a/tests/functional/a/abstract_class_instantiated_py34.py b/tests/functional/a/abstract/abstract_class_instantiated_py34.py
index e24ad28f1..e24ad28f1 100644
--- a/tests/functional/a/abstract_class_instantiated_py34.py
+++ b/tests/functional/a/abstract/abstract_class_instantiated_py34.py
diff --git a/tests/functional/a/abstract_class_instantiated_py34.rc b/tests/functional/a/abstract/abstract_class_instantiated_py34.rc
index f400a86e6..f400a86e6 100644
--- a/tests/functional/a/abstract_class_instantiated_py34.rc
+++ b/tests/functional/a/abstract/abstract_class_instantiated_py34.rc
diff --git a/tests/functional/a/abstract_class_instantiated_py34.txt b/tests/functional/a/abstract/abstract_class_instantiated_py34.txt
index 88d0ef32c..88d0ef32c 100644
--- a/tests/functional/a/abstract_class_instantiated_py34.txt
+++ b/tests/functional/a/abstract/abstract_class_instantiated_py34.txt
diff --git a/tests/functional/a/abstract_method_py3.py b/tests/functional/a/abstract/abstract_method_py3.py
index 8bb491819..8bb491819 100644
--- a/tests/functional/a/abstract_method_py3.py
+++ b/tests/functional/a/abstract/abstract_method_py3.py
diff --git a/tests/functional/a/abstract_method_py3.rc b/tests/functional/a/abstract/abstract_method_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/a/abstract_method_py3.rc
+++ b/tests/functional/a/abstract/abstract_method_py3.rc
diff --git a/tests/functional/a/abstract_method_py3.txt b/tests/functional/a/abstract/abstract_method_py3.txt
index 783242fd5..783242fd5 100644
--- a/tests/functional/a/abstract_method_py3.txt
+++ b/tests/functional/a/abstract/abstract_method_py3.txt
diff --git a/tests/functional/c/consider_iterating_dictionary.py b/tests/functional/c/consider/consider_iterating_dictionary.py
index 1198de1cb..1198de1cb 100644
--- a/tests/functional/c/consider_iterating_dictionary.py
+++ b/tests/functional/c/consider/consider_iterating_dictionary.py
diff --git a/tests/functional/c/consider_iterating_dictionary.txt b/tests/functional/c/consider/consider_iterating_dictionary.txt
index c1b12f976..c1b12f976 100644
--- a/tests/functional/c/consider_iterating_dictionary.txt
+++ b/tests/functional/c/consider/consider_iterating_dictionary.txt
diff --git a/tests/functional/c/consider_join.py b/tests/functional/c/consider/consider_join.py
index 24cd6dd49..24cd6dd49 100644
--- a/tests/functional/c/consider_join.py
+++ b/tests/functional/c/consider/consider_join.py
diff --git a/tests/functional/c/consider_join.txt b/tests/functional/c/consider/consider_join.txt
index f544e55b8..f544e55b8 100644
--- a/tests/functional/c/consider_join.txt
+++ b/tests/functional/c/consider/consider_join.txt
diff --git a/tests/functional/c/consider_merging_isinstance.py b/tests/functional/c/consider/consider_merging_isinstance.py
index d3387bd5c..d3387bd5c 100644
--- a/tests/functional/c/consider_merging_isinstance.py
+++ b/tests/functional/c/consider/consider_merging_isinstance.py
diff --git a/tests/functional/c/consider_merging_isinstance.txt b/tests/functional/c/consider/consider_merging_isinstance.txt
index 9728f1e15..9728f1e15 100644
--- a/tests/functional/c/consider_merging_isinstance.txt
+++ b/tests/functional/c/consider/consider_merging_isinstance.txt
diff --git a/tests/functional/c/consider_swap_variables.py b/tests/functional/c/consider/consider_swap_variables.py
index e3320773f..e3320773f 100644
--- a/tests/functional/c/consider_swap_variables.py
+++ b/tests/functional/c/consider/consider_swap_variables.py
diff --git a/tests/functional/c/consider_swap_variables.txt b/tests/functional/c/consider/consider_swap_variables.txt
index 3e099d671..3e099d671 100644
--- a/tests/functional/c/consider_swap_variables.txt
+++ b/tests/functional/c/consider/consider_swap_variables.txt
diff --git a/tests/functional/c/consider_using_dict_comprehension.py b/tests/functional/c/consider/consider_using_dict_comprehension.py
index da0be6d5a..da0be6d5a 100644
--- a/tests/functional/c/consider_using_dict_comprehension.py
+++ b/tests/functional/c/consider/consider_using_dict_comprehension.py
diff --git a/tests/functional/c/consider_using_dict_comprehension.txt b/tests/functional/c/consider/consider_using_dict_comprehension.txt
index ea2bb31ae..ea2bb31ae 100644
--- a/tests/functional/c/consider_using_dict_comprehension.txt
+++ b/tests/functional/c/consider/consider_using_dict_comprehension.txt
diff --git a/tests/functional/c/consider_using_enumerate.py b/tests/functional/c/consider/consider_using_enumerate.py
index 2ac382b18..2ac382b18 100644
--- a/tests/functional/c/consider_using_enumerate.py
+++ b/tests/functional/c/consider/consider_using_enumerate.py
diff --git a/tests/functional/c/consider_using_enumerate.txt b/tests/functional/c/consider/consider_using_enumerate.txt
index 31ee23f42..31ee23f42 100644
--- a/tests/functional/c/consider_using_enumerate.txt
+++ b/tests/functional/c/consider/consider_using_enumerate.txt
diff --git a/tests/functional/c/consider_using_generator.py b/tests/functional/c/consider/consider_using_generator.py
index eadb34a56..eadb34a56 100644
--- a/tests/functional/c/consider_using_generator.py
+++ b/tests/functional/c/consider/consider_using_generator.py
diff --git a/tests/functional/c/consider_using_generator.txt b/tests/functional/c/consider/consider_using_generator.txt
index 3d3c5a494..3d3c5a494 100644
--- a/tests/functional/c/consider_using_generator.txt
+++ b/tests/functional/c/consider/consider_using_generator.txt
diff --git a/tests/functional/c/consider_using_get.py b/tests/functional/c/consider/consider_using_get.py
index 8c5c68901..8c5c68901 100644
--- a/tests/functional/c/consider_using_get.py
+++ b/tests/functional/c/consider/consider_using_get.py
diff --git a/tests/functional/c/consider_using_get.txt b/tests/functional/c/consider/consider_using_get.txt
index d57b4a269..d57b4a269 100644
--- a/tests/functional/c/consider_using_get.txt
+++ b/tests/functional/c/consider/consider_using_get.txt
diff --git a/tests/functional/c/consider_using_in.py b/tests/functional/c/consider/consider_using_in.py
index fb68ac5e6..fb68ac5e6 100644
--- a/tests/functional/c/consider_using_in.py
+++ b/tests/functional/c/consider/consider_using_in.py
diff --git a/tests/functional/c/consider_using_in.txt b/tests/functional/c/consider/consider_using_in.txt
index 63e5fffff..63e5fffff 100644
--- a/tests/functional/c/consider_using_in.txt
+++ b/tests/functional/c/consider/consider_using_in.txt
diff --git a/tests/functional/c/consider_using_set_comprehension.py b/tests/functional/c/consider/consider_using_set_comprehension.py
index 345989c69..345989c69 100644
--- a/tests/functional/c/consider_using_set_comprehension.py
+++ b/tests/functional/c/consider/consider_using_set_comprehension.py
diff --git a/tests/functional/c/consider_using_set_comprehension.txt b/tests/functional/c/consider/consider_using_set_comprehension.txt
index 4839a7a62..4839a7a62 100644
--- a/tests/functional/c/consider_using_set_comprehension.txt
+++ b/tests/functional/c/consider/consider_using_set_comprehension.txt
diff --git a/tests/functional/c/consider_using_sys_exit.py b/tests/functional/c/consider/consider_using_sys_exit.py
index 4cec44847..4cec44847 100644
--- a/tests/functional/c/consider_using_sys_exit.py
+++ b/tests/functional/c/consider/consider_using_sys_exit.py
diff --git a/tests/functional/c/consider_using_sys_exit.txt b/tests/functional/c/consider/consider_using_sys_exit.txt
index c429c652e..c429c652e 100644
--- a/tests/functional/c/consider_using_sys_exit.txt
+++ b/tests/functional/c/consider/consider_using_sys_exit.txt
diff --git a/tests/functional/c/consider_using_sys_exit_exempted.py b/tests/functional/c/consider/consider_using_sys_exit_exempted.py
index ba66989cb..ba66989cb 100644
--- a/tests/functional/c/consider_using_sys_exit_exempted.py
+++ b/tests/functional/c/consider/consider_using_sys_exit_exempted.py
diff --git a/tests/functional/c/consider_using_sys_exit_local_scope.py b/tests/functional/c/consider/consider_using_sys_exit_local_scope.py
index 05b57ae41..05b57ae41 100644
--- a/tests/functional/c/consider_using_sys_exit_local_scope.py
+++ b/tests/functional/c/consider/consider_using_sys_exit_local_scope.py
diff --git a/tests/functional/d/deprecated_method_getmoduleinfo.py b/tests/functional/d/deprecated/deprecated_method_getmoduleinfo.py
index 3338c2456..3338c2456 100644
--- a/tests/functional/d/deprecated_method_getmoduleinfo.py
+++ b/tests/functional/d/deprecated/deprecated_method_getmoduleinfo.py
diff --git a/tests/functional/d/deprecated_method_getmoduleinfo.rc b/tests/functional/d/deprecated/deprecated_method_getmoduleinfo.rc
index a444ca6b8..a444ca6b8 100644
--- a/tests/functional/d/deprecated_method_getmoduleinfo.rc
+++ b/tests/functional/d/deprecated/deprecated_method_getmoduleinfo.rc
diff --git a/tests/functional/d/deprecated_method_getmoduleinfo.txt b/tests/functional/d/deprecated/deprecated_method_getmoduleinfo.txt
index 77632a157..77632a157 100644
--- a/tests/functional/d/deprecated_method_getmoduleinfo.txt
+++ b/tests/functional/d/deprecated/deprecated_method_getmoduleinfo.txt
diff --git a/tests/functional/d/deprecated_methods_py3.py b/tests/functional/d/deprecated/deprecated_methods_py3.py
index 80428c79f..80428c79f 100644
--- a/tests/functional/d/deprecated_methods_py3.py
+++ b/tests/functional/d/deprecated/deprecated_methods_py3.py
diff --git a/tests/functional/d/deprecated_methods_py3.rc b/tests/functional/d/deprecated/deprecated_methods_py3.rc
index 6c3e72704..6c3e72704 100644
--- a/tests/functional/d/deprecated_methods_py3.rc
+++ b/tests/functional/d/deprecated/deprecated_methods_py3.rc
diff --git a/tests/functional/d/deprecated_methods_py3.txt b/tests/functional/d/deprecated/deprecated_methods_py3.txt
index 9796114f6..9796114f6 100644
--- a/tests/functional/d/deprecated_methods_py3.txt
+++ b/tests/functional/d/deprecated/deprecated_methods_py3.txt
diff --git a/tests/functional/d/deprecated_methods_py36.py b/tests/functional/d/deprecated/deprecated_methods_py36.py
index f416a144c..f416a144c 100644
--- a/tests/functional/d/deprecated_methods_py36.py
+++ b/tests/functional/d/deprecated/deprecated_methods_py36.py
diff --git a/tests/functional/d/deprecated_methods_py36.rc b/tests/functional/d/deprecated/deprecated_methods_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/tests/functional/d/deprecated_methods_py36.rc
+++ b/tests/functional/d/deprecated/deprecated_methods_py36.rc
diff --git a/tests/functional/d/deprecated_methods_py36.txt b/tests/functional/d/deprecated/deprecated_methods_py36.txt
index 801d24b6e..801d24b6e 100644
--- a/tests/functional/d/deprecated_methods_py36.txt
+++ b/tests/functional/d/deprecated/deprecated_methods_py36.txt
diff --git a/tests/functional/d/deprecated_methods_py38.py b/tests/functional/d/deprecated/deprecated_methods_py38.py
index 57047f926..57047f926 100644
--- a/tests/functional/d/deprecated_methods_py38.py
+++ b/tests/functional/d/deprecated/deprecated_methods_py38.py
diff --git a/tests/functional/d/deprecated_methods_py38.rc b/tests/functional/d/deprecated/deprecated_methods_py38.rc
index 35b185fdb..35b185fdb 100644
--- a/tests/functional/d/deprecated_methods_py38.rc
+++ b/tests/functional/d/deprecated/deprecated_methods_py38.rc
diff --git a/tests/functional/d/deprecated_methods_py38.txt b/tests/functional/d/deprecated/deprecated_methods_py38.txt
index 00d7f7dda..00d7f7dda 100644
--- a/tests/functional/d/deprecated_methods_py38.txt
+++ b/tests/functional/d/deprecated/deprecated_methods_py38.txt
diff --git a/tests/functional/d/deprecated_module_py3.py b/tests/functional/d/deprecated/deprecated_module_py3.py
index 308d400e7..308d400e7 100644
--- a/tests/functional/d/deprecated_module_py3.py
+++ b/tests/functional/d/deprecated/deprecated_module_py3.py
diff --git a/tests/functional/d/deprecated_module_py3.rc b/tests/functional/d/deprecated/deprecated_module_py3.rc
index 46343d2f1..46343d2f1 100644
--- a/tests/functional/d/deprecated_module_py3.rc
+++ b/tests/functional/d/deprecated/deprecated_module_py3.rc
diff --git a/tests/functional/d/deprecated_module_py3.txt b/tests/functional/d/deprecated/deprecated_module_py3.txt
index 79c0a418c..79c0a418c 100644
--- a/tests/functional/d/deprecated_module_py3.txt
+++ b/tests/functional/d/deprecated/deprecated_module_py3.txt
diff --git a/tests/functional/d/deprecated_module_py36.py b/tests/functional/d/deprecated/deprecated_module_py36.py
index c49f9f0bc..c49f9f0bc 100644
--- a/tests/functional/d/deprecated_module_py36.py
+++ b/tests/functional/d/deprecated/deprecated_module_py36.py
diff --git a/tests/functional/d/deprecated_module_py36.rc b/tests/functional/d/deprecated/deprecated_module_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/tests/functional/d/deprecated_module_py36.rc
+++ b/tests/functional/d/deprecated/deprecated_module_py36.rc
diff --git a/tests/functional/d/deprecated_module_py36.txt b/tests/functional/d/deprecated/deprecated_module_py36.txt
index ab5f48996..ab5f48996 100644
--- a/tests/functional/d/deprecated_module_py36.txt
+++ b/tests/functional/d/deprecated/deprecated_module_py36.txt
diff --git a/tests/functional/d/deprecated_module_py4.py b/tests/functional/d/deprecated/deprecated_module_py4.py
index 3cad959e7..3cad959e7 100644
--- a/tests/functional/d/deprecated_module_py4.py
+++ b/tests/functional/d/deprecated/deprecated_module_py4.py
diff --git a/tests/functional/d/deprecated_module_py4.rc b/tests/functional/d/deprecated/deprecated_module_py4.rc
index 6fbd3407e..6fbd3407e 100644
--- a/tests/functional/d/deprecated_module_py4.rc
+++ b/tests/functional/d/deprecated/deprecated_module_py4.rc
diff --git a/tests/functional/d/deprecated_module_py4.txt b/tests/functional/d/deprecated/deprecated_module_py4.txt
index f4800d0b9..f4800d0b9 100644
--- a/tests/functional/d/deprecated_module_py4.txt
+++ b/tests/functional/d/deprecated/deprecated_module_py4.txt
diff --git a/tests/functional/d/deprecated_module_uninstalled.py b/tests/functional/d/deprecated/deprecated_module_uninstalled.py
index 52d55fa84..52d55fa84 100644
--- a/tests/functional/d/deprecated_module_uninstalled.py
+++ b/tests/functional/d/deprecated/deprecated_module_uninstalled.py
diff --git a/tests/functional/d/deprecated_module_uninstalled.rc b/tests/functional/d/deprecated/deprecated_module_uninstalled.rc
index d68fc0bc9..d68fc0bc9 100644
--- a/tests/functional/d/deprecated_module_uninstalled.rc
+++ b/tests/functional/d/deprecated/deprecated_module_uninstalled.rc
diff --git a/tests/functional/d/deprecated_module_uninstalled.txt b/tests/functional/d/deprecated/deprecated_module_uninstalled.txt
index 7d9f01afa..7d9f01afa 100644
--- a/tests/functional/d/deprecated_module_uninstalled.txt
+++ b/tests/functional/d/deprecated/deprecated_module_uninstalled.txt
diff --git a/tests/functional/i/implicit_str_concat.py b/tests/functional/i/implicit/implicit_str_concat.py
index 707fa75bf..707fa75bf 100644
--- a/tests/functional/i/implicit_str_concat.py
+++ b/tests/functional/i/implicit/implicit_str_concat.py
diff --git a/tests/functional/i/implicit_str_concat.txt b/tests/functional/i/implicit/implicit_str_concat.txt
index 11cecd777..11cecd777 100644
--- a/tests/functional/i/implicit_str_concat.txt
+++ b/tests/functional/i/implicit/implicit_str_concat.txt
diff --git a/tests/functional/i/implicit_str_concat_latin1.py b/tests/functional/i/implicit/implicit_str_concat_latin1.py
index cf8c3e6ab..cf8c3e6ab 100644
--- a/tests/functional/i/implicit_str_concat_latin1.py
+++ b/tests/functional/i/implicit/implicit_str_concat_latin1.py
diff --git a/tests/functional/i/implicit_str_concat_multiline.py b/tests/functional/i/implicit/implicit_str_concat_multiline.py
index 337ac8035..337ac8035 100755
--- a/tests/functional/i/implicit_str_concat_multiline.py
+++ b/tests/functional/i/implicit/implicit_str_concat_multiline.py
diff --git a/tests/functional/i/implicit_str_concat_multiline.rc b/tests/functional/i/implicit/implicit_str_concat_multiline.rc
index e5b344774..e5b344774 100755
--- a/tests/functional/i/implicit_str_concat_multiline.rc
+++ b/tests/functional/i/implicit/implicit_str_concat_multiline.rc
diff --git a/tests/functional/i/implicit_str_concat_multiline.txt b/tests/functional/i/implicit/implicit_str_concat_multiline.txt
index c796269e4..c796269e4 100755
--- a/tests/functional/i/implicit_str_concat_multiline.txt
+++ b/tests/functional/i/implicit/implicit_str_concat_multiline.txt
diff --git a/tests/functional/i/implicit_str_concat_utf8.py b/tests/functional/i/implicit/implicit_str_concat_utf8.py
index 7cd661860..7cd661860 100644
--- a/tests/functional/i/implicit_str_concat_utf8.py
+++ b/tests/functional/i/implicit/implicit_str_concat_utf8.py
diff --git a/tests/functional/i/inconsistent_mro.py b/tests/functional/i/inconsistent/inconsistent_mro.py
index 0b65068d7..0b65068d7 100644
--- a/tests/functional/i/inconsistent_mro.py
+++ b/tests/functional/i/inconsistent/inconsistent_mro.py
diff --git a/tests/functional/i/inconsistent_mro.txt b/tests/functional/i/inconsistent/inconsistent_mro.txt
index a0708be85..a0708be85 100644
--- a/tests/functional/i/inconsistent_mro.txt
+++ b/tests/functional/i/inconsistent/inconsistent_mro.txt
diff --git a/tests/functional/i/inconsistent_quotes.py b/tests/functional/i/inconsistent/inconsistent_quotes.py
index 76553f98b..76553f98b 100644
--- a/tests/functional/i/inconsistent_quotes.py
+++ b/tests/functional/i/inconsistent/inconsistent_quotes.py
diff --git a/tests/functional/i/inconsistent_quotes.rc b/tests/functional/i/inconsistent/inconsistent_quotes.rc
index 9935ff9b7..9935ff9b7 100644
--- a/tests/functional/i/inconsistent_quotes.rc
+++ b/tests/functional/i/inconsistent/inconsistent_quotes.rc
diff --git a/tests/functional/i/inconsistent_quotes.txt b/tests/functional/i/inconsistent/inconsistent_quotes.txt
index 042fe85c2..042fe85c2 100644
--- a/tests/functional/i/inconsistent_quotes.txt
+++ b/tests/functional/i/inconsistent/inconsistent_quotes.txt
diff --git a/tests/functional/i/inconsistent_quotes2.py b/tests/functional/i/inconsistent/inconsistent_quotes2.py
index d9b157e34..d9b157e34 100644
--- a/tests/functional/i/inconsistent_quotes2.py
+++ b/tests/functional/i/inconsistent/inconsistent_quotes2.py
diff --git a/tests/functional/i/inconsistent_quotes2.rc b/tests/functional/i/inconsistent/inconsistent_quotes2.rc
index 9935ff9b7..9935ff9b7 100644
--- a/tests/functional/i/inconsistent_quotes2.rc
+++ b/tests/functional/i/inconsistent/inconsistent_quotes2.rc
diff --git a/tests/functional/i/inconsistent_quotes2.txt b/tests/functional/i/inconsistent/inconsistent_quotes2.txt
index 0f2f77bf8..0f2f77bf8 100644
--- a/tests/functional/i/inconsistent_quotes2.txt
+++ b/tests/functional/i/inconsistent/inconsistent_quotes2.txt
diff --git a/tests/functional/i/inconsistent_returns.py b/tests/functional/i/inconsistent/inconsistent_returns.py
index 9997e9a2c..9997e9a2c 100644
--- a/tests/functional/i/inconsistent_returns.py
+++ b/tests/functional/i/inconsistent/inconsistent_returns.py
diff --git a/tests/functional/i/inconsistent_returns.rc b/tests/functional/i/inconsistent/inconsistent_returns.rc
index dd6cbb598..dd6cbb598 100644
--- a/tests/functional/i/inconsistent_returns.rc
+++ b/tests/functional/i/inconsistent/inconsistent_returns.rc
diff --git a/tests/functional/i/inconsistent_returns.txt b/tests/functional/i/inconsistent/inconsistent_returns.txt
index 34978d5fd..34978d5fd 100644
--- a/tests/functional/i/inconsistent_returns.txt
+++ b/tests/functional/i/inconsistent/inconsistent_returns.txt
diff --git a/tests/functional/i/invalid_all_object.py b/tests/functional/i/invalid/invalid_all_object.py
index 4468c987b..4468c987b 100644
--- a/tests/functional/i/invalid_all_object.py
+++ b/tests/functional/i/invalid/invalid_all_object.py
diff --git a/tests/functional/i/invalid_all_object.txt b/tests/functional/i/invalid/invalid_all_object.txt
index ebcdb8d35..ebcdb8d35 100644
--- a/tests/functional/i/invalid_all_object.txt
+++ b/tests/functional/i/invalid/invalid_all_object.txt
diff --git a/tests/functional/i/invalid_bool_returned.py b/tests/functional/i/invalid/invalid_bool_returned.py
index 0e68ed263..0e68ed263 100644
--- a/tests/functional/i/invalid_bool_returned.py
+++ b/tests/functional/i/invalid/invalid_bool_returned.py
diff --git a/tests/functional/i/invalid_bool_returned.txt b/tests/functional/i/invalid/invalid_bool_returned.txt
index 9af5b182c..9af5b182c 100644
--- a/tests/functional/i/invalid_bool_returned.txt
+++ b/tests/functional/i/invalid/invalid_bool_returned.txt
diff --git a/tests/functional/i/invalid_bytes_returned.py b/tests/functional/i/invalid/invalid_bytes_returned.py
index 703fea278..703fea278 100644
--- a/tests/functional/i/invalid_bytes_returned.py
+++ b/tests/functional/i/invalid/invalid_bytes_returned.py
diff --git a/tests/functional/i/invalid_bytes_returned.txt b/tests/functional/i/invalid/invalid_bytes_returned.txt
index 63440cbbc..63440cbbc 100644
--- a/tests/functional/i/invalid_bytes_returned.txt
+++ b/tests/functional/i/invalid/invalid_bytes_returned.txt
diff --git a/tests/functional/i/invalid_envvar_value.py b/tests/functional/i/invalid/invalid_envvar_value.py
index 3c1a8882b..3c1a8882b 100644
--- a/tests/functional/i/invalid_envvar_value.py
+++ b/tests/functional/i/invalid/invalid_envvar_value.py
diff --git a/tests/functional/i/invalid_envvar_value.txt b/tests/functional/i/invalid/invalid_envvar_value.txt
index cec352b61..cec352b61 100644
--- a/tests/functional/i/invalid_envvar_value.txt
+++ b/tests/functional/i/invalid/invalid_envvar_value.txt
diff --git a/tests/functional/i/invalid_exceptions_caught.py b/tests/functional/i/invalid/invalid_exceptions_caught.py
index 252643446..252643446 100644
--- a/tests/functional/i/invalid_exceptions_caught.py
+++ b/tests/functional/i/invalid/invalid_exceptions_caught.py
diff --git a/tests/functional/i/invalid_exceptions_caught.rc b/tests/functional/i/invalid/invalid_exceptions_caught.rc
index 6a8ee96ca..6a8ee96ca 100644
--- a/tests/functional/i/invalid_exceptions_caught.rc
+++ b/tests/functional/i/invalid/invalid_exceptions_caught.rc
diff --git a/tests/functional/i/invalid_exceptions_caught.txt b/tests/functional/i/invalid/invalid_exceptions_caught.txt
index 4beed611c..4beed611c 100644
--- a/tests/functional/i/invalid_exceptions_caught.txt
+++ b/tests/functional/i/invalid/invalid_exceptions_caught.txt
diff --git a/tests/functional/i/invalid_exceptions_raised.py b/tests/functional/i/invalid/invalid_exceptions_raised.py
index 34f740de4..34f740de4 100644
--- a/tests/functional/i/invalid_exceptions_raised.py
+++ b/tests/functional/i/invalid/invalid_exceptions_raised.py
diff --git a/tests/functional/i/invalid_exceptions_raised.txt b/tests/functional/i/invalid/invalid_exceptions_raised.txt
index 7985a71bf..7985a71bf 100644
--- a/tests/functional/i/invalid_exceptions_raised.txt
+++ b/tests/functional/i/invalid/invalid_exceptions_raised.txt
diff --git a/tests/functional/i/invalid_format_returned.py b/tests/functional/i/invalid/invalid_format_returned.py
index ec428b4b3..ec428b4b3 100644
--- a/tests/functional/i/invalid_format_returned.py
+++ b/tests/functional/i/invalid/invalid_format_returned.py
diff --git a/tests/functional/i/invalid_format_returned.txt b/tests/functional/i/invalid/invalid_format_returned.txt
index 3a3e1ae67..3a3e1ae67 100644
--- a/tests/functional/i/invalid_format_returned.txt
+++ b/tests/functional/i/invalid/invalid_format_returned.txt
diff --git a/tests/functional/i/invalid_getnewargs_ex_returned.py b/tests/functional/i/invalid/invalid_getnewargs_ex_returned.py
index e37895096..e37895096 100644
--- a/tests/functional/i/invalid_getnewargs_ex_returned.py
+++ b/tests/functional/i/invalid/invalid_getnewargs_ex_returned.py
diff --git a/tests/functional/i/invalid_getnewargs_ex_returned.txt b/tests/functional/i/invalid/invalid_getnewargs_ex_returned.txt
index ea8c1703f..ea8c1703f 100644
--- a/tests/functional/i/invalid_getnewargs_ex_returned.txt
+++ b/tests/functional/i/invalid/invalid_getnewargs_ex_returned.txt
diff --git a/tests/functional/i/invalid_getnewargs_returned.py b/tests/functional/i/invalid/invalid_getnewargs_returned.py
index ee5305fe8..ee5305fe8 100644
--- a/tests/functional/i/invalid_getnewargs_returned.py
+++ b/tests/functional/i/invalid/invalid_getnewargs_returned.py
diff --git a/tests/functional/i/invalid_getnewargs_returned.txt b/tests/functional/i/invalid/invalid_getnewargs_returned.txt
index 3560a80f9..3560a80f9 100644
--- a/tests/functional/i/invalid_getnewargs_returned.txt
+++ b/tests/functional/i/invalid/invalid_getnewargs_returned.txt
diff --git a/tests/functional/i/invalid_hash_returned.py b/tests/functional/i/invalid/invalid_hash_returned.py
index 47f63e99b..47f63e99b 100644
--- a/tests/functional/i/invalid_hash_returned.py
+++ b/tests/functional/i/invalid/invalid_hash_returned.py
diff --git a/tests/functional/i/invalid_hash_returned.txt b/tests/functional/i/invalid/invalid_hash_returned.txt
index f30e51417..f30e51417 100644
--- a/tests/functional/i/invalid_hash_returned.txt
+++ b/tests/functional/i/invalid/invalid_hash_returned.txt
diff --git a/tests/functional/i/invalid_index_returned.py b/tests/functional/i/invalid/invalid_index_returned.py
index c48d9a837..c48d9a837 100644
--- a/tests/functional/i/invalid_index_returned.py
+++ b/tests/functional/i/invalid/invalid_index_returned.py
diff --git a/tests/functional/i/invalid_index_returned.txt b/tests/functional/i/invalid/invalid_index_returned.txt
index 840d74a91..840d74a91 100644
--- a/tests/functional/i/invalid_index_returned.txt
+++ b/tests/functional/i/invalid/invalid_index_returned.txt
diff --git a/tests/functional/i/invalid_length_hint_returned.py b/tests/functional/i/invalid/invalid_length_hint_returned.py
index 7696bc9fd..7696bc9fd 100644
--- a/tests/functional/i/invalid_length_hint_returned.py
+++ b/tests/functional/i/invalid/invalid_length_hint_returned.py
diff --git a/tests/functional/i/invalid_length_hint_returned.txt b/tests/functional/i/invalid/invalid_length_hint_returned.txt
index dd31af76e..dd31af76e 100644
--- a/tests/functional/i/invalid_length_hint_returned.txt
+++ b/tests/functional/i/invalid/invalid_length_hint_returned.txt
diff --git a/tests/functional/i/invalid_length_returned.py b/tests/functional/i/invalid/invalid_length_returned.py
index e57db5290..e57db5290 100644
--- a/tests/functional/i/invalid_length_returned.py
+++ b/tests/functional/i/invalid/invalid_length_returned.py
diff --git a/tests/functional/i/invalid_length_returned.txt b/tests/functional/i/invalid/invalid_length_returned.txt
index 2a271fb29..2a271fb29 100644
--- a/tests/functional/i/invalid_length_returned.txt
+++ b/tests/functional/i/invalid/invalid_length_returned.txt
diff --git a/tests/functional/i/invalid_metaclass.py b/tests/functional/i/invalid/invalid_metaclass.py
index c0e9d74be..c0e9d74be 100644
--- a/tests/functional/i/invalid_metaclass.py
+++ b/tests/functional/i/invalid/invalid_metaclass.py
diff --git a/tests/functional/i/invalid_metaclass_py3.py b/tests/functional/i/invalid/invalid_metaclass_py3.py
index 2fc458f5c..2fc458f5c 100644
--- a/tests/functional/i/invalid_metaclass_py3.py
+++ b/tests/functional/i/invalid/invalid_metaclass_py3.py
diff --git a/tests/functional/i/invalid_metaclass_py3.rc b/tests/functional/i/invalid/invalid_metaclass_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/i/invalid_metaclass_py3.rc
+++ b/tests/functional/i/invalid/invalid_metaclass_py3.rc
diff --git a/tests/functional/i/invalid_name.py b/tests/functional/i/invalid/invalid_name.py
index 6259b9b50..6259b9b50 100644
--- a/tests/functional/i/invalid_name.py
+++ b/tests/functional/i/invalid/invalid_name.py
diff --git a/tests/functional/i/invalid_name.txt b/tests/functional/i/invalid/invalid_name.txt
index 749980e13..749980e13 100644
--- a/tests/functional/i/invalid_name.txt
+++ b/tests/functional/i/invalid/invalid_name.txt
diff --git a/tests/functional/i/invalid_overridden_method.py b/tests/functional/i/invalid/invalid_overridden_method.py
index 213c05b7d..213c05b7d 100644
--- a/tests/functional/i/invalid_overridden_method.py
+++ b/tests/functional/i/invalid/invalid_overridden_method.py
diff --git a/tests/functional/i/invalid_overridden_method.txt b/tests/functional/i/invalid/invalid_overridden_method.txt
index a44daa752..a44daa752 100644
--- a/tests/functional/i/invalid_overridden_method.txt
+++ b/tests/functional/i/invalid/invalid_overridden_method.txt
diff --git a/tests/functional/i/invalid_repr_returned.py b/tests/functional/i/invalid/invalid_repr_returned.py
index 3bbd7828d..3bbd7828d 100644
--- a/tests/functional/i/invalid_repr_returned.py
+++ b/tests/functional/i/invalid/invalid_repr_returned.py
diff --git a/tests/functional/i/invalid_repr_returned.txt b/tests/functional/i/invalid/invalid_repr_returned.txt
index 4be375f1f..4be375f1f 100644
--- a/tests/functional/i/invalid_repr_returned.txt
+++ b/tests/functional/i/invalid/invalid_repr_returned.txt
diff --git a/tests/functional/i/invalid_sequence_index.py b/tests/functional/i/invalid/invalid_sequence_index.py
index d11155c02..d11155c02 100644
--- a/tests/functional/i/invalid_sequence_index.py
+++ b/tests/functional/i/invalid/invalid_sequence_index.py
diff --git a/tests/functional/i/invalid_sequence_index.txt b/tests/functional/i/invalid/invalid_sequence_index.txt
index baf1b2167..baf1b2167 100644
--- a/tests/functional/i/invalid_sequence_index.txt
+++ b/tests/functional/i/invalid/invalid_sequence_index.txt
diff --git a/tests/functional/i/invalid_slice_index.py b/tests/functional/i/invalid/invalid_slice_index.py
index 1eb2fda9c..1eb2fda9c 100644
--- a/tests/functional/i/invalid_slice_index.py
+++ b/tests/functional/i/invalid/invalid_slice_index.py
diff --git a/tests/functional/i/invalid_slice_index.txt b/tests/functional/i/invalid/invalid_slice_index.txt
index e715138b4..e715138b4 100644
--- a/tests/functional/i/invalid_slice_index.txt
+++ b/tests/functional/i/invalid/invalid_slice_index.txt
diff --git a/tests/functional/i/invalid_star_assignment_target.py b/tests/functional/i/invalid/invalid_star_assignment_target.py
index 452f9a728..452f9a728 100644
--- a/tests/functional/i/invalid_star_assignment_target.py
+++ b/tests/functional/i/invalid/invalid_star_assignment_target.py
diff --git a/tests/functional/i/invalid_star_assignment_target.rc b/tests/functional/i/invalid/invalid_star_assignment_target.rc
index c093be204..c093be204 100644
--- a/tests/functional/i/invalid_star_assignment_target.rc
+++ b/tests/functional/i/invalid/invalid_star_assignment_target.rc
diff --git a/tests/functional/i/invalid_star_assignment_target.txt b/tests/functional/i/invalid/invalid_star_assignment_target.txt
index eb9f27c90..eb9f27c90 100644
--- a/tests/functional/i/invalid_star_assignment_target.txt
+++ b/tests/functional/i/invalid/invalid_star_assignment_target.txt
diff --git a/tests/functional/i/invalid_str_returned.py b/tests/functional/i/invalid/invalid_str_returned.py
index 00ef22046..00ef22046 100644
--- a/tests/functional/i/invalid_str_returned.py
+++ b/tests/functional/i/invalid/invalid_str_returned.py
diff --git a/tests/functional/i/invalid_str_returned.txt b/tests/functional/i/invalid/invalid_str_returned.txt
index 36b7ec57c..36b7ec57c 100644
--- a/tests/functional/i/invalid_str_returned.txt
+++ b/tests/functional/i/invalid/invalid_str_returned.txt
diff --git a/tests/functional/i/invalid_unary_operand_type.py b/tests/functional/i/invalid/invalid_unary_operand_type.py
index f2a0124f6..f2a0124f6 100644
--- a/tests/functional/i/invalid_unary_operand_type.py
+++ b/tests/functional/i/invalid/invalid_unary_operand_type.py
diff --git a/tests/functional/i/invalid_unary_operand_type.txt b/tests/functional/i/invalid/invalid_unary_operand_type.txt
index 6a3dd591d..6a3dd591d 100644
--- a/tests/functional/i/invalid_unary_operand_type.txt
+++ b/tests/functional/i/invalid/invalid_unary_operand_type.txt
diff --git a/tests/functional/m/member_checks.py b/tests/functional/m/member/member_checks.py
index 291daee12..291daee12 100644
--- a/tests/functional/m/member_checks.py
+++ b/tests/functional/m/member/member_checks.py
diff --git a/tests/functional/m/member_checks.txt b/tests/functional/m/member/member_checks.txt
index 0b7ee9478..0b7ee9478 100644
--- a/tests/functional/m/member_checks.txt
+++ b/tests/functional/m/member/member_checks.txt
diff --git a/tests/functional/m/member_checks_hints.py b/tests/functional/m/member/member_checks_hints.py
index 3925f4741..3925f4741 100644
--- a/tests/functional/m/member_checks_hints.py
+++ b/tests/functional/m/member/member_checks_hints.py
diff --git a/tests/functional/m/member_checks_hints.rc b/tests/functional/m/member/member_checks_hints.rc
index 8d4b587f4..8d4b587f4 100644
--- a/tests/functional/m/member_checks_hints.rc
+++ b/tests/functional/m/member/member_checks_hints.rc
diff --git a/tests/functional/m/member_checks_hints.txt b/tests/functional/m/member/member_checks_hints.txt
index 9dd977b13..9dd977b13 100644
--- a/tests/functional/m/member_checks_hints.txt
+++ b/tests/functional/m/member/member_checks_hints.txt
diff --git a/tests/functional/m/member_checks_ignore_none.py b/tests/functional/m/member/member_checks_ignore_none.py
index 06f01cb6a..06f01cb6a 100644
--- a/tests/functional/m/member_checks_ignore_none.py
+++ b/tests/functional/m/member/member_checks_ignore_none.py
diff --git a/tests/functional/m/member_checks_ignore_none.rc b/tests/functional/m/member/member_checks_ignore_none.rc
index 9ec706ec6..9ec706ec6 100644
--- a/tests/functional/m/member_checks_ignore_none.rc
+++ b/tests/functional/m/member/member_checks_ignore_none.rc
diff --git a/tests/functional/m/member_checks_ignore_none.txt b/tests/functional/m/member/member_checks_ignore_none.txt
index ead0e7efe..ead0e7efe 100644
--- a/tests/functional/m/member_checks_ignore_none.txt
+++ b/tests/functional/m/member/member_checks_ignore_none.txt
diff --git a/tests/functional/m/member_checks_inference_improvements.py b/tests/functional/m/member/member_checks_inference_improvements.py
index 6eefa7958..6eefa7958 100644
--- a/tests/functional/m/member_checks_inference_improvements.py
+++ b/tests/functional/m/member/member_checks_inference_improvements.py
diff --git a/tests/functional/m/member_checks_no_hints.py b/tests/functional/m/member/member_checks_no_hints.py
index 3925f4741..3925f4741 100644
--- a/tests/functional/m/member_checks_no_hints.py
+++ b/tests/functional/m/member/member_checks_no_hints.py
diff --git a/tests/functional/m/member_checks_no_hints.rc b/tests/functional/m/member/member_checks_no_hints.rc
index 0f9c9ca3b..0f9c9ca3b 100644
--- a/tests/functional/m/member_checks_no_hints.rc
+++ b/tests/functional/m/member/member_checks_no_hints.rc
diff --git a/tests/functional/m/member_checks_no_hints.txt b/tests/functional/m/member/member_checks_no_hints.txt
index 6d818641e..6d818641e 100644
--- a/tests/functional/m/member_checks_no_hints.txt
+++ b/tests/functional/m/member/member_checks_no_hints.txt
diff --git a/tests/functional/m/member_checks_opaque.py b/tests/functional/m/member/member_checks_opaque.py
index 9b592af64..9b592af64 100644
--- a/tests/functional/m/member_checks_opaque.py
+++ b/tests/functional/m/member/member_checks_opaque.py
diff --git a/tests/functional/m/member_checks_opaque.rc b/tests/functional/m/member/member_checks_opaque.rc
index 025cd2a0f..025cd2a0f 100644
--- a/tests/functional/m/member_checks_opaque.rc
+++ b/tests/functional/m/member/member_checks_opaque.rc
diff --git a/tests/functional/m/member_checks_opaque.txt b/tests/functional/m/member/member_checks_opaque.txt
index 2fabce4e2..2fabce4e2 100644
--- a/tests/functional/m/member_checks_opaque.txt
+++ b/tests/functional/m/member/member_checks_opaque.txt
diff --git a/tests/functional/m/member_checks_py37.py b/tests/functional/m/member/member_checks_py37.py
index 8d59b7d80..8d59b7d80 100644
--- a/tests/functional/m/member_checks_py37.py
+++ b/tests/functional/m/member/member_checks_py37.py
diff --git a/tests/functional/m/member_checks_py37.rc b/tests/functional/m/member/member_checks_py37.rc
index a17bb22da..a17bb22da 100644
--- a/tests/functional/m/member_checks_py37.rc
+++ b/tests/functional/m/member/member_checks_py37.rc
diff --git a/tests/functional/m/member_checks_py37.txt b/tests/functional/m/member/member_checks_py37.txt
index c52eab13c..c52eab13c 100644
--- a/tests/functional/m/member_checks_py37.txt
+++ b/tests/functional/m/member/member_checks_py37.txt
diff --git a/tests/functional/m/member_checks_typed_annotations.py b/tests/functional/m/member/member_checks_typed_annotations.py
index 90f775a43..90f775a43 100644
--- a/tests/functional/m/member_checks_typed_annotations.py
+++ b/tests/functional/m/member/member_checks_typed_annotations.py
diff --git a/tests/functional/m/member_checks_typed_annotations.txt b/tests/functional/m/member/member_checks_typed_annotations.txt
index 6261a31aa..6261a31aa 100644
--- a/tests/functional/m/member_checks_typed_annotations.txt
+++ b/tests/functional/m/member/member_checks_typed_annotations.txt
diff --git a/tests/functional/m/membership_protocol.py b/tests/functional/m/member/membership_protocol.py
index 3401f4bb4..3401f4bb4 100644
--- a/tests/functional/m/membership_protocol.py
+++ b/tests/functional/m/member/membership_protocol.py
diff --git a/tests/functional/m/membership_protocol.txt b/tests/functional/m/member/membership_protocol.txt
index e021062da..e021062da 100644
--- a/tests/functional/m/membership_protocol.txt
+++ b/tests/functional/m/member/membership_protocol.txt
diff --git a/tests/functional/m/membership_protocol_py3.py b/tests/functional/m/member/membership_protocol_py3.py
index 678072354..678072354 100644
--- a/tests/functional/m/membership_protocol_py3.py
+++ b/tests/functional/m/member/membership_protocol_py3.py
diff --git a/tests/functional/m/membership_protocol_py3.rc b/tests/functional/m/member/membership_protocol_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/m/membership_protocol_py3.rc
+++ b/tests/functional/m/member/membership_protocol_py3.rc
diff --git a/tests/functional/m/membership_protocol_py3.txt b/tests/functional/m/member/membership_protocol_py3.txt
index 495cf94db..495cf94db 100644
--- a/tests/functional/m/membership_protocol_py3.txt
+++ b/tests/functional/m/member/membership_protocol_py3.txt
diff --git a/tests/functional/m/missing_docstring.py b/tests/functional/m/missing/missing_docstring.py
index 72d6762aa..72d6762aa 100644
--- a/tests/functional/m/missing_docstring.py
+++ b/tests/functional/m/missing/missing_docstring.py
diff --git a/tests/functional/m/missing_docstring.txt b/tests/functional/m/missing/missing_docstring.txt
index c9ec52161..c9ec52161 100644
--- a/tests/functional/m/missing_docstring.txt
+++ b/tests/functional/m/missing/missing_docstring.txt
diff --git a/tests/functional/m/missing_docstring_new_style.py b/tests/functional/m/missing/missing_docstring_new_style.py
index 58c7c1ec8..58c7c1ec8 100644
--- a/tests/functional/m/missing_docstring_new_style.py
+++ b/tests/functional/m/missing/missing_docstring_new_style.py
diff --git a/tests/functional/m/missing_docstring_new_style.txt b/tests/functional/m/missing/missing_docstring_new_style.txt
index f194673fe..f194673fe 100644
--- a/tests/functional/m/missing_docstring_new_style.txt
+++ b/tests/functional/m/missing/missing_docstring_new_style.txt
diff --git a/tests/functional/m/missing_final_newline.py b/tests/functional/m/missing/missing_final_newline.py
index 370f902b7..370f902b7 100644
--- a/tests/functional/m/missing_final_newline.py
+++ b/tests/functional/m/missing/missing_final_newline.py
diff --git a/tests/functional/m/missing_final_newline.txt b/tests/functional/m/missing/missing_final_newline.txt
index d7c329b70..d7c329b70 100644
--- a/tests/functional/m/missing_final_newline.txt
+++ b/tests/functional/m/missing/missing_final_newline.txt
diff --git a/tests/functional/m/missing_kwoa_py3.py b/tests/functional/m/missing/missing_kwoa_py3.py
index b4dc604cd..b4dc604cd 100644
--- a/tests/functional/m/missing_kwoa_py3.py
+++ b/tests/functional/m/missing/missing_kwoa_py3.py
diff --git a/tests/functional/m/missing_kwoa_py3.rc b/tests/functional/m/missing/missing_kwoa_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/m/missing_kwoa_py3.rc
+++ b/tests/functional/m/missing/missing_kwoa_py3.rc
diff --git a/tests/functional/m/missing_kwoa_py3.txt b/tests/functional/m/missing/missing_kwoa_py3.txt
index 710635504..710635504 100644
--- a/tests/functional/m/missing_kwoa_py3.txt
+++ b/tests/functional/m/missing/missing_kwoa_py3.txt
diff --git a/tests/functional/m/missing_module_docstring_disabled.py b/tests/functional/m/missing/missing_module_docstring_disabled.py
index d4d9edf3f..d4d9edf3f 100644
--- a/tests/functional/m/missing_module_docstring_disabled.py
+++ b/tests/functional/m/missing/missing_module_docstring_disabled.py
diff --git a/tests/functional/m/missing_parentheses_for_call_in_test.py b/tests/functional/m/missing/missing_parentheses_for_call_in_test.py
index cd1d76a8d..cd1d76a8d 100644
--- a/tests/functional/m/missing_parentheses_for_call_in_test.py
+++ b/tests/functional/m/missing/missing_parentheses_for_call_in_test.py
diff --git a/tests/functional/m/missing_parentheses_for_call_in_test.txt b/tests/functional/m/missing/missing_parentheses_for_call_in_test.txt
index 0547c6e30..0547c6e30 100644
--- a/tests/functional/m/missing_parentheses_for_call_in_test.txt
+++ b/tests/functional/m/missing/missing_parentheses_for_call_in_test.txt
diff --git a/tests/functional/m/missing_self_argument.py b/tests/functional/m/missing/missing_self_argument.py
index 79ae34879..79ae34879 100644
--- a/tests/functional/m/missing_self_argument.py
+++ b/tests/functional/m/missing/missing_self_argument.py
diff --git a/tests/functional/m/missing_self_argument.txt b/tests/functional/m/missing/missing_self_argument.txt
index 1b7626244..1b7626244 100644
--- a/tests/functional/m/missing_self_argument.txt
+++ b/tests/functional/m/missing/missing_self_argument.txt
diff --git a/tests/functional/n/namePresetCamelCase.py b/tests/functional/n/name/namePresetCamelCase.py
index e048ec4d8..e048ec4d8 100644
--- a/tests/functional/n/namePresetCamelCase.py
+++ b/tests/functional/n/name/namePresetCamelCase.py
diff --git a/tests/functional/n/namePresetCamelCase.rc b/tests/functional/n/name/namePresetCamelCase.rc
index 29f44504a..29f44504a 100644
--- a/tests/functional/n/namePresetCamelCase.rc
+++ b/tests/functional/n/name/namePresetCamelCase.rc
diff --git a/tests/functional/n/namePresetCamelCase.txt b/tests/functional/n/name/namePresetCamelCase.txt
index b24b0a881..b24b0a881 100644
--- a/tests/functional/n/namePresetCamelCase.txt
+++ b/tests/functional/n/name/namePresetCamelCase.txt
diff --git a/tests/functional/n/name_good_bad_names_regex.py b/tests/functional/n/name/name_good_bad_names_regex.py
index f1ed4b91b..f1ed4b91b 100644
--- a/tests/functional/n/name_good_bad_names_regex.py
+++ b/tests/functional/n/name/name_good_bad_names_regex.py
diff --git a/tests/functional/n/name_good_bad_names_regex.rc b/tests/functional/n/name/name_good_bad_names_regex.rc
index 8246438cd..8246438cd 100644
--- a/tests/functional/n/name_good_bad_names_regex.rc
+++ b/tests/functional/n/name/name_good_bad_names_regex.rc
diff --git a/tests/functional/n/name_good_bad_names_regex.txt b/tests/functional/n/name/name_good_bad_names_regex.txt
index 08aef7d78..08aef7d78 100644
--- a/tests/functional/n/name_good_bad_names_regex.txt
+++ b/tests/functional/n/name/name_good_bad_names_regex.txt
diff --git a/tests/functional/n/name_preset_snake_case.py b/tests/functional/n/name/name_preset_snake_case.py
index 75350497e..75350497e 100644
--- a/tests/functional/n/name_preset_snake_case.py
+++ b/tests/functional/n/name/name_preset_snake_case.py
diff --git a/tests/functional/n/name_preset_snake_case.rc b/tests/functional/n/name/name_preset_snake_case.rc
index 2b04af5d4..2b04af5d4 100644
--- a/tests/functional/n/name_preset_snake_case.rc
+++ b/tests/functional/n/name/name_preset_snake_case.rc
diff --git a/tests/functional/n/name_preset_snake_case.txt b/tests/functional/n/name/name_preset_snake_case.txt
index c189797e9..c189797e9 100644
--- a/tests/functional/n/name_preset_snake_case.txt
+++ b/tests/functional/n/name/name_preset_snake_case.txt
diff --git a/tests/functional/n/name_styles.py b/tests/functional/n/name/name_styles.py
index 394c82826..394c82826 100644
--- a/tests/functional/n/name_styles.py
+++ b/tests/functional/n/name/name_styles.py
diff --git a/tests/functional/n/name_styles.rc b/tests/functional/n/name/name_styles.rc
index 1a63e671b..1a63e671b 100644
--- a/tests/functional/n/name_styles.rc
+++ b/tests/functional/n/name/name_styles.rc
diff --git a/tests/functional/n/name_styles.txt b/tests/functional/n/name/name_styles.txt
index ef665c0de..ef665c0de 100644
--- a/tests/functional/n/name_styles.txt
+++ b/tests/functional/n/name/name_styles.txt
diff --git a/tests/functional/n/namedtuple_member_inference.py b/tests/functional/n/name/namedtuple_member_inference.py
index 4488ceb0a..4488ceb0a 100644
--- a/tests/functional/n/namedtuple_member_inference.py
+++ b/tests/functional/n/name/namedtuple_member_inference.py
diff --git a/tests/functional/n/namedtuple_member_inference.txt b/tests/functional/n/name/namedtuple_member_inference.txt
index b754e9be7..b754e9be7 100644
--- a/tests/functional/n/namedtuple_member_inference.txt
+++ b/tests/functional/n/name/namedtuple_member_inference.txt
diff --git a/tests/functional/n/names_in__all__.py b/tests/functional/n/name/names_in__all__.py
index 9b2840acc..9b2840acc 100644
--- a/tests/functional/n/names_in__all__.py
+++ b/tests/functional/n/name/names_in__all__.py
diff --git a/tests/functional/n/names_in__all__.txt b/tests/functional/n/name/names_in__all__.txt
index aa9015143..aa9015143 100644
--- a/tests/functional/n/names_in__all__.txt
+++ b/tests/functional/n/name/names_in__all__.txt
diff --git a/tests/functional/too/__init__.py b/tests/functional/n/no/__init__.py
index e69de29bb..e69de29bb 100644
--- a/tests/functional/too/__init__.py
+++ b/tests/functional/n/no/__init__.py
diff --git a/tests/functional/n/no_classmethod_decorator.py b/tests/functional/n/no/no_classmethod_decorator.py
index 66cc0b3c0..66cc0b3c0 100644
--- a/tests/functional/n/no_classmethod_decorator.py
+++ b/tests/functional/n/no/no_classmethod_decorator.py
diff --git a/tests/functional/n/no_classmethod_decorator.txt b/tests/functional/n/no/no_classmethod_decorator.txt
index 90b10f2b1..90b10f2b1 100644
--- a/tests/functional/n/no_classmethod_decorator.txt
+++ b/tests/functional/n/no/no_classmethod_decorator.txt
diff --git a/tests/functional/n/no_else_break.py b/tests/functional/n/no/no_else_break.py
index cf23f313a..cf23f313a 100644
--- a/tests/functional/n/no_else_break.py
+++ b/tests/functional/n/no/no_else_break.py
diff --git a/tests/functional/n/no_else_break.txt b/tests/functional/n/no/no_else_break.txt
index d1a27f73c..d1a27f73c 100644
--- a/tests/functional/n/no_else_break.txt
+++ b/tests/functional/n/no/no_else_break.txt
diff --git a/tests/functional/n/no_else_continue.py b/tests/functional/n/no/no_else_continue.py
index 37f70f121..37f70f121 100644
--- a/tests/functional/n/no_else_continue.py
+++ b/tests/functional/n/no/no_else_continue.py
diff --git a/tests/functional/n/no_else_continue.txt b/tests/functional/n/no/no_else_continue.txt
index 6d659ea28..6d659ea28 100644
--- a/tests/functional/n/no_else_continue.txt
+++ b/tests/functional/n/no/no_else_continue.txt
diff --git a/tests/functional/n/no_else_raise.py b/tests/functional/n/no/no_else_raise.py
index ae807fae3..ae807fae3 100644
--- a/tests/functional/n/no_else_raise.py
+++ b/tests/functional/n/no/no_else_raise.py
diff --git a/tests/functional/n/no_else_raise.txt b/tests/functional/n/no/no_else_raise.txt
index b41f7132f..b41f7132f 100644
--- a/tests/functional/n/no_else_raise.txt
+++ b/tests/functional/n/no/no_else_raise.txt
diff --git a/tests/functional/n/no_else_return.py b/tests/functional/n/no/no_else_return.py
index 0a87551fa..0a87551fa 100644
--- a/tests/functional/n/no_else_return.py
+++ b/tests/functional/n/no/no_else_return.py
diff --git a/tests/functional/n/no_else_return.txt b/tests/functional/n/no/no_else_return.txt
index 4560f7490..4560f7490 100644
--- a/tests/functional/n/no_else_return.txt
+++ b/tests/functional/n/no/no_else_return.txt
diff --git a/tests/functional/n/no_method_argument_py38.py b/tests/functional/n/no/no_method_argument_py38.py
index c67453288..c67453288 100644
--- a/tests/functional/n/no_method_argument_py38.py
+++ b/tests/functional/n/no/no_method_argument_py38.py
diff --git a/tests/functional/n/no_method_argument_py38.rc b/tests/functional/n/no/no_method_argument_py38.rc
index 85fc502b3..85fc502b3 100644
--- a/tests/functional/n/no_method_argument_py38.rc
+++ b/tests/functional/n/no/no_method_argument_py38.rc
diff --git a/tests/functional/n/no_name_in_module.py b/tests/functional/n/no/no_name_in_module.py
index 73ad2db93..73ad2db93 100644
--- a/tests/functional/n/no_name_in_module.py
+++ b/tests/functional/n/no/no_name_in_module.py
diff --git a/tests/functional/n/no_name_in_module.txt b/tests/functional/n/no/no_name_in_module.txt
index ea83ac6f8..883e6b5d7 100644
--- a/tests/functional/n/no_name_in_module.txt
+++ b/tests/functional/n/no/no_name_in_module.txt
@@ -10,5 +10,5 @@ no-name-in-module:34:4::No name 'anything' in module 'collections'
 no-name-in-module:44:4::No name 'indeed_missing' in module 'collections'
 no-name-in-module:49:4::No name 'emit' in module 'collections'
 no-name-in-module:60:8::No name 'emit2' in module 'collections'
-no-name-in-module:65:0::No name 'lala' in module 'functional.n.no_self_use'
-no-name-in-module:66:0::No name 'bla' in module 'functional.n.no_self_use'
+no-name-in-module:65:0::No name 'lala' in module 'functional.n.no.no_self_use'
+no-name-in-module:66:0::No name 'bla' in module 'functional.n.no.no_self_use'
diff --git a/tests/functional/n/no_self_argument_py37.py b/tests/functional/n/no/no_self_argument_py37.py
index 8e6d6fc34..8e6d6fc34 100644
--- a/tests/functional/n/no_self_argument_py37.py
+++ b/tests/functional/n/no/no_self_argument_py37.py
diff --git a/tests/functional/n/no_self_argument_py37.rc b/tests/functional/n/no/no_self_argument_py37.rc
index a17bb22da..a17bb22da 100644
--- a/tests/functional/n/no_self_argument_py37.rc
+++ b/tests/functional/n/no/no_self_argument_py37.rc
diff --git a/tests/functional/n/no_self_argument_py37.txt b/tests/functional/n/no/no_self_argument_py37.txt
index d0aba8476..d0aba8476 100644
--- a/tests/functional/n/no_self_argument_py37.txt
+++ b/tests/functional/n/no/no_self_argument_py37.txt
diff --git a/tests/functional/n/no_self_use.py b/tests/functional/n/no/no_self_use.py
index 3d3cda1f2..3d3cda1f2 100644
--- a/tests/functional/n/no_self_use.py
+++ b/tests/functional/n/no/no_self_use.py
diff --git a/tests/functional/n/no_self_use.txt b/tests/functional/n/no/no_self_use.txt
index b14ee9e03..b14ee9e03 100644
--- a/tests/functional/n/no_self_use.txt
+++ b/tests/functional/n/no/no_self_use.txt
diff --git a/tests/functional/n/no_self_use_py3.py b/tests/functional/n/no/no_self_use_py3.py
index f40150835..f40150835 100644
--- a/tests/functional/n/no_self_use_py3.py
+++ b/tests/functional/n/no/no_self_use_py3.py
diff --git a/tests/functional/n/no_self_use_py3.rc b/tests/functional/n/no/no_self_use_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/n/no_self_use_py3.rc
+++ b/tests/functional/n/no/no_self_use_py3.rc
diff --git a/tests/functional/n/no_staticmethod_decorator.py b/tests/functional/n/no/no_staticmethod_decorator.py
index d0e0effa4..d0e0effa4 100644
--- a/tests/functional/n/no_staticmethod_decorator.py
+++ b/tests/functional/n/no/no_staticmethod_decorator.py
diff --git a/tests/functional/n/no_staticmethod_decorator.txt b/tests/functional/n/no/no_staticmethod_decorator.txt
index df897666a..df897666a 100644
--- a/tests/functional/n/no_staticmethod_decorator.txt
+++ b/tests/functional/n/no/no_staticmethod_decorator.txt
diff --git a/tests/functional/r/raise_missing_from.py b/tests/functional/r/raise/raise_missing_from.py
index d23cefb5e..d23cefb5e 100644
--- a/tests/functional/r/raise_missing_from.py
+++ b/tests/functional/r/raise/raise_missing_from.py
diff --git a/tests/functional/r/raise_missing_from.txt b/tests/functional/r/raise/raise_missing_from.txt
index 15138705a..15138705a 100644
--- a/tests/functional/r/raise_missing_from.txt
+++ b/tests/functional/r/raise/raise_missing_from.txt
diff --git a/tests/functional/r/raising_format_tuple.py b/tests/functional/r/raise/raising_format_tuple.py
index 0f3a3349a..0f3a3349a 100644
--- a/tests/functional/r/raising_format_tuple.py
+++ b/tests/functional/r/raise/raising_format_tuple.py
diff --git a/tests/functional/r/raising_format_tuple.txt b/tests/functional/r/raise/raising_format_tuple.txt
index 756fd1092..756fd1092 100644
--- a/tests/functional/r/raising_format_tuple.txt
+++ b/tests/functional/r/raise/raising_format_tuple.txt
diff --git a/tests/functional/r/raising_non_exception_py3.py b/tests/functional/r/raise/raising_non_exception_py3.py
index 7961c5220..7961c5220 100644
--- a/tests/functional/r/raising_non_exception_py3.py
+++ b/tests/functional/r/raise/raising_non_exception_py3.py
diff --git a/tests/functional/r/raising_non_exception_py3.rc b/tests/functional/r/raise/raising_non_exception_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/r/raising_non_exception_py3.rc
+++ b/tests/functional/r/raise/raising_non_exception_py3.rc
diff --git a/tests/functional/r/raising_non_exception_py3.txt b/tests/functional/r/raise/raising_non_exception_py3.txt
index 9a2e494f1..9a2e494f1 100644
--- a/tests/functional/r/raising_non_exception_py3.txt
+++ b/tests/functional/r/raise/raising_non_exception_py3.txt
diff --git a/tests/functional/r/raising_self.py b/tests/functional/r/raise/raising_self.py
index 16f244ba5..16f244ba5 100644
--- a/tests/functional/r/raising_self.py
+++ b/tests/functional/r/raise/raising_self.py
diff --git a/tests/functional/r/recursion_error_2667.py b/tests/functional/r/recursion/recursion_error_2667.py
index 585cf7f2f..585cf7f2f 100644
--- a/tests/functional/r/recursion_error_2667.py
+++ b/tests/functional/r/recursion/recursion_error_2667.py
diff --git a/tests/functional/r/recursion_error_2836.py b/tests/functional/r/recursion/recursion_error_2836.py
index 9be68b265..9be68b265 100644
--- a/tests/functional/r/recursion_error_2836.py
+++ b/tests/functional/r/recursion/recursion_error_2836.py
diff --git a/tests/functional/r/recursion_error_2861.py b/tests/functional/r/recursion/recursion_error_2861.py
index 03e0a5444..03e0a5444 100644
--- a/tests/functional/r/recursion_error_2861.py
+++ b/tests/functional/r/recursion/recursion_error_2861.py
diff --git a/tests/functional/r/recursion_error_2899.py b/tests/functional/r/recursion/recursion_error_2899.py
index aa01f2aca..aa01f2aca 100644
--- a/tests/functional/r/recursion_error_2899.py
+++ b/tests/functional/r/recursion/recursion_error_2899.py
diff --git a/tests/functional/r/recursion_error_2906.py b/tests/functional/r/recursion/recursion_error_2906.py
index 062109672..062109672 100644
--- a/tests/functional/r/recursion_error_2906.py
+++ b/tests/functional/r/recursion/recursion_error_2906.py
diff --git a/tests/functional/r/recursion_error_3152.py b/tests/functional/r/recursion/recursion_error_3152.py
index 97ec190e8..97ec190e8 100644
--- a/tests/functional/r/recursion_error_3152.py
+++ b/tests/functional/r/recursion/recursion_error_3152.py
diff --git a/tests/functional/r/recursion_error_3159.py b/tests/functional/r/recursion/recursion_error_3159.py
index 086cce769..086cce769 100644
--- a/tests/functional/r/recursion_error_3159.py
+++ b/tests/functional/r/recursion/recursion_error_3159.py
diff --git a/tests/functional/r/recursion_error_940.py b/tests/functional/r/recursion/recursion_error_940.py
index 4a9f346cb..4a9f346cb 100644
--- a/tests/functional/r/recursion_error_940.py
+++ b/tests/functional/r/recursion/recursion_error_940.py
diff --git a/tests/functional/r/recursion_error_crash.py b/tests/functional/r/recursion/recursion_error_crash.py
index 208bc2e7a..208bc2e7a 100644
--- a/tests/functional/r/recursion_error_crash.py
+++ b/tests/functional/r/recursion/recursion_error_crash.py
diff --git a/tests/functional/r/recursion_error_crash_2683.py b/tests/functional/r/recursion/recursion_error_crash_2683.py
index 05978a355..05978a355 100644
--- a/tests/functional/r/recursion_error_crash_2683.py
+++ b/tests/functional/r/recursion/recursion_error_crash_2683.py
diff --git a/tests/functional/r/recursion_error_crash_astroid_623.py b/tests/functional/r/recursion/recursion_error_crash_astroid_623.py
index 662da6145..662da6145 100644
--- a/tests/functional/r/recursion_error_crash_astroid_623.py
+++ b/tests/functional/r/recursion/recursion_error_crash_astroid_623.py
diff --git a/tests/functional/r/recursion_regression_2960.py b/tests/functional/r/recursion/recursion_regression_2960.py
index 96e0fbf74..96e0fbf74 100644
--- a/tests/functional/r/recursion_regression_2960.py
+++ b/tests/functional/r/recursion/recursion_regression_2960.py
diff --git a/tests/functional/r/regression_1326_crash_uninferable.py b/tests/functional/r/regression/regression_1326_crash_uninferable.py
index a42d44ac3..a42d44ac3 100644
--- a/tests/functional/r/regression_1326_crash_uninferable.py
+++ b/tests/functional/r/regression/regression_1326_crash_uninferable.py
diff --git a/tests/functional/r/regression_2443_duplicate_bases.py b/tests/functional/r/regression/regression_2443_duplicate_bases.py
index f32490c44..f32490c44 100644
--- a/tests/functional/r/regression_2443_duplicate_bases.py
+++ b/tests/functional/r/regression/regression_2443_duplicate_bases.py
diff --git a/tests/functional/r/regression_2443_duplicate_bases.rc b/tests/functional/r/regression/regression_2443_duplicate_bases.rc
index 0ba2b6333..0ba2b6333 100644
--- a/tests/functional/r/regression_2443_duplicate_bases.rc
+++ b/tests/functional/r/regression/regression_2443_duplicate_bases.rc
diff --git a/tests/functional/r/regression_2937_ifexp.py b/tests/functional/r/regression/regression_2937_ifexp.py
index 55b240440..55b240440 100644
--- a/tests/functional/r/regression_2937_ifexp.py
+++ b/tests/functional/r/regression/regression_2937_ifexp.py
diff --git a/tests/functional/r/regression_3091.py b/tests/functional/r/regression/regression_3091.py
index 8196db12d..8196db12d 100644
--- a/tests/functional/r/regression_3091.py
+++ b/tests/functional/r/regression/regression_3091.py
diff --git a/tests/functional/r/regression_3231_no_member_property.py b/tests/functional/r/regression/regression_3231_no_member_property.py
index 6cc9cd71c..6cc9cd71c 100644
--- a/tests/functional/r/regression_3231_no_member_property.py
+++ b/tests/functional/r/regression/regression_3231_no_member_property.py
diff --git a/tests/functional/r/regression_3416_unused_argument_raise.py b/tests/functional/r/regression/regression_3416_unused_argument_raise.py
index 9bc761701..9bc761701 100644
--- a/tests/functional/r/regression_3416_unused_argument_raise.py
+++ b/tests/functional/r/regression/regression_3416_unused_argument_raise.py
diff --git a/tests/functional/r/regression_3416_unused_argument_raise.txt b/tests/functional/r/regression/regression_3416_unused_argument_raise.txt
index 44d7a6230..44d7a6230 100644
--- a/tests/functional/r/regression_3416_unused_argument_raise.txt
+++ b/tests/functional/r/regression/regression_3416_unused_argument_raise.txt
diff --git a/tests/functional/r/regression_infer_call_result_3690.py b/tests/functional/r/regression/regression_infer_call_result_3690.py
index 0949d9439..0949d9439 100644
--- a/tests/functional/r/regression_infer_call_result_3690.py
+++ b/tests/functional/r/regression/regression_infer_call_result_3690.py
diff --git a/tests/functional/r/regression_no_member_1078.py b/tests/functional/r/regression/regression_no_member_1078.py
index b7be27d3c..b7be27d3c 100644
--- a/tests/functional/r/regression_no_member_1078.py
+++ b/tests/functional/r/regression/regression_no_member_1078.py
diff --git a/tests/functional/r/regression_no_value_for_parameter.py b/tests/functional/r/regression/regression_no_value_for_parameter.py
index 6dd2ea491..6dd2ea491 100644
--- a/tests/functional/r/regression_no_value_for_parameter.py
+++ b/tests/functional/r/regression/regression_no_value_for_parameter.py
diff --git a/tests/functional/r/regression_posonly_args.py b/tests/functional/r/regression/regression_posonly_args.py
index 750b1f951..750b1f951 100644
--- a/tests/functional/r/regression_posonly_args.py
+++ b/tests/functional/r/regression/regression_posonly_args.py
diff --git a/tests/functional/r/regression_posonly_args.rc b/tests/functional/r/regression/regression_posonly_args.rc
index 85fc502b3..85fc502b3 100644
--- a/tests/functional/r/regression_posonly_args.rc
+++ b/tests/functional/r/regression/regression_posonly_args.rc
diff --git a/tests/functional/r/regression_property_no_member_2641.py b/tests/functional/r/regression/regression_property_no_member_2641.py
index 083f78bdc..083f78bdc 100644
--- a/tests/functional/r/regression_property_no_member_2641.py
+++ b/tests/functional/r/regression/regression_property_no_member_2641.py
diff --git a/tests/functional/r/regression_property_no_member_3269.py b/tests/functional/r/regression/regression_property_no_member_3269.py
index 784dd90d4..784dd90d4 100644
--- a/tests/functional/r/regression_property_no_member_3269.py
+++ b/tests/functional/r/regression/regression_property_no_member_3269.py
diff --git a/tests/functional/r/regression_property_no_member_844.py b/tests/functional/r/regression/regression_property_no_member_844.py
index 759b7bfe3..759b7bfe3 100644
--- a/tests/functional/r/regression_property_no_member_844.py
+++ b/tests/functional/r/regression/regression_property_no_member_844.py
diff --git a/tests/functional/r/regression_property_no_member_870.py b/tests/functional/r/regression/regression_property_no_member_870.py
index e89ae169e..e89ae169e 100644
--- a/tests/functional/r/regression_property_no_member_870.py
+++ b/tests/functional/r/regression/regression_property_no_member_870.py
diff --git a/tests/functional/r/regression_property_slots_2439.py b/tests/functional/r/regression/regression_property_slots_2439.py
index 91cf86cfd..91cf86cfd 100644
--- a/tests/functional/r/regression_property_slots_2439.py
+++ b/tests/functional/r/regression/regression_property_slots_2439.py
diff --git a/tests/functional/r/regression_too_many_arguments_2335.py b/tests/functional/r/regression/regression_too_many_arguments_2335.py
index d2759adfe..d2759adfe 100644
--- a/tests/functional/r/regression_too_many_arguments_2335.py
+++ b/tests/functional/r/regression/regression_too_many_arguments_2335.py
diff --git a/tests/functional/s/simplifiable_condition.py b/tests/functional/s/simplifiable/simplifiable_condition.py
index 32bf36aca..32bf36aca 100644
--- a/tests/functional/s/simplifiable_condition.py
+++ b/tests/functional/s/simplifiable/simplifiable_condition.py
diff --git a/tests/functional/s/simplifiable_condition.txt b/tests/functional/s/simplifiable/simplifiable_condition.txt
index b3552b50f..b3552b50f 100644
--- a/tests/functional/s/simplifiable_condition.txt
+++ b/tests/functional/s/simplifiable/simplifiable_condition.txt
diff --git a/tests/functional/s/simplifiable_if_expression.py b/tests/functional/s/simplifiable/simplifiable_if_expression.py
index bcfdf890b..bcfdf890b 100644
--- a/tests/functional/s/simplifiable_if_expression.py
+++ b/tests/functional/s/simplifiable/simplifiable_if_expression.py
diff --git a/tests/functional/s/simplifiable_if_expression.txt b/tests/functional/s/simplifiable/simplifiable_if_expression.txt
index 872df8c25..872df8c25 100644
--- a/tests/functional/s/simplifiable_if_expression.txt
+++ b/tests/functional/s/simplifiable/simplifiable_if_expression.txt
diff --git a/tests/functional/s/simplifiable_if_statement.py b/tests/functional/s/simplifiable/simplifiable_if_statement.py
index 4d4c8b5d4..4d4c8b5d4 100644
--- a/tests/functional/s/simplifiable_if_statement.py
+++ b/tests/functional/s/simplifiable/simplifiable_if_statement.py
diff --git a/tests/functional/s/simplifiable_if_statement.txt b/tests/functional/s/simplifiable/simplifiable_if_statement.txt
index aa61f4993..aa61f4993 100644
--- a/tests/functional/s/simplifiable_if_statement.txt
+++ b/tests/functional/s/simplifiable/simplifiable_if_statement.txt
diff --git a/tests/functional/s/simplify_chained_comparison.py b/tests/functional/s/simplifiable/simplify_chained_comparison.py
index 4be9fbe3d..4be9fbe3d 100644
--- a/tests/functional/s/simplify_chained_comparison.py
+++ b/tests/functional/s/simplifiable/simplify_chained_comparison.py
diff --git a/tests/functional/s/simplify_chained_comparison.txt b/tests/functional/s/simplifiable/simplify_chained_comparison.txt
index fe8d3c384..fe8d3c384 100644
--- a/tests/functional/s/simplify_chained_comparison.txt
+++ b/tests/functional/s/simplifiable/simplify_chained_comparison.txt
diff --git a/tests/functional/s/string_formatting.py b/tests/functional/s/string/string_formatting.py
index 8e49d28b4..8e49d28b4 100644
--- a/tests/functional/s/string_formatting.py
+++ b/tests/functional/s/string/string_formatting.py
diff --git a/tests/functional/s/string_formatting.txt b/tests/functional/s/string/string_formatting.txt
index ac67ae47c..ac67ae47c 100644
--- a/tests/functional/s/string_formatting.txt
+++ b/tests/functional/s/string/string_formatting.txt
diff --git a/tests/functional/s/string_formatting_disable.py b/tests/functional/s/string/string_formatting_disable.py
index 88f3dcf03..88f3dcf03 100644
--- a/tests/functional/s/string_formatting_disable.py
+++ b/tests/functional/s/string/string_formatting_disable.py
diff --git a/tests/functional/s/string_formatting_disable.rc b/tests/functional/s/string/string_formatting_disable.rc
index 0193339de..0193339de 100644
--- a/tests/functional/s/string_formatting_disable.rc
+++ b/tests/functional/s/string/string_formatting_disable.rc
diff --git a/tests/functional/s/string_formatting_disable.txt b/tests/functional/s/string/string_formatting_disable.txt
index f6e390f00..f6e390f00 100644
--- a/tests/functional/s/string_formatting_disable.txt
+++ b/tests/functional/s/string/string_formatting_disable.txt
diff --git a/tests/functional/s/string_formatting_failed_inference.py b/tests/functional/s/string/string_formatting_failed_inference.py
index c5add58c8..c5add58c8 100644
--- a/tests/functional/s/string_formatting_failed_inference.py
+++ b/tests/functional/s/string/string_formatting_failed_inference.py
diff --git a/tests/functional/s/string_formatting_failed_inference_py35.py b/tests/functional/s/string/string_formatting_failed_inference_py35.py
index a511ff80e..a511ff80e 100644
--- a/tests/functional/s/string_formatting_failed_inference_py35.py
+++ b/tests/functional/s/string/string_formatting_failed_inference_py35.py
diff --git a/tests/functional/s/string_formatting_failed_inference_py35.rc b/tests/functional/s/string/string_formatting_failed_inference_py35.rc
index 71de8b630..71de8b630 100644
--- a/tests/functional/s/string_formatting_failed_inference_py35.rc
+++ b/tests/functional/s/string/string_formatting_failed_inference_py35.rc
diff --git a/tests/functional/s/string_formatting_py3.py b/tests/functional/s/string/string_formatting_py3.py
index 3cdd60eb2..3cdd60eb2 100644
--- a/tests/functional/s/string_formatting_py3.py
+++ b/tests/functional/s/string/string_formatting_py3.py
diff --git a/tests/functional/s/string_formatting_py3.rc b/tests/functional/s/string/string_formatting_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/s/string_formatting_py3.rc
+++ b/tests/functional/s/string/string_formatting_py3.rc
diff --git a/tests/functional/s/string_formatting_py3.txt b/tests/functional/s/string/string_formatting_py3.txt
index bf90e016b..bf90e016b 100644
--- a/tests/functional/s/string_formatting_py3.txt
+++ b/tests/functional/s/string/string_formatting_py3.txt
diff --git a/tests/functional/s/super_checks.py b/tests/functional/s/super/super_checks.py
index 3f132dff1..3f132dff1 100644
--- a/tests/functional/s/super_checks.py
+++ b/tests/functional/s/super/super_checks.py
diff --git a/tests/functional/s/super_checks.txt b/tests/functional/s/super/super_checks.txt
index bd360c831..bd360c831 100644
--- a/tests/functional/s/super_checks.txt
+++ b/tests/functional/s/super/super_checks.txt
diff --git a/tests/functional/s/super_with_arguments.py b/tests/functional/s/super/super_with_arguments.py
index 8ab7c4d71..8ab7c4d71 100644
--- a/tests/functional/s/super_with_arguments.py
+++ b/tests/functional/s/super/super_with_arguments.py
diff --git a/tests/functional/s/super_with_arguments.rc b/tests/functional/s/super/super_with_arguments.rc
index 0e70163ee..0e70163ee 100644
--- a/tests/functional/s/super_with_arguments.rc
+++ b/tests/functional/s/super/super_with_arguments.rc
diff --git a/tests/functional/s/super_with_arguments.txt b/tests/functional/s/super/super_with_arguments.txt
index f882848f8..f882848f8 100644
--- a/tests/functional/s/super_with_arguments.txt
+++ b/tests/functional/s/super/super_with_arguments.txt
diff --git a/tests/functional/t/too/__init__.py b/tests/functional/t/too/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/functional/t/too/__init__.py
diff --git a/tests/functional/too/too_few_public_methods.py b/tests/functional/t/too/too_few_public_methods.py
index 5ba528f79..5ba528f79 100644
--- a/tests/functional/too/too_few_public_methods.py
+++ b/tests/functional/t/too/too_few_public_methods.py
diff --git a/tests/functional/too/too_few_public_methods.txt b/tests/functional/t/too/too_few_public_methods.txt
index a86ba6d81..a86ba6d81 100644
--- a/tests/functional/too/too_few_public_methods.txt
+++ b/tests/functional/t/too/too_few_public_methods.txt
diff --git a/tests/functional/too/too_few_public_methods_37.py b/tests/functional/t/too/too_few_public_methods_37.py
index 55fc54484..55fc54484 100644
--- a/tests/functional/too/too_few_public_methods_37.py
+++ b/tests/functional/t/too/too_few_public_methods_37.py
diff --git a/tests/functional/too/too_few_public_methods_37.rc b/tests/functional/t/too/too_few_public_methods_37.rc
index a17bb22da..a17bb22da 100644
--- a/tests/functional/too/too_few_public_methods_37.rc
+++ b/tests/functional/t/too/too_few_public_methods_37.rc
diff --git a/tests/functional/too/too_many_ancestors.py b/tests/functional/t/too/too_many_ancestors.py
index a0ae18a02..a0ae18a02 100644
--- a/tests/functional/too/too_many_ancestors.py
+++ b/tests/functional/t/too/too_many_ancestors.py
diff --git a/tests/functional/too/too_many_ancestors.txt b/tests/functional/t/too/too_many_ancestors.txt
index 97c954368..97c954368 100644
--- a/tests/functional/too/too_many_ancestors.txt
+++ b/tests/functional/t/too/too_many_ancestors.txt
diff --git a/tests/functional/too/too_many_arguments.py b/tests/functional/t/too/too_many_arguments.py
index 689745e27..689745e27 100644
--- a/tests/functional/too/too_many_arguments.py
+++ b/tests/functional/t/too/too_many_arguments.py
diff --git a/tests/functional/too/too_many_arguments.txt b/tests/functional/t/too/too_many_arguments.txt
index d4f551634..d4f551634 100644
--- a/tests/functional/too/too_many_arguments.txt
+++ b/tests/functional/t/too/too_many_arguments.txt
diff --git a/tests/functional/too/too_many_arguments_issue_1045.py b/tests/functional/t/too/too_many_arguments_issue_1045.py
index e5aa76d75..e5aa76d75 100644
--- a/tests/functional/too/too_many_arguments_issue_1045.py
+++ b/tests/functional/t/too/too_many_arguments_issue_1045.py
diff --git a/tests/functional/too/too_many_arguments_issue_1045.rc b/tests/functional/t/too/too_many_arguments_issue_1045.rc
index d425e7c47..d425e7c47 100644
--- a/tests/functional/too/too_many_arguments_issue_1045.rc
+++ b/tests/functional/t/too/too_many_arguments_issue_1045.rc
diff --git a/tests/functional/too/too_many_arguments_overload.py b/tests/functional/t/too/too_many_arguments_overload.py
index 1155deb0c..1155deb0c 100644
--- a/tests/functional/too/too_many_arguments_overload.py
+++ b/tests/functional/t/too/too_many_arguments_overload.py
diff --git a/tests/functional/too/too_many_boolean_expressions.py b/tests/functional/t/too/too_many_boolean_expressions.py
index e8753859c..e8753859c 100644
--- a/tests/functional/too/too_many_boolean_expressions.py
+++ b/tests/functional/t/too/too_many_boolean_expressions.py
diff --git a/tests/functional/too/too_many_boolean_expressions.txt b/tests/functional/t/too/too_many_boolean_expressions.txt
index 6055e7437..6055e7437 100644
--- a/tests/functional/too/too_many_boolean_expressions.txt
+++ b/tests/functional/t/too/too_many_boolean_expressions.txt
diff --git a/tests/functional/too/too_many_branches.py b/tests/functional/t/too/too_many_branches.py
index 7b0b068ad..7b0b068ad 100644
--- a/tests/functional/too/too_many_branches.py
+++ b/tests/functional/t/too/too_many_branches.py
diff --git a/tests/functional/too/too_many_branches.txt b/tests/functional/t/too/too_many_branches.txt
index e5bfd4d49..e5bfd4d49 100644
--- a/tests/functional/too/too_many_branches.txt
+++ b/tests/functional/t/too/too_many_branches.txt
diff --git a/tests/functional/too/too_many_instance_attributes.py b/tests/functional/t/too/too_many_instance_attributes.py
index f6703e0b7..f6703e0b7 100644
--- a/tests/functional/too/too_many_instance_attributes.py
+++ b/tests/functional/t/too/too_many_instance_attributes.py
diff --git a/tests/functional/too/too_many_instance_attributes.txt b/tests/functional/t/too/too_many_instance_attributes.txt
index 42c85493c..42c85493c 100644
--- a/tests/functional/too/too_many_instance_attributes.txt
+++ b/tests/functional/t/too/too_many_instance_attributes.txt
diff --git a/tests/functional/too/too_many_lines.py b/tests/functional/t/too/too_many_lines.py
index 78e568c23..78e568c23 100644
--- a/tests/functional/too/too_many_lines.py
+++ b/tests/functional/t/too/too_many_lines.py
diff --git a/tests/functional/too/too_many_lines.txt b/tests/functional/t/too/too_many_lines.txt
index 5c228ac49..5c228ac49 100644
--- a/tests/functional/too/too_many_lines.txt
+++ b/tests/functional/t/too/too_many_lines.txt
diff --git a/tests/functional/too/too_many_lines_disabled.py b/tests/functional/t/too/too_many_lines_disabled.py
index 1b0866db2..1b0866db2 100644
--- a/tests/functional/too/too_many_lines_disabled.py
+++ b/tests/functional/t/too/too_many_lines_disabled.py
diff --git a/tests/functional/too/too_many_locals.py b/tests/functional/t/too/too_many_locals.py
index ac38a9e01..ac38a9e01 100644
--- a/tests/functional/too/too_many_locals.py
+++ b/tests/functional/t/too/too_many_locals.py
diff --git a/tests/functional/too/too_many_locals.txt b/tests/functional/t/too/too_many_locals.txt
index 4af7f0307..4af7f0307 100644
--- a/tests/functional/too/too_many_locals.txt
+++ b/tests/functional/t/too/too_many_locals.txt
diff --git a/tests/functional/too/too_many_nested_blocks.py b/tests/functional/t/too/too_many_nested_blocks.py
index e7c007957..e7c007957 100644
--- a/tests/functional/too/too_many_nested_blocks.py
+++ b/tests/functional/t/too/too_many_nested_blocks.py
diff --git a/tests/functional/too/too_many_nested_blocks.txt b/tests/functional/t/too/too_many_nested_blocks.txt
index 6232b9ff0..6232b9ff0 100644
--- a/tests/functional/too/too_many_nested_blocks.txt
+++ b/tests/functional/t/too/too_many_nested_blocks.txt
diff --git a/tests/functional/too/too_many_public_methods.py b/tests/functional/t/too/too_many_public_methods.py
index 11b4b367d..11b4b367d 100644
--- a/tests/functional/too/too_many_public_methods.py
+++ b/tests/functional/t/too/too_many_public_methods.py
diff --git a/tests/functional/too/too_many_public_methods.txt b/tests/functional/t/too/too_many_public_methods.txt
index 61e47e8eb..61e47e8eb 100644
--- a/tests/functional/too/too_many_public_methods.txt
+++ b/tests/functional/t/too/too_many_public_methods.txt
diff --git a/tests/functional/too/too_many_return_statements.py b/tests/functional/t/too/too_many_return_statements.py
index 66a85da40..66a85da40 100644
--- a/tests/functional/too/too_many_return_statements.py
+++ b/tests/functional/t/too/too_many_return_statements.py
diff --git a/tests/functional/too/too_many_return_statements.txt b/tests/functional/t/too/too_many_return_statements.txt
index 5abbb71b3..5abbb71b3 100644
--- a/tests/functional/too/too_many_return_statements.txt
+++ b/tests/functional/t/too/too_many_return_statements.txt
diff --git a/tests/functional/too/too_many_star_expressions.py b/tests/functional/t/too/too_many_star_expressions.py
index c1bbfb9d3..c1bbfb9d3 100644
--- a/tests/functional/too/too_many_star_expressions.py
+++ b/tests/functional/t/too/too_many_star_expressions.py
diff --git a/tests/functional/too/too_many_star_expressions.rc b/tests/functional/t/too/too_many_star_expressions.rc
index c093be204..c093be204 100644
--- a/tests/functional/too/too_many_star_expressions.rc
+++ b/tests/functional/t/too/too_many_star_expressions.rc
diff --git a/tests/functional/too/too_many_star_expressions.txt b/tests/functional/t/too/too_many_star_expressions.txt
index d1e74b624..d1e74b624 100644
--- a/tests/functional/too/too_many_star_expressions.txt
+++ b/tests/functional/t/too/too_many_star_expressions.txt
diff --git a/tests/functional/too/too_many_statements.py b/tests/functional/t/too/too_many_statements.py
index b3e2fd796..b3e2fd796 100644
--- a/tests/functional/too/too_many_statements.py
+++ b/tests/functional/t/too/too_many_statements.py
diff --git a/tests/functional/too/too_many_statements.txt b/tests/functional/t/too/too_many_statements.txt
index c48f14e50..c48f14e50 100644
--- a/tests/functional/too/too_many_statements.txt
+++ b/tests/functional/t/too/too_many_statements.txt
diff --git a/tests/functional/u/undefined_loop_variable.py b/tests/functional/u/undefined/undefined_loop_variable.py
index a984898f8..a984898f8 100644
--- a/tests/functional/u/undefined_loop_variable.py
+++ b/tests/functional/u/undefined/undefined_loop_variable.py
diff --git a/tests/functional/u/undefined_loop_variable.txt b/tests/functional/u/undefined/undefined_loop_variable.txt
index ea194e769..ea194e769 100644
--- a/tests/functional/u/undefined_loop_variable.txt
+++ b/tests/functional/u/undefined/undefined_loop_variable.txt
diff --git a/tests/functional/u/undefined_variable.py b/tests/functional/u/undefined/undefined_variable.py
index 7fe205cc9..7fe205cc9 100644
--- a/tests/functional/u/undefined_variable.py
+++ b/tests/functional/u/undefined/undefined_variable.py
diff --git a/tests/functional/u/undefined_variable.txt b/tests/functional/u/undefined/undefined_variable.txt
index 384a3a306..384a3a306 100644
--- a/tests/functional/u/undefined_variable.txt
+++ b/tests/functional/u/undefined/undefined_variable.txt
diff --git a/tests/functional/u/undefined_variable_crash_on_attribute.py b/tests/functional/u/undefined/undefined_variable_crash_on_attribute.py
index 571efab1c..571efab1c 100644
--- a/tests/functional/u/undefined_variable_crash_on_attribute.py
+++ b/tests/functional/u/undefined/undefined_variable_crash_on_attribute.py
diff --git a/tests/functional/u/undefined_variable_py30.py b/tests/functional/u/undefined/undefined_variable_py30.py
index 78d6dd3ea..78d6dd3ea 100644
--- a/tests/functional/u/undefined_variable_py30.py
+++ b/tests/functional/u/undefined/undefined_variable_py30.py
diff --git a/tests/functional/u/undefined_variable_py30.rc b/tests/functional/u/undefined/undefined_variable_py30.rc
index c093be204..c093be204 100644
--- a/tests/functional/u/undefined_variable_py30.rc
+++ b/tests/functional/u/undefined/undefined_variable_py30.rc
diff --git a/tests/functional/u/undefined_variable_py30.txt b/tests/functional/u/undefined/undefined_variable_py30.txt
index e40ecd1bc..e40ecd1bc 100644
--- a/tests/functional/u/undefined_variable_py30.txt
+++ b/tests/functional/u/undefined/undefined_variable_py30.txt
diff --git a/tests/functional/u/unnecessary_comprehension.py b/tests/functional/u/unnecessary/unnecessary_comprehension.py
index 8e40c5925..8e40c5925 100644
--- a/tests/functional/u/unnecessary_comprehension.py
+++ b/tests/functional/u/unnecessary/unnecessary_comprehension.py
diff --git a/tests/functional/u/unnecessary_comprehension.txt b/tests/functional/u/unnecessary/unnecessary_comprehension.txt
index 47d6d2b59..47d6d2b59 100644
--- a/tests/functional/u/unnecessary_comprehension.txt
+++ b/tests/functional/u/unnecessary/unnecessary_comprehension.txt
diff --git a/tests/functional/u/unnecessary_lambda.py b/tests/functional/u/unnecessary/unnecessary_lambda.py
index f0bd775f3..f0bd775f3 100644
--- a/tests/functional/u/unnecessary_lambda.py
+++ b/tests/functional/u/unnecessary/unnecessary_lambda.py
diff --git a/tests/functional/u/unnecessary_lambda.txt b/tests/functional/u/unnecessary/unnecessary_lambda.txt
index c3983b195..c3983b195 100644
--- a/tests/functional/u/unnecessary_lambda.txt
+++ b/tests/functional/u/unnecessary/unnecessary_lambda.txt
diff --git a/tests/functional/u/unneeded_not.py b/tests/functional/u/unnecessary/unnecessary_not.py
index 97acecd73..97acecd73 100644
--- a/tests/functional/u/unneeded_not.py
+++ b/tests/functional/u/unnecessary/unnecessary_not.py
diff --git a/tests/functional/u/unneeded_not.txt b/tests/functional/u/unnecessary/unnecessary_not.txt
index 722f26d40..722f26d40 100644
--- a/tests/functional/u/unneeded_not.txt
+++ b/tests/functional/u/unnecessary/unnecessary_not.txt
diff --git a/tests/functional/u/unnecessary_pass.py b/tests/functional/u/unnecessary/unnecessary_pass.py
index c2733096a..c2733096a 100644
--- a/tests/functional/u/unnecessary_pass.py
+++ b/tests/functional/u/unnecessary/unnecessary_pass.py
diff --git a/tests/functional/u/unnecessary_pass.txt b/tests/functional/u/unnecessary/unnecessary_pass.txt
index 6eabcf5bd..6eabcf5bd 100644
--- a/tests/functional/u/unnecessary_pass.txt
+++ b/tests/functional/u/unnecessary/unnecessary_pass.txt
diff --git a/tests/functional/u/unsupported_assignment_operation.py b/tests/functional/u/unsupported/unsupported_assignment_operation.py
index c0b58668a..c0b58668a 100644
--- a/tests/functional/u/unsupported_assignment_operation.py
+++ b/tests/functional/u/unsupported/unsupported_assignment_operation.py
diff --git a/tests/functional/u/unsupported_assignment_operation.rc b/tests/functional/u/unsupported/unsupported_assignment_operation.rc
index 6a8ee96ca..6a8ee96ca 100644
--- a/tests/functional/u/unsupported_assignment_operation.rc
+++ b/tests/functional/u/unsupported/unsupported_assignment_operation.rc
diff --git a/tests/functional/u/unsupported_assignment_operation.txt b/tests/functional/u/unsupported/unsupported_assignment_operation.txt
index 854e8bfec..854e8bfec 100644
--- a/tests/functional/u/unsupported_assignment_operation.txt
+++ b/tests/functional/u/unsupported/unsupported_assignment_operation.txt
diff --git a/tests/functional/u/unsupported_binary_operation.py b/tests/functional/u/unsupported/unsupported_binary_operation.py
index 0bfe1d16a..0bfe1d16a 100644
--- a/tests/functional/u/unsupported_binary_operation.py
+++ b/tests/functional/u/unsupported/unsupported_binary_operation.py
diff --git a/tests/functional/u/unsupported_binary_operation.rc b/tests/functional/u/unsupported/unsupported_binary_operation.rc
index 401ccfe27..401ccfe27 100644
--- a/tests/functional/u/unsupported_binary_operation.rc
+++ b/tests/functional/u/unsupported/unsupported_binary_operation.rc
diff --git a/tests/functional/u/unsupported_binary_operation.txt b/tests/functional/u/unsupported/unsupported_binary_operation.txt
index 00e43cbdc..00e43cbdc 100644
--- a/tests/functional/u/unsupported_binary_operation.txt
+++ b/tests/functional/u/unsupported/unsupported_binary_operation.txt
diff --git a/tests/functional/u/unsupported_delete_operation.py b/tests/functional/u/unsupported/unsupported_delete_operation.py
index 3c2882a64..3c2882a64 100644
--- a/tests/functional/u/unsupported_delete_operation.py
+++ b/tests/functional/u/unsupported/unsupported_delete_operation.py
diff --git a/tests/functional/u/unsupported_delete_operation.rc b/tests/functional/u/unsupported/unsupported_delete_operation.rc
index 6a8ee96ca..6a8ee96ca 100644
--- a/tests/functional/u/unsupported_delete_operation.rc
+++ b/tests/functional/u/unsupported/unsupported_delete_operation.rc
diff --git a/tests/functional/u/unsupported_delete_operation.txt b/tests/functional/u/unsupported/unsupported_delete_operation.txt
index 6ad92eb33..6ad92eb33 100644
--- a/tests/functional/u/unsupported_delete_operation.txt
+++ b/tests/functional/u/unsupported/unsupported_delete_operation.txt
diff --git a/tests/functional/u/unused/__init__.py b/tests/functional/u/unused/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/functional/u/unused/__init__.py
diff --git a/tests/functional/u/unused_argument.py b/tests/functional/u/unused/unused_argument.py
index 013d4b3e5..013d4b3e5 100644
--- a/tests/functional/u/unused_argument.py
+++ b/tests/functional/u/unused/unused_argument.py
diff --git a/tests/functional/u/unused_argument.txt b/tests/functional/u/unused/unused_argument.txt
index a30ff2259..a30ff2259 100644
--- a/tests/functional/u/unused_argument.txt
+++ b/tests/functional/u/unused/unused_argument.txt
diff --git a/tests/functional/u/unused_argument_py3.py b/tests/functional/u/unused/unused_argument_py3.py
index 4d0fd9adc..4d0fd9adc 100644
--- a/tests/functional/u/unused_argument_py3.py
+++ b/tests/functional/u/unused/unused_argument_py3.py
diff --git a/tests/functional/u/unused_argument_py3.rc b/tests/functional/u/unused/unused_argument_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/u/unused_argument_py3.rc
+++ b/tests/functional/u/unused/unused_argument_py3.rc
diff --git a/tests/functional/u/unused_argument_py3.txt b/tests/functional/u/unused/unused_argument_py3.txt
index 2bddb5184..2bddb5184 100644
--- a/tests/functional/u/unused_argument_py3.txt
+++ b/tests/functional/u/unused/unused_argument_py3.txt
diff --git a/tests/functional/u/unused_global_variable1.py b/tests/functional/u/unused/unused_global_variable1.py
index e630c3337..e630c3337 100644
--- a/tests/functional/u/unused_global_variable1.py
+++ b/tests/functional/u/unused/unused_global_variable1.py
diff --git a/tests/functional/u/unused_global_variable2.py b/tests/functional/u/unused/unused_global_variable2.py
index 62224096e..62224096e 100644
--- a/tests/functional/u/unused_global_variable2.py
+++ b/tests/functional/u/unused/unused_global_variable2.py
diff --git a/tests/functional/u/unused_global_variable2.rc b/tests/functional/u/unused/unused_global_variable2.rc
index 5dcd4a84c..5dcd4a84c 100644
--- a/tests/functional/u/unused_global_variable2.rc
+++ b/tests/functional/u/unused/unused_global_variable2.rc
diff --git a/tests/functional/u/unused_global_variable2.txt b/tests/functional/u/unused/unused_global_variable2.txt
index a670aa0e0..a670aa0e0 100644
--- a/tests/functional/u/unused_global_variable2.txt
+++ b/tests/functional/u/unused/unused_global_variable2.txt
diff --git a/tests/functional/u/unused_global_variable3.py b/tests/functional/u/unused/unused_global_variable3.py
index 896789eda..896789eda 100644
--- a/tests/functional/u/unused_global_variable3.py
+++ b/tests/functional/u/unused/unused_global_variable3.py
diff --git a/tests/functional/u/unused_global_variable4.py b/tests/functional/u/unused/unused_global_variable4.py
index aef49d68c..aef49d68c 100644
--- a/tests/functional/u/unused_global_variable4.py
+++ b/tests/functional/u/unused/unused_global_variable4.py
diff --git a/tests/functional/u/unused_global_variable4.rc b/tests/functional/u/unused/unused_global_variable4.rc
index 5dcd4a84c..5dcd4a84c 100644
--- a/tests/functional/u/unused_global_variable4.rc
+++ b/tests/functional/u/unused/unused_global_variable4.rc
diff --git a/tests/functional/u/unused_global_variable4.txt b/tests/functional/u/unused/unused_global_variable4.txt
index 67e6da979..67e6da979 100644
--- a/tests/functional/u/unused_global_variable4.txt
+++ b/tests/functional/u/unused/unused_global_variable4.txt
diff --git a/tests/functional/u/unused_import.py b/tests/functional/u/unused/unused_import.py
index 752f07ca8..752f07ca8 100644
--- a/tests/functional/u/unused_import.py
+++ b/tests/functional/u/unused/unused_import.py
diff --git a/tests/functional/u/unused_import.txt b/tests/functional/u/unused/unused_import.txt
index 2dc892d9e..2dc892d9e 100644
--- a/tests/functional/u/unused_import.txt
+++ b/tests/functional/u/unused/unused_import.txt
diff --git a/tests/functional/u/unused_import_assigned_to.py b/tests/functional/u/unused/unused_import_assigned_to.py
index 81d3e2ce0..81d3e2ce0 100644
--- a/tests/functional/u/unused_import_assigned_to.py
+++ b/tests/functional/u/unused/unused_import_assigned_to.py
diff --git a/tests/functional/u/unused_import_everything_disabled.py b/tests/functional/u/unused/unused_import_everything_disabled.py
index 7d6cce74c..7d6cce74c 100644
--- a/tests/functional/u/unused_import_everything_disabled.py
+++ b/tests/functional/u/unused/unused_import_everything_disabled.py
diff --git a/tests/functional/u/unused_import_everything_disabled.rc b/tests/functional/u/unused/unused_import_everything_disabled.rc
index a9f89cf84..a9f89cf84 100644
--- a/tests/functional/u/unused_import_everything_disabled.rc
+++ b/tests/functional/u/unused/unused_import_everything_disabled.rc
diff --git a/tests/functional/u/unused_import_positional_only_py38.py b/tests/functional/u/unused/unused_import_positional_only_py38.py
index 693a377d9..693a377d9 100644
--- a/tests/functional/u/unused_import_positional_only_py38.py
+++ b/tests/functional/u/unused/unused_import_positional_only_py38.py
diff --git a/tests/functional/u/unused_import_positional_only_py38.rc b/tests/functional/u/unused/unused_import_positional_only_py38.rc
index 85fc502b3..85fc502b3 100644
--- a/tests/functional/u/unused_import_positional_only_py38.rc
+++ b/tests/functional/u/unused/unused_import_positional_only_py38.rc
diff --git a/tests/functional/u/unused_typing_imports.py b/tests/functional/u/unused/unused_typing_imports.py
index 7de4e411b..7de4e411b 100644
--- a/tests/functional/u/unused_typing_imports.py
+++ b/tests/functional/u/unused/unused_typing_imports.py
diff --git a/tests/functional/u/unused_typing_imports.rc b/tests/functional/u/unused/unused_typing_imports.rc
index b239d6e2e..b239d6e2e 100644
--- a/tests/functional/u/unused_typing_imports.rc
+++ b/tests/functional/u/unused/unused_typing_imports.rc
diff --git a/tests/functional/u/unused_variable.py b/tests/functional/u/unused/unused_variable.py
index e57e2abb1..e57e2abb1 100644
--- a/tests/functional/u/unused_variable.py
+++ b/tests/functional/u/unused/unused_variable.py
diff --git a/tests/functional/u/unused_variable.txt b/tests/functional/u/unused/unused_variable.txt
index c11bc0dcc..c11bc0dcc 100644
--- a/tests/functional/u/unused_variable.txt
+++ b/tests/functional/u/unused/unused_variable.txt
diff --git a/tests/functional/u/unused_variable_py36.py b/tests/functional/u/unused/unused_variable_py36.py
index 396d02805..396d02805 100644
--- a/tests/functional/u/unused_variable_py36.py
+++ b/tests/functional/u/unused/unused_variable_py36.py
diff --git a/tests/functional/u/unused_variable_py36.rc b/tests/functional/u/unused/unused_variable_py36.rc
index 0ba2b6333..0ba2b6333 100644
--- a/tests/functional/u/unused_variable_py36.rc
+++ b/tests/functional/u/unused/unused_variable_py36.rc
diff --git a/tests/functional/u/use_a_generator.py b/tests/functional/u/use/use_a_generator.py
index 279deb46f..279deb46f 100644
--- a/tests/functional/u/use_a_generator.py
+++ b/tests/functional/u/use/use_a_generator.py
diff --git a/tests/functional/u/use_a_generator.txt b/tests/functional/u/use/use_a_generator.txt
index e7be228f0..e7be228f0 100644
--- a/tests/functional/u/use_a_generator.txt
+++ b/tests/functional/u/use/use_a_generator.txt
diff --git a/tests/functional/u/used_before_assignment_488.py b/tests/functional/u/use/used_before_assignment_488.py
index efc133c2b..efc133c2b 100644
--- a/tests/functional/u/used_before_assignment_488.py
+++ b/tests/functional/u/use/used_before_assignment_488.py
diff --git a/tests/functional/u/used_before_assignment_issue1081.py b/tests/functional/u/use/used_before_assignment_issue1081.py
index 0c59ccebe..0c59ccebe 100644
--- a/tests/functional/u/used_before_assignment_issue1081.py
+++ b/tests/functional/u/use/used_before_assignment_issue1081.py
diff --git a/tests/functional/u/used_before_assignment_issue1081.txt b/tests/functional/u/use/used_before_assignment_issue1081.txt
index 4d43c4ad2..4d43c4ad2 100644
--- a/tests/functional/u/used_before_assignment_issue1081.txt
+++ b/tests/functional/u/use/used_before_assignment_issue1081.txt
diff --git a/tests/functional/u/used_before_assignment_issue853.py b/tests/functional/u/use/used_before_assignment_issue853.py
index f8b412252..f8b412252 100644
--- a/tests/functional/u/used_before_assignment_issue853.py
+++ b/tests/functional/u/use/used_before_assignment_issue853.py
diff --git a/tests/functional/u/used_before_assignment_nonlocal.py b/tests/functional/u/use/used_before_assignment_nonlocal.py
index 5cbdd510c..5cbdd510c 100644
--- a/tests/functional/u/used_before_assignment_nonlocal.py
+++ b/tests/functional/u/use/used_before_assignment_nonlocal.py
diff --git a/tests/functional/u/used_before_assignment_nonlocal.rc b/tests/functional/u/use/used_before_assignment_nonlocal.rc
index c093be204..c093be204 100644
--- a/tests/functional/u/used_before_assignment_nonlocal.rc
+++ b/tests/functional/u/use/used_before_assignment_nonlocal.rc
diff --git a/tests/functional/u/used_before_assignment_nonlocal.txt b/tests/functional/u/use/used_before_assignment_nonlocal.txt
index 59aa0756d..59aa0756d 100644
--- a/tests/functional/u/used_before_assignment_nonlocal.txt
+++ b/tests/functional/u/use/used_before_assignment_nonlocal.txt
diff --git a/tests/functional/u/used_prior_global_declaration.py b/tests/functional/u/use/used_prior_global_declaration.py
index 079501022..079501022 100644
--- a/tests/functional/u/used_prior_global_declaration.py
+++ b/tests/functional/u/use/used_prior_global_declaration.py
diff --git a/tests/functional/u/used_prior_global_declaration.rc b/tests/functional/u/use/used_prior_global_declaration.rc
index 0ba2b6333..0ba2b6333 100644
--- a/tests/functional/u/used_prior_global_declaration.rc
+++ b/tests/functional/u/use/used_prior_global_declaration.rc
diff --git a/tests/functional/u/used_prior_global_declaration.txt b/tests/functional/u/use/used_prior_global_declaration.txt
index 2354e0ef8..2354e0ef8 100644
--- a/tests/functional/u/used_prior_global_declaration.txt
+++ b/tests/functional/u/use/used_prior_global_declaration.txt
diff --git a/tests/functional/u/using_constant_test.py b/tests/functional/u/use/using_constant_test.py
index df7b56237..df7b56237 100644
--- a/tests/functional/u/using_constant_test.py
+++ b/tests/functional/u/use/using_constant_test.py
diff --git a/tests/functional/u/using_constant_test.txt b/tests/functional/u/use/using_constant_test.txt
index b3047955b..b3047955b 100644
--- a/tests/functional/u/using_constant_test.txt
+++ b/tests/functional/u/use/using_constant_test.txt
diff --git a/tests/functional/u/useless-import-alias.py b/tests/functional/u/useless/useless-import-alias.py
index c8ef8374d..c8ef8374d 100644
--- a/tests/functional/u/useless-import-alias.py
+++ b/tests/functional/u/useless/useless-import-alias.py
diff --git a/tests/functional/u/useless-import-alias.txt b/tests/functional/u/useless/useless-import-alias.txt
index bc99952ac..bc99952ac 100644
--- a/tests/functional/u/useless-import-alias.txt
+++ b/tests/functional/u/useless/useless-import-alias.txt
diff --git a/tests/functional/u/useless_else_on_loop.py b/tests/functional/u/useless/useless_else_on_loop.py
index d686f4658..d686f4658 100644
--- a/tests/functional/u/useless_else_on_loop.py
+++ b/tests/functional/u/useless/useless_else_on_loop.py
diff --git a/tests/functional/u/useless_else_on_loop.txt b/tests/functional/u/useless/useless_else_on_loop.txt
index dff8e318a..dff8e318a 100644
--- a/tests/functional/u/useless_else_on_loop.txt
+++ b/tests/functional/u/useless/useless_else_on_loop.txt
diff --git a/tests/functional/u/useless_object_inheritance.py b/tests/functional/u/useless/useless_object_inheritance.py
index 562c81f6a..562c81f6a 100644
--- a/tests/functional/u/useless_object_inheritance.py
+++ b/tests/functional/u/useless/useless_object_inheritance.py
diff --git a/tests/functional/u/useless_object_inheritance.txt b/tests/functional/u/useless/useless_object_inheritance.txt
index 1b18607fa..1b18607fa 100644
--- a/tests/functional/u/useless_object_inheritance.txt
+++ b/tests/functional/u/useless/useless_object_inheritance.txt
diff --git a/tests/functional/u/useless_return.py b/tests/functional/u/useless/useless_return.py
index 61aaebe7a..61aaebe7a 100644
--- a/tests/functional/u/useless_return.py
+++ b/tests/functional/u/useless/useless_return.py
diff --git a/tests/functional/u/useless_return.txt b/tests/functional/u/useless/useless_return.txt
index 9299b458a..9299b458a 100644
--- a/tests/functional/u/useless_return.txt
+++ b/tests/functional/u/useless/useless_return.txt
diff --git a/tests/functional/u/useless_super_delegation.py b/tests/functional/u/useless/useless_super_delegation.py
index 002c7eb03..002c7eb03 100644
--- a/tests/functional/u/useless_super_delegation.py
+++ b/tests/functional/u/useless/useless_super_delegation.py
diff --git a/tests/functional/u/useless_super_delegation.txt b/tests/functional/u/useless/useless_super_delegation.txt
index d2dae5603..d2dae5603 100644
--- a/tests/functional/u/useless_super_delegation.txt
+++ b/tests/functional/u/useless/useless_super_delegation.txt
diff --git a/tests/functional/u/useless_super_delegation_py3.py b/tests/functional/u/useless/useless_super_delegation_py3.py
index b32ced873..b32ced873 100644
--- a/tests/functional/u/useless_super_delegation_py3.py
+++ b/tests/functional/u/useless/useless_super_delegation_py3.py
diff --git a/tests/functional/u/useless_super_delegation_py3.rc b/tests/functional/u/useless/useless_super_delegation_py3.rc
index c093be204..c093be204 100644
--- a/tests/functional/u/useless_super_delegation_py3.rc
+++ b/tests/functional/u/useless/useless_super_delegation_py3.rc
diff --git a/tests/functional/u/useless_super_delegation_py3.txt b/tests/functional/u/useless/useless_super_delegation_py3.txt
index 3a1fdaa1a..3a1fdaa1a 100644
--- a/tests/functional/u/useless_super_delegation_py3.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py3.txt
diff --git a/tests/functional/u/useless_super_delegation_py35.py b/tests/functional/u/useless/useless_super_delegation_py35.py
index 16030f8a4..16030f8a4 100644
--- a/tests/functional/u/useless_super_delegation_py35.py
+++ b/tests/functional/u/useless/useless_super_delegation_py35.py
diff --git a/tests/functional/u/useless_super_delegation_py35.rc b/tests/functional/u/useless/useless_super_delegation_py35.rc
index 71de8b630..71de8b630 100644
--- a/tests/functional/u/useless_super_delegation_py35.rc
+++ b/tests/functional/u/useless/useless_super_delegation_py35.rc
diff --git a/tests/functional/u/useless_super_delegation_py35.txt b/tests/functional/u/useless/useless_super_delegation_py35.txt
index 672ce197e..672ce197e 100644
--- a/tests/functional/u/useless_super_delegation_py35.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py35.txt
diff --git a/tests/functional/u/useless_super_delegation_py38.py b/tests/functional/u/useless/useless_super_delegation_py38.py
index ec402299f..ec402299f 100644
--- a/tests/functional/u/useless_super_delegation_py38.py
+++ b/tests/functional/u/useless/useless_super_delegation_py38.py
diff --git a/tests/functional/u/useless_super_delegation_py38.rc b/tests/functional/u/useless/useless_super_delegation_py38.rc
index 85fc502b3..85fc502b3 100644
--- a/tests/functional/u/useless_super_delegation_py38.rc
+++ b/tests/functional/u/useless/useless_super_delegation_py38.rc
diff --git a/tests/functional/u/useless_super_delegation_py38.txt b/tests/functional/u/useless/useless_super_delegation_py38.txt
index 333444554..333444554 100644
--- a/tests/functional/u/useless_super_delegation_py38.txt
+++ b/tests/functional/u/useless/useless_super_delegation_py38.txt
diff --git a/tests/test_self.py b/tests/test_self.py
index 954aa95d7..b3d8927b9 100644
--- a/tests/test_self.py
+++ b/tests/test_self.py
@@ -60,6 +60,9 @@ from pylint.utils import utils
 
 HERE = abspath(dirname(__file__))
 CLEAN_PATH = re.escape(dirname(dirname(__file__)) + os.path.sep)
+UNNECESSARY_LAMBDA = join(
+    HERE, "functional", "u", "unnecessary", "unnecessary_lambda.py"
+)
 
 
 @contextlib.contextmanager
@@ -285,17 +288,11 @@ class TestRunTC:
     def test_py3k_option(self):
         # Test that --py3k flag works.
         rc_code = 0
-        self._runtest(
-            [join(HERE, "functional", "u", "unnecessary_lambda.py"), "--py3k"],
-            code=rc_code,
-        )
+        self._runtest([UNNECESSARY_LAMBDA, "--py3k"], code=rc_code)
 
     def test_py3k_jobs_option(self):
         rc_code = 0
-        self._runtest(
-            [join(HERE, "functional", "u", "unnecessary_lambda.py"), "--py3k", "-j 2"],
-            code=rc_code,
-        )
+        self._runtest([UNNECESSARY_LAMBDA, "--py3k", "-j 2"], code=rc_code)
 
     def test_abbreviations_are_not_supported(self):
         expected = "no such option: --load-plugin"