diff --git a/tests/modeltests/aggregation/__init__.py b/tests/admin_changelist/__init__.py
similarity index 100%
rename from tests/modeltests/aggregation/__init__.py
rename to tests/admin_changelist/__init__.py
diff --git a/tests/regressiontests/admin_changelist/admin.py b/tests/admin_changelist/admin.py
similarity index 100%
rename from tests/regressiontests/admin_changelist/admin.py
rename to tests/admin_changelist/admin.py
diff --git a/tests/regressiontests/admin_changelist/models.py b/tests/admin_changelist/models.py
similarity index 100%
rename from tests/regressiontests/admin_changelist/models.py
rename to tests/admin_changelist/models.py
diff --git a/tests/regressiontests/admin_changelist/tests.py b/tests/admin_changelist/tests.py
similarity index 100%
rename from tests/regressiontests/admin_changelist/tests.py
rename to tests/admin_changelist/tests.py
diff --git a/tests/regressiontests/admin_changelist/urls.py b/tests/admin_changelist/urls.py
similarity index 100%
rename from tests/regressiontests/admin_changelist/urls.py
rename to tests/admin_changelist/urls.py
diff --git a/tests/modeltests/distinct_on_fields/__init__.py b/tests/admin_custom_urls/__init__.py
similarity index 100%
rename from tests/modeltests/distinct_on_fields/__init__.py
rename to tests/admin_custom_urls/__init__.py
diff --git a/tests/regressiontests/admin_custom_urls/fixtures/actions.json b/tests/admin_custom_urls/fixtures/actions.json
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/fixtures/actions.json
rename to tests/admin_custom_urls/fixtures/actions.json
diff --git a/tests/regressiontests/admin_custom_urls/fixtures/users.json b/tests/admin_custom_urls/fixtures/users.json
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/fixtures/users.json
rename to tests/admin_custom_urls/fixtures/users.json
diff --git a/tests/regressiontests/admin_custom_urls/models.py b/tests/admin_custom_urls/models.py
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/models.py
rename to tests/admin_custom_urls/models.py
diff --git a/tests/regressiontests/admin_custom_urls/tests.py b/tests/admin_custom_urls/tests.py
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/tests.py
rename to tests/admin_custom_urls/tests.py
diff --git a/tests/regressiontests/admin_custom_urls/urls.py b/tests/admin_custom_urls/urls.py
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/urls.py
rename to tests/admin_custom_urls/urls.py
diff --git a/tests/modeltests/base/__init__.py b/tests/admin_filters/__init__.py
similarity index 100%
rename from tests/modeltests/base/__init__.py
rename to tests/admin_filters/__init__.py
diff --git a/tests/regressiontests/admin_filters/models.py b/tests/admin_filters/models.py
similarity index 100%
rename from tests/regressiontests/admin_filters/models.py
rename to tests/admin_filters/models.py
diff --git a/tests/regressiontests/admin_filters/tests.py b/tests/admin_filters/tests.py
similarity index 100%
rename from tests/regressiontests/admin_filters/tests.py
rename to tests/admin_filters/tests.py
diff --git a/tests/modeltests/basic/__init__.py b/tests/admin_inlines/__init__.py
similarity index 100%
rename from tests/modeltests/basic/__init__.py
rename to tests/admin_inlines/__init__.py
diff --git a/tests/regressiontests/admin_inlines/admin.py b/tests/admin_inlines/admin.py
similarity index 100%
rename from tests/regressiontests/admin_inlines/admin.py
rename to tests/admin_inlines/admin.py
diff --git a/tests/regressiontests/admin_inlines/fixtures/admin-views-users.xml b/tests/admin_inlines/fixtures/admin-views-users.xml
similarity index 100%
rename from tests/regressiontests/admin_inlines/fixtures/admin-views-users.xml
rename to tests/admin_inlines/fixtures/admin-views-users.xml
diff --git a/tests/regressiontests/admin_inlines/models.py b/tests/admin_inlines/models.py
similarity index 100%
rename from tests/regressiontests/admin_inlines/models.py
rename to tests/admin_inlines/models.py
diff --git a/tests/regressiontests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
similarity index 100%
rename from tests/regressiontests/admin_inlines/tests.py
rename to tests/admin_inlines/tests.py
diff --git a/tests/regressiontests/admin_inlines/urls.py b/tests/admin_inlines/urls.py
similarity index 100%
rename from tests/regressiontests/admin_inlines/urls.py
rename to tests/admin_inlines/urls.py
diff --git a/tests/modeltests/choices/__init__.py b/tests/admin_ordering/__init__.py
similarity index 100%
rename from tests/modeltests/choices/__init__.py
rename to tests/admin_ordering/__init__.py
diff --git a/tests/regressiontests/admin_ordering/models.py b/tests/admin_ordering/models.py
similarity index 100%
rename from tests/regressiontests/admin_ordering/models.py
rename to tests/admin_ordering/models.py
diff --git a/tests/regressiontests/admin_ordering/tests.py b/tests/admin_ordering/tests.py
similarity index 100%
rename from tests/regressiontests/admin_ordering/tests.py
rename to tests/admin_ordering/tests.py
diff --git a/tests/modeltests/custom_columns/__init__.py b/tests/admin_registration/__init__.py
similarity index 100%
rename from tests/modeltests/custom_columns/__init__.py
rename to tests/admin_registration/__init__.py
diff --git a/tests/regressiontests/admin_registration/models.py b/tests/admin_registration/models.py
similarity index 100%
rename from tests/regressiontests/admin_registration/models.py
rename to tests/admin_registration/models.py
diff --git a/tests/regressiontests/admin_registration/tests.py b/tests/admin_registration/tests.py
similarity index 100%
rename from tests/regressiontests/admin_registration/tests.py
rename to tests/admin_registration/tests.py
diff --git a/tests/modeltests/custom_managers/__init__.py b/tests/admin_scripts/__init__.py
similarity index 100%
rename from tests/modeltests/custom_managers/__init__.py
rename to tests/admin_scripts/__init__.py
diff --git a/tests/modeltests/custom_methods/__init__.py b/tests/admin_scripts/app_with_import/__init__.py
similarity index 100%
rename from tests/modeltests/custom_methods/__init__.py
rename to tests/admin_scripts/app_with_import/__init__.py
diff --git a/tests/regressiontests/admin_scripts/app_with_import/models.py b/tests/admin_scripts/app_with_import/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/app_with_import/models.py
rename to tests/admin_scripts/app_with_import/models.py
diff --git a/tests/modeltests/custom_pk/__init__.py b/tests/admin_scripts/broken_app/__init__.py
similarity index 100%
rename from tests/modeltests/custom_pk/__init__.py
rename to tests/admin_scripts/broken_app/__init__.py
diff --git a/tests/regressiontests/admin_scripts/broken_app/models.py b/tests/admin_scripts/broken_app/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/broken_app/models.py
rename to tests/admin_scripts/broken_app/models.py
diff --git a/tests/modeltests/defer/__init__.py b/tests/admin_scripts/complex_app/__init__.py
similarity index 100%
rename from tests/modeltests/defer/__init__.py
rename to tests/admin_scripts/complex_app/__init__.py
diff --git a/tests/modeltests/delete/__init__.py b/tests/admin_scripts/complex_app/admin/__init__.py
similarity index 100%
rename from tests/modeltests/delete/__init__.py
rename to tests/admin_scripts/complex_app/admin/__init__.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py b/tests/admin_scripts/complex_app/admin/foo.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/admin/foo.py
rename to tests/admin_scripts/complex_app/admin/foo.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/__init__.py b/tests/admin_scripts/complex_app/models/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/models/__init__.py
rename to tests/admin_scripts/complex_app/models/__init__.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/bar.py b/tests/admin_scripts/complex_app/models/bar.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/models/bar.py
rename to tests/admin_scripts/complex_app/models/bar.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/foo.py b/tests/admin_scripts/complex_app/models/foo.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/models/foo.py
rename to tests/admin_scripts/complex_app/models/foo.py
diff --git a/tests/modeltests/empty/__init__.py b/tests/admin_scripts/custom_templates/app_template/__init__.py
similarity index 100%
rename from tests/modeltests/empty/__init__.py
rename to tests/admin_scripts/custom_templates/app_template/__init__.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/app_template/api.py b/tests/admin_scripts/custom_templates/app_template/api.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/app_template/api.py
rename to tests/admin_scripts/custom_templates/app_template/api.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/app_template/models.py b/tests/admin_scripts/custom_templates/app_template/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/app_template/models.py
rename to tests/admin_scripts/custom_templates/app_template/models.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template.tgz b/tests/admin_scripts/custom_templates/project_template.tgz
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template.tgz
rename to tests/admin_scripts/custom_templates/project_template.tgz
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/Procfile b/tests/admin_scripts/custom_templates/project_template/additional_dir/Procfile
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/Procfile
rename to tests/admin_scripts/custom_templates/project_template/additional_dir/Procfile
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py b/tests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py
rename to tests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/extra.py b/tests/admin_scripts/custom_templates/project_template/additional_dir/extra.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/extra.py
rename to tests/admin_scripts/custom_templates/project_template/additional_dir/extra.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt b/tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt
rename to tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/manage.py b/tests/admin_scripts/custom_templates/project_template/manage.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/manage.py
rename to tests/admin_scripts/custom_templates/project_template/manage.py
diff --git a/tests/modeltests/empty/no_models/__init__.py b/tests/admin_scripts/custom_templates/project_template/project_name/__init__.py
similarity index 100%
rename from tests/modeltests/empty/no_models/__init__.py
rename to tests/admin_scripts/custom_templates/project_template/project_name/__init__.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/project_name/settings.py b/tests/admin_scripts/custom_templates/project_template/project_name/settings.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/project_name/settings.py
rename to tests/admin_scripts/custom_templates/project_template/project_name/settings.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-18091-non-ascii-template.txt b/tests/admin_scripts/custom_templates/project_template/ticket-18091-non-ascii-template.txt
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-18091-non-ascii-template.txt
rename to tests/admin_scripts/custom_templates/project_template/ticket-18091-non-ascii-template.txt
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico b/tests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico
rename to tests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico
diff --git a/tests/modeltests/expressions/__init__.py b/tests/admin_scripts/management/__init__.py
similarity index 100%
rename from tests/modeltests/expressions/__init__.py
rename to tests/admin_scripts/management/__init__.py
diff --git a/tests/modeltests/field_defaults/__init__.py b/tests/admin_scripts/management/commands/__init__.py
similarity index 100%
rename from tests/modeltests/field_defaults/__init__.py
rename to tests/admin_scripts/management/commands/__init__.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/app_command.py b/tests/admin_scripts/management/commands/app_command.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/app_command.py
rename to tests/admin_scripts/management/commands/app_command.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/base_command.py b/tests/admin_scripts/management/commands/base_command.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/base_command.py
rename to tests/admin_scripts/management/commands/base_command.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/custom_startproject.py b/tests/admin_scripts/management/commands/custom_startproject.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/custom_startproject.py
rename to tests/admin_scripts/management/commands/custom_startproject.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/label_command.py b/tests/admin_scripts/management/commands/label_command.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/label_command.py
rename to tests/admin_scripts/management/commands/label_command.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/noargs_command.py b/tests/admin_scripts/management/commands/noargs_command.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/noargs_command.py
rename to tests/admin_scripts/management/commands/noargs_command.py
diff --git a/tests/regressiontests/admin_scripts/models.py b/tests/admin_scripts/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/models.py
rename to tests/admin_scripts/models.py
diff --git a/tests/modeltests/field_subclassing/__init__.py b/tests/admin_scripts/simple_app/__init__.py
similarity index 100%
rename from tests/modeltests/field_subclassing/__init__.py
rename to tests/admin_scripts/simple_app/__init__.py
diff --git a/tests/regressiontests/admin_scripts/simple_app/models.py b/tests/admin_scripts/simple_app/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/simple_app/models.py
rename to tests/admin_scripts/simple_app/models.py
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/tests.py
rename to tests/admin_scripts/tests.py
diff --git a/tests/regressiontests/admin_scripts/urls.py b/tests/admin_scripts/urls.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/urls.py
rename to tests/admin_scripts/urls.py
diff --git a/tests/modeltests/force_insert_update/__init__.py b/tests/admin_util/__init__.py
similarity index 100%
rename from tests/modeltests/force_insert_update/__init__.py
rename to tests/admin_util/__init__.py
diff --git a/tests/regressiontests/admin_util/models.py b/tests/admin_util/models.py
similarity index 100%
rename from tests/regressiontests/admin_util/models.py
rename to tests/admin_util/models.py
diff --git a/tests/regressiontests/admin_util/tests.py b/tests/admin_util/tests.py
similarity index 100%
rename from tests/regressiontests/admin_util/tests.py
rename to tests/admin_util/tests.py
diff --git a/tests/modeltests/generic_relations/__init__.py b/tests/admin_validation/__init__.py
similarity index 100%
rename from tests/modeltests/generic_relations/__init__.py
rename to tests/admin_validation/__init__.py
diff --git a/tests/regressiontests/admin_validation/models.py b/tests/admin_validation/models.py
similarity index 100%
rename from tests/regressiontests/admin_validation/models.py
rename to tests/admin_validation/models.py
diff --git a/tests/regressiontests/admin_validation/tests.py b/tests/admin_validation/tests.py
similarity index 100%
rename from tests/regressiontests/admin_validation/tests.py
rename to tests/admin_validation/tests.py
diff --git a/tests/modeltests/get_earliest_or_latest/__init__.py b/tests/admin_views/__init__.py
similarity index 100%
rename from tests/modeltests/get_earliest_or_latest/__init__.py
rename to tests/admin_views/__init__.py
diff --git a/tests/regressiontests/admin_views/admin.py b/tests/admin_views/admin.py
similarity index 100%
rename from tests/regressiontests/admin_views/admin.py
rename to tests/admin_views/admin.py
diff --git a/tests/regressiontests/admin_views/customadmin.py b/tests/admin_views/customadmin.py
similarity index 100%
rename from tests/regressiontests/admin_views/customadmin.py
rename to tests/admin_views/customadmin.py
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-actions.xml b/tests/admin_views/fixtures/admin-views-actions.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-actions.xml
rename to tests/admin_views/fixtures/admin-views-actions.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-books.xml b/tests/admin_views/fixtures/admin-views-books.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-books.xml
rename to tests/admin_views/fixtures/admin-views-books.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-colors.xml b/tests/admin_views/fixtures/admin-views-colors.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-colors.xml
rename to tests/admin_views/fixtures/admin-views-colors.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-fabrics.xml b/tests/admin_views/fixtures/admin-views-fabrics.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-fabrics.xml
rename to tests/admin_views/fixtures/admin-views-fabrics.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-person.xml b/tests/admin_views/fixtures/admin-views-person.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-person.xml
rename to tests/admin_views/fixtures/admin-views-person.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-unicode.xml b/tests/admin_views/fixtures/admin-views-unicode.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-unicode.xml
rename to tests/admin_views/fixtures/admin-views-unicode.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-users.xml b/tests/admin_views/fixtures/admin-views-users.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-users.xml
rename to tests/admin_views/fixtures/admin-views-users.xml
diff --git a/tests/regressiontests/admin_views/fixtures/deleted-objects.xml b/tests/admin_views/fixtures/deleted-objects.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/deleted-objects.xml
rename to tests/admin_views/fixtures/deleted-objects.xml
diff --git a/tests/regressiontests/admin_views/fixtures/multiple-child-classes.json b/tests/admin_views/fixtures/multiple-child-classes.json
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/multiple-child-classes.json
rename to tests/admin_views/fixtures/multiple-child-classes.json
diff --git a/tests/regressiontests/admin_views/fixtures/string-primary-key.xml b/tests/admin_views/fixtures/string-primary-key.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/string-primary-key.xml
rename to tests/admin_views/fixtures/string-primary-key.xml
diff --git a/tests/regressiontests/admin_views/forms.py b/tests/admin_views/forms.py
similarity index 100%
rename from tests/regressiontests/admin_views/forms.py
rename to tests/admin_views/forms.py
diff --git a/tests/regressiontests/admin_views/models.py b/tests/admin_views/models.py
similarity index 100%
rename from tests/regressiontests/admin_views/models.py
rename to tests/admin_views/models.py
diff --git a/tests/regressiontests/admin_views/templates/custom_filter_template.html b/tests/admin_views/templates/custom_filter_template.html
similarity index 100%
rename from tests/regressiontests/admin_views/templates/custom_filter_template.html
rename to tests/admin_views/templates/custom_filter_template.html
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/admin_views/tests.py
similarity index 100%
rename from tests/regressiontests/admin_views/tests.py
rename to tests/admin_views/tests.py
diff --git a/tests/regressiontests/admin_views/urls.py b/tests/admin_views/urls.py
similarity index 100%
rename from tests/regressiontests/admin_views/urls.py
rename to tests/admin_views/urls.py
diff --git a/tests/regressiontests/admin_views/views.py b/tests/admin_views/views.py
similarity index 100%
rename from tests/regressiontests/admin_views/views.py
rename to tests/admin_views/views.py
diff --git a/tests/modeltests/get_object_or_404/__init__.py b/tests/admin_widgets/__init__.py
similarity index 100%
rename from tests/modeltests/get_object_or_404/__init__.py
rename to tests/admin_widgets/__init__.py
diff --git a/tests/regressiontests/admin_widgets/fixtures/admin-widgets-users.xml b/tests/admin_widgets/fixtures/admin-widgets-users.xml
similarity index 100%
rename from tests/regressiontests/admin_widgets/fixtures/admin-widgets-users.xml
rename to tests/admin_widgets/fixtures/admin-widgets-users.xml
diff --git a/tests/regressiontests/admin_widgets/models.py b/tests/admin_widgets/models.py
similarity index 100%
rename from tests/regressiontests/admin_widgets/models.py
rename to tests/admin_widgets/models.py
diff --git a/tests/regressiontests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
similarity index 100%
rename from tests/regressiontests/admin_widgets/tests.py
rename to tests/admin_widgets/tests.py
diff --git a/tests/regressiontests/admin_widgets/urls.py b/tests/admin_widgets/urls.py
similarity index 100%
rename from tests/regressiontests/admin_widgets/urls.py
rename to tests/admin_widgets/urls.py
diff --git a/tests/regressiontests/admin_widgets/widgetadmin.py b/tests/admin_widgets/widgetadmin.py
similarity index 100%
rename from tests/regressiontests/admin_widgets/widgetadmin.py
rename to tests/admin_widgets/widgetadmin.py
diff --git a/tests/modeltests/get_or_create/__init__.py b/tests/aggregation/__init__.py
similarity index 100%
rename from tests/modeltests/get_or_create/__init__.py
rename to tests/aggregation/__init__.py
diff --git a/tests/modeltests/aggregation/fixtures/aggregation.json b/tests/aggregation/fixtures/aggregation.json
similarity index 100%
rename from tests/modeltests/aggregation/fixtures/aggregation.json
rename to tests/aggregation/fixtures/aggregation.json
diff --git a/tests/modeltests/aggregation/models.py b/tests/aggregation/models.py
similarity index 100%
rename from tests/modeltests/aggregation/models.py
rename to tests/aggregation/models.py
diff --git a/tests/modeltests/aggregation/tests.py b/tests/aggregation/tests.py
similarity index 100%
rename from tests/modeltests/aggregation/tests.py
rename to tests/aggregation/tests.py
diff --git a/tests/modeltests/invalid_models/invalid_models/__init__.py b/tests/aggregation_regress/__init__.py
similarity index 100%
rename from tests/modeltests/invalid_models/invalid_models/__init__.py
rename to tests/aggregation_regress/__init__.py
diff --git a/tests/regressiontests/aggregation_regress/fixtures/aggregation_regress.json b/tests/aggregation_regress/fixtures/aggregation_regress.json
similarity index 100%
rename from tests/regressiontests/aggregation_regress/fixtures/aggregation_regress.json
rename to tests/aggregation_regress/fixtures/aggregation_regress.json
diff --git a/tests/regressiontests/aggregation_regress/models.py b/tests/aggregation_regress/models.py
similarity index 100%
rename from tests/regressiontests/aggregation_regress/models.py
rename to tests/aggregation_regress/models.py
diff --git a/tests/regressiontests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py
similarity index 100%
rename from tests/regressiontests/aggregation_regress/tests.py
rename to tests/aggregation_regress/tests.py
diff --git a/tests/modeltests/known_related_objects/__init__.py b/tests/app_loading/__init__.py
similarity index 100%
rename from tests/modeltests/known_related_objects/__init__.py
rename to tests/app_loading/__init__.py
diff --git a/tests/regressiontests/app_loading/eggs/brokenapp.egg b/tests/app_loading/eggs/brokenapp.egg
similarity index 100%
rename from tests/regressiontests/app_loading/eggs/brokenapp.egg
rename to tests/app_loading/eggs/brokenapp.egg
diff --git a/tests/regressiontests/app_loading/eggs/modelapp.egg b/tests/app_loading/eggs/modelapp.egg
similarity index 100%
rename from tests/regressiontests/app_loading/eggs/modelapp.egg
rename to tests/app_loading/eggs/modelapp.egg
diff --git a/tests/regressiontests/app_loading/eggs/nomodelapp.egg b/tests/app_loading/eggs/nomodelapp.egg
similarity index 100%
rename from tests/regressiontests/app_loading/eggs/nomodelapp.egg
rename to tests/app_loading/eggs/nomodelapp.egg
diff --git a/tests/regressiontests/app_loading/eggs/omelet.egg b/tests/app_loading/eggs/omelet.egg
similarity index 100%
rename from tests/regressiontests/app_loading/eggs/omelet.egg
rename to tests/app_loading/eggs/omelet.egg
diff --git a/tests/modeltests/invalid_models/models.py b/tests/app_loading/models.py
similarity index 100%
rename from tests/modeltests/invalid_models/models.py
rename to tests/app_loading/models.py
diff --git a/tests/modeltests/lookup/__init__.py b/tests/app_loading/not_installed/__init__.py
similarity index 100%
rename from tests/modeltests/lookup/__init__.py
rename to tests/app_loading/not_installed/__init__.py
diff --git a/tests/regressiontests/app_loading/not_installed/models.py b/tests/app_loading/not_installed/models.py
similarity index 100%
rename from tests/regressiontests/app_loading/not_installed/models.py
rename to tests/app_loading/not_installed/models.py
diff --git a/tests/regressiontests/app_loading/tests.py b/tests/app_loading/tests.py
similarity index 100%
rename from tests/regressiontests/app_loading/tests.py
rename to tests/app_loading/tests.py
diff --git a/tests/modeltests/m2m_and_m2o/__init__.py b/tests/backends/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_and_m2o/__init__.py
rename to tests/backends/__init__.py
diff --git a/tests/regressiontests/backends/models.py b/tests/backends/models.py
similarity index 100%
rename from tests/regressiontests/backends/models.py
rename to tests/backends/models.py
diff --git a/tests/regressiontests/backends/tests.py b/tests/backends/tests.py
similarity index 100%
rename from tests/regressiontests/backends/tests.py
rename to tests/backends/tests.py
diff --git a/tests/modeltests/m2m_intermediary/__init__.py b/tests/base/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_intermediary/__init__.py
rename to tests/base/__init__.py
diff --git a/tests/modeltests/base/models.py b/tests/base/models.py
similarity index 100%
rename from tests/modeltests/base/models.py
rename to tests/base/models.py
diff --git a/tests/modeltests/files/__init__.py b/tests/bash_completion/__init__.py
similarity index 100%
rename from tests/modeltests/files/__init__.py
rename to tests/bash_completion/__init__.py
diff --git a/tests/modeltests/invalid_models/__init__.py b/tests/bash_completion/management/__init__.py
similarity index 100%
rename from tests/modeltests/invalid_models/__init__.py
rename to tests/bash_completion/management/__init__.py
diff --git a/tests/modeltests/m2m_signals/__init__.py b/tests/bash_completion/management/commands/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_signals/__init__.py
rename to tests/bash_completion/management/commands/__init__.py
diff --git a/tests/regressiontests/bash_completion/management/commands/test_command.py b/tests/bash_completion/management/commands/test_command.py
similarity index 100%
rename from tests/regressiontests/bash_completion/management/commands/test_command.py
rename to tests/bash_completion/management/commands/test_command.py
diff --git a/tests/regressiontests/bash_completion/models.py b/tests/bash_completion/models.py
similarity index 100%
rename from tests/regressiontests/bash_completion/models.py
rename to tests/bash_completion/models.py
diff --git a/tests/regressiontests/bash_completion/tests.py b/tests/bash_completion/tests.py
similarity index 100%
rename from tests/regressiontests/bash_completion/tests.py
rename to tests/bash_completion/tests.py
diff --git a/tests/modeltests/m2m_multiple/__init__.py b/tests/basic/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_multiple/__init__.py
rename to tests/basic/__init__.py
diff --git a/tests/modeltests/basic/models.py b/tests/basic/models.py
similarity index 100%
rename from tests/modeltests/basic/models.py
rename to tests/basic/models.py
diff --git a/tests/modeltests/basic/tests.py b/tests/basic/tests.py
similarity index 100%
rename from tests/modeltests/basic/tests.py
rename to tests/basic/tests.py
diff --git a/tests/modeltests/m2m_recursive/__init__.py b/tests/bug639/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_recursive/__init__.py
rename to tests/bug639/__init__.py
diff --git a/tests/regressiontests/bug639/models.py b/tests/bug639/models.py
similarity index 100%
rename from tests/regressiontests/bug639/models.py
rename to tests/bug639/models.py
diff --git a/tests/regressiontests/bug639/test.jpg b/tests/bug639/test.jpg
similarity index 100%
rename from tests/regressiontests/bug639/test.jpg
rename to tests/bug639/test.jpg
diff --git a/tests/regressiontests/bug639/tests.py b/tests/bug639/tests.py
similarity index 100%
rename from tests/regressiontests/bug639/tests.py
rename to tests/bug639/tests.py
diff --git a/tests/modeltests/m2o_recursive/__init__.py b/tests/bug8245/__init__.py
similarity index 100%
rename from tests/modeltests/m2o_recursive/__init__.py
rename to tests/bug8245/__init__.py
diff --git a/tests/regressiontests/bug8245/admin.py b/tests/bug8245/admin.py
similarity index 100%
rename from tests/regressiontests/bug8245/admin.py
rename to tests/bug8245/admin.py
diff --git a/tests/regressiontests/bug8245/models.py b/tests/bug8245/models.py
similarity index 100%
rename from tests/regressiontests/bug8245/models.py
rename to tests/bug8245/models.py
diff --git a/tests/regressiontests/bug8245/tests.py b/tests/bug8245/tests.py
similarity index 100%
rename from tests/regressiontests/bug8245/tests.py
rename to tests/bug8245/tests.py
diff --git a/tests/modeltests/many_to_many/__init__.py b/tests/builtin_server/__init__.py
similarity index 100%
rename from tests/modeltests/many_to_many/__init__.py
rename to tests/builtin_server/__init__.py
diff --git a/tests/modeltests/validators/models.py b/tests/builtin_server/models.py
similarity index 100%
rename from tests/modeltests/validators/models.py
rename to tests/builtin_server/models.py
diff --git a/tests/regressiontests/builtin_server/tests.py b/tests/builtin_server/tests.py
similarity index 100%
rename from tests/regressiontests/builtin_server/tests.py
rename to tests/builtin_server/tests.py
diff --git a/tests/modeltests/many_to_one/__init__.py b/tests/bulk_create/__init__.py
similarity index 100%
rename from tests/modeltests/many_to_one/__init__.py
rename to tests/bulk_create/__init__.py
diff --git a/tests/regressiontests/bulk_create/models.py b/tests/bulk_create/models.py
similarity index 100%
rename from tests/regressiontests/bulk_create/models.py
rename to tests/bulk_create/models.py
diff --git a/tests/regressiontests/bulk_create/tests.py b/tests/bulk_create/tests.py
similarity index 100%
rename from tests/regressiontests/bulk_create/tests.py
rename to tests/bulk_create/tests.py
diff --git a/tests/modeltests/many_to_one_null/__init__.py b/tests/cache/__init__.py
similarity index 100%
rename from tests/modeltests/many_to_one_null/__init__.py
rename to tests/cache/__init__.py
diff --git a/tests/regressiontests/cache/closeable_cache.py b/tests/cache/closeable_cache.py
similarity index 100%
rename from tests/regressiontests/cache/closeable_cache.py
rename to tests/cache/closeable_cache.py
diff --git a/tests/regressiontests/cache/liberal_backend.py b/tests/cache/liberal_backend.py
similarity index 100%
rename from tests/regressiontests/cache/liberal_backend.py
rename to tests/cache/liberal_backend.py
diff --git a/tests/regressiontests/cache/models.py b/tests/cache/models.py
similarity index 100%
rename from tests/regressiontests/cache/models.py
rename to tests/cache/models.py
diff --git a/tests/regressiontests/cache/tests.py b/tests/cache/tests.py
similarity index 100%
rename from tests/regressiontests/cache/tests.py
rename to tests/cache/tests.py
diff --git a/tests/modeltests/model_forms/__init__.py b/tests/choices/__init__.py
similarity index 100%
rename from tests/modeltests/model_forms/__init__.py
rename to tests/choices/__init__.py
diff --git a/tests/modeltests/choices/models.py b/tests/choices/models.py
similarity index 100%
rename from tests/modeltests/choices/models.py
rename to tests/choices/models.py
diff --git a/tests/modeltests/choices/tests.py b/tests/choices/tests.py
similarity index 100%
rename from tests/modeltests/choices/tests.py
rename to tests/choices/tests.py
diff --git a/tests/modeltests/model_formsets/__init__.py b/tests/commands_sql/__init__.py
similarity index 100%
rename from tests/modeltests/model_formsets/__init__.py
rename to tests/commands_sql/__init__.py
diff --git a/tests/regressiontests/commands_sql/models.py b/tests/commands_sql/models.py
similarity index 100%
rename from tests/regressiontests/commands_sql/models.py
rename to tests/commands_sql/models.py
diff --git a/tests/regressiontests/commands_sql/tests.py b/tests/commands_sql/tests.py
similarity index 100%
rename from tests/regressiontests/commands_sql/tests.py
rename to tests/commands_sql/tests.py
diff --git a/tests/modeltests/model_inheritance/__init__.py b/tests/comment_tests/__init__.py
similarity index 100%
rename from tests/modeltests/model_inheritance/__init__.py
rename to tests/comment_tests/__init__.py
diff --git a/tests/regressiontests/comment_tests/custom_comments/__init__.py b/tests/comment_tests/custom_comments/__init__.py
similarity index 100%
rename from tests/regressiontests/comment_tests/custom_comments/__init__.py
rename to tests/comment_tests/custom_comments/__init__.py
diff --git a/tests/regressiontests/comment_tests/custom_comments/forms.py b/tests/comment_tests/custom_comments/forms.py
similarity index 100%
rename from tests/regressiontests/comment_tests/custom_comments/forms.py
rename to tests/comment_tests/custom_comments/forms.py
diff --git a/tests/regressiontests/comment_tests/custom_comments/models.py b/tests/comment_tests/custom_comments/models.py
similarity index 100%
rename from tests/regressiontests/comment_tests/custom_comments/models.py
rename to tests/comment_tests/custom_comments/models.py
diff --git a/tests/regressiontests/comment_tests/custom_comments/views.py b/tests/comment_tests/custom_comments/views.py
similarity index 100%
rename from tests/regressiontests/comment_tests/custom_comments/views.py
rename to tests/comment_tests/custom_comments/views.py
diff --git a/tests/regressiontests/comment_tests/fixtures/comment_tests.json b/tests/comment_tests/fixtures/comment_tests.json
similarity index 100%
rename from tests/regressiontests/comment_tests/fixtures/comment_tests.json
rename to tests/comment_tests/fixtures/comment_tests.json
diff --git a/tests/regressiontests/comment_tests/fixtures/comment_utils.xml b/tests/comment_tests/fixtures/comment_utils.xml
similarity index 100%
rename from tests/regressiontests/comment_tests/fixtures/comment_utils.xml
rename to tests/comment_tests/fixtures/comment_utils.xml
diff --git a/tests/regressiontests/comment_tests/models.py b/tests/comment_tests/models.py
similarity index 100%
rename from tests/regressiontests/comment_tests/models.py
rename to tests/comment_tests/models.py
diff --git a/tests/regressiontests/comment_tests/tests/__init__.py b/tests/comment_tests/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/__init__.py
rename to tests/comment_tests/tests/__init__.py
diff --git a/tests/regressiontests/comment_tests/tests/app_api_tests.py b/tests/comment_tests/tests/app_api_tests.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/app_api_tests.py
rename to tests/comment_tests/tests/app_api_tests.py
diff --git a/tests/regressiontests/comment_tests/tests/comment_form_tests.py b/tests/comment_tests/tests/comment_form_tests.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/comment_form_tests.py
rename to tests/comment_tests/tests/comment_form_tests.py
diff --git a/tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py b/tests/comment_tests/tests/comment_utils_moderators_tests.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py
rename to tests/comment_tests/tests/comment_utils_moderators_tests.py
diff --git a/tests/regressiontests/comment_tests/tests/comment_view_tests.py b/tests/comment_tests/tests/comment_view_tests.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/comment_view_tests.py
rename to tests/comment_tests/tests/comment_view_tests.py
diff --git a/tests/regressiontests/comment_tests/tests/feed_tests.py b/tests/comment_tests/tests/feed_tests.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/feed_tests.py
rename to tests/comment_tests/tests/feed_tests.py
diff --git a/tests/regressiontests/comment_tests/tests/model_tests.py b/tests/comment_tests/tests/model_tests.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/model_tests.py
rename to tests/comment_tests/tests/model_tests.py
diff --git a/tests/regressiontests/comment_tests/tests/moderation_view_tests.py b/tests/comment_tests/tests/moderation_view_tests.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/moderation_view_tests.py
rename to tests/comment_tests/tests/moderation_view_tests.py
diff --git a/tests/regressiontests/comment_tests/tests/templatetag_tests.py b/tests/comment_tests/tests/templatetag_tests.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/templatetag_tests.py
rename to tests/comment_tests/tests/templatetag_tests.py
diff --git a/tests/regressiontests/comment_tests/urls.py b/tests/comment_tests/urls.py
similarity index 100%
rename from tests/regressiontests/comment_tests/urls.py
rename to tests/comment_tests/urls.py
diff --git a/tests/regressiontests/comment_tests/urls_admin.py b/tests/comment_tests/urls_admin.py
similarity index 100%
rename from tests/regressiontests/comment_tests/urls_admin.py
rename to tests/comment_tests/urls_admin.py
diff --git a/tests/regressiontests/comment_tests/urls_default.py b/tests/comment_tests/urls_default.py
similarity index 100%
rename from tests/regressiontests/comment_tests/urls_default.py
rename to tests/comment_tests/urls_default.py
diff --git a/tests/regressiontests/conditional_processing/__init__.py b/tests/conditional_processing/__init__.py
similarity index 100%
rename from tests/regressiontests/conditional_processing/__init__.py
rename to tests/conditional_processing/__init__.py
diff --git a/tests/regressiontests/conditional_processing/models.py b/tests/conditional_processing/models.py
similarity index 100%
rename from tests/regressiontests/conditional_processing/models.py
rename to tests/conditional_processing/models.py
diff --git a/tests/regressiontests/conditional_processing/urls.py b/tests/conditional_processing/urls.py
similarity index 100%
rename from tests/regressiontests/conditional_processing/urls.py
rename to tests/conditional_processing/urls.py
diff --git a/tests/regressiontests/conditional_processing/views.py b/tests/conditional_processing/views.py
similarity index 100%
rename from tests/regressiontests/conditional_processing/views.py
rename to tests/conditional_processing/views.py
diff --git a/tests/modeltests/model_inheritance_same_model_name/__init__.py b/tests/context_processors/__init__.py
similarity index 100%
rename from tests/modeltests/model_inheritance_same_model_name/__init__.py
rename to tests/context_processors/__init__.py
diff --git a/tests/regressiontests/context_processors/models.py b/tests/context_processors/models.py
similarity index 100%
rename from tests/regressiontests/context_processors/models.py
rename to tests/context_processors/models.py
diff --git a/tests/regressiontests/context_processors/templates/context_processors/request_attrs.html b/tests/context_processors/templates/context_processors/request_attrs.html
similarity index 100%
rename from tests/regressiontests/context_processors/templates/context_processors/request_attrs.html
rename to tests/context_processors/templates/context_processors/request_attrs.html
diff --git a/tests/regressiontests/context_processors/tests.py b/tests/context_processors/tests.py
similarity index 100%
rename from tests/regressiontests/context_processors/tests.py
rename to tests/context_processors/tests.py
diff --git a/tests/regressiontests/context_processors/urls.py b/tests/context_processors/urls.py
similarity index 100%
rename from tests/regressiontests/context_processors/urls.py
rename to tests/context_processors/urls.py
diff --git a/tests/regressiontests/context_processors/views.py b/tests/context_processors/views.py
similarity index 100%
rename from tests/regressiontests/context_processors/views.py
rename to tests/context_processors/views.py
diff --git a/tests/modeltests/mutually_referential/__init__.py b/tests/createsuperuser/__init__.py
similarity index 100%
rename from tests/modeltests/mutually_referential/__init__.py
rename to tests/createsuperuser/__init__.py
diff --git a/tests/regressiontests/app_loading/models.py b/tests/createsuperuser/models.py
similarity index 100%
rename from tests/regressiontests/app_loading/models.py
rename to tests/createsuperuser/models.py
diff --git a/tests/regressiontests/createsuperuser/tests.py b/tests/createsuperuser/tests.py
similarity index 100%
rename from tests/regressiontests/createsuperuser/tests.py
rename to tests/createsuperuser/tests.py
diff --git a/tests/modeltests/one_to_one/__init__.py b/tests/csrf_tests/__init__.py
similarity index 100%
rename from tests/modeltests/one_to_one/__init__.py
rename to tests/csrf_tests/__init__.py
diff --git a/tests/regressiontests/csrf_tests/models.py b/tests/csrf_tests/models.py
similarity index 100%
rename from tests/regressiontests/csrf_tests/models.py
rename to tests/csrf_tests/models.py
diff --git a/tests/regressiontests/csrf_tests/tests.py b/tests/csrf_tests/tests.py
similarity index 100%
rename from tests/regressiontests/csrf_tests/tests.py
rename to tests/csrf_tests/tests.py
diff --git a/tests/modeltests/or_lookups/__init__.py b/tests/custom_columns/__init__.py
similarity index 100%
rename from tests/modeltests/or_lookups/__init__.py
rename to tests/custom_columns/__init__.py
diff --git a/tests/modeltests/custom_columns/models.py b/tests/custom_columns/models.py
similarity index 100%
rename from tests/modeltests/custom_columns/models.py
rename to tests/custom_columns/models.py
diff --git a/tests/modeltests/custom_columns/tests.py b/tests/custom_columns/tests.py
similarity index 100%
rename from tests/modeltests/custom_columns/tests.py
rename to tests/custom_columns/tests.py
diff --git a/tests/modeltests/order_with_respect_to/__init__.py b/tests/custom_columns_regress/__init__.py
similarity index 100%
rename from tests/modeltests/order_with_respect_to/__init__.py
rename to tests/custom_columns_regress/__init__.py
diff --git a/tests/regressiontests/custom_columns_regress/models.py b/tests/custom_columns_regress/models.py
similarity index 100%
rename from tests/regressiontests/custom_columns_regress/models.py
rename to tests/custom_columns_regress/models.py
diff --git a/tests/regressiontests/custom_columns_regress/tests.py b/tests/custom_columns_regress/tests.py
similarity index 100%
rename from tests/regressiontests/custom_columns_regress/tests.py
rename to tests/custom_columns_regress/tests.py
diff --git a/tests/modeltests/ordering/__init__.py b/tests/custom_managers/__init__.py
similarity index 100%
rename from tests/modeltests/ordering/__init__.py
rename to tests/custom_managers/__init__.py
diff --git a/tests/modeltests/custom_managers/models.py b/tests/custom_managers/models.py
similarity index 100%
rename from tests/modeltests/custom_managers/models.py
rename to tests/custom_managers/models.py
diff --git a/tests/modeltests/custom_managers/tests.py b/tests/custom_managers/tests.py
similarity index 100%
rename from tests/modeltests/custom_managers/tests.py
rename to tests/custom_managers/tests.py
diff --git a/tests/modeltests/prefetch_related/__init__.py b/tests/custom_managers_regress/__init__.py
similarity index 100%
rename from tests/modeltests/prefetch_related/__init__.py
rename to tests/custom_managers_regress/__init__.py
diff --git a/tests/regressiontests/custom_managers_regress/models.py b/tests/custom_managers_regress/models.py
similarity index 100%
rename from tests/regressiontests/custom_managers_regress/models.py
rename to tests/custom_managers_regress/models.py
diff --git a/tests/regressiontests/custom_managers_regress/tests.py b/tests/custom_managers_regress/tests.py
similarity index 100%
rename from tests/regressiontests/custom_managers_regress/tests.py
rename to tests/custom_managers_regress/tests.py
diff --git a/tests/modeltests/properties/__init__.py b/tests/custom_methods/__init__.py
similarity index 100%
rename from tests/modeltests/properties/__init__.py
rename to tests/custom_methods/__init__.py
diff --git a/tests/modeltests/custom_methods/models.py b/tests/custom_methods/models.py
similarity index 100%
rename from tests/modeltests/custom_methods/models.py
rename to tests/custom_methods/models.py
diff --git a/tests/modeltests/custom_methods/tests.py b/tests/custom_methods/tests.py
similarity index 100%
rename from tests/modeltests/custom_methods/tests.py
rename to tests/custom_methods/tests.py
diff --git a/tests/modeltests/proxy_model_inheritance/__init__.py b/tests/custom_pk/__init__.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/__init__.py
rename to tests/custom_pk/__init__.py
diff --git a/tests/modeltests/custom_pk/fields.py b/tests/custom_pk/fields.py
similarity index 100%
rename from tests/modeltests/custom_pk/fields.py
rename to tests/custom_pk/fields.py
diff --git a/tests/modeltests/custom_pk/models.py b/tests/custom_pk/models.py
similarity index 100%
rename from tests/modeltests/custom_pk/models.py
rename to tests/custom_pk/models.py
diff --git a/tests/modeltests/custom_pk/tests.py b/tests/custom_pk/tests.py
similarity index 100%
rename from tests/modeltests/custom_pk/tests.py
rename to tests/custom_pk/tests.py
diff --git a/tests/modeltests/proxy_model_inheritance/app1/__init__.py b/tests/datatypes/__init__.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/app1/__init__.py
rename to tests/datatypes/__init__.py
diff --git a/tests/regressiontests/datatypes/models.py b/tests/datatypes/models.py
similarity index 100%
rename from tests/regressiontests/datatypes/models.py
rename to tests/datatypes/models.py
diff --git a/tests/regressiontests/datatypes/tests.py b/tests/datatypes/tests.py
similarity index 100%
rename from tests/regressiontests/datatypes/tests.py
rename to tests/datatypes/tests.py
diff --git a/tests/modeltests/proxy_model_inheritance/app2/__init__.py b/tests/dates/__init__.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/app2/__init__.py
rename to tests/dates/__init__.py
diff --git a/tests/regressiontests/dates/models.py b/tests/dates/models.py
similarity index 100%
rename from tests/regressiontests/dates/models.py
rename to tests/dates/models.py
diff --git a/tests/regressiontests/dates/tests.py b/tests/dates/tests.py
similarity index 100%
rename from tests/regressiontests/dates/tests.py
rename to tests/dates/tests.py
diff --git a/tests/modeltests/proxy_models/__init__.py b/tests/datetimes/__init__.py
similarity index 100%
rename from tests/modeltests/proxy_models/__init__.py
rename to tests/datetimes/__init__.py
diff --git a/tests/regressiontests/datetimes/models.py b/tests/datetimes/models.py
similarity index 100%
rename from tests/regressiontests/datetimes/models.py
rename to tests/datetimes/models.py
diff --git a/tests/regressiontests/datetimes/tests.py b/tests/datetimes/tests.py
similarity index 100%
rename from tests/regressiontests/datetimes/tests.py
rename to tests/datetimes/tests.py
diff --git a/tests/modeltests/raw_query/__init__.py b/tests/db_typecasts/__init__.py
similarity index 100%
rename from tests/modeltests/raw_query/__init__.py
rename to tests/db_typecasts/__init__.py
diff --git a/tests/regressiontests/builtin_server/models.py b/tests/db_typecasts/models.py
similarity index 100%
rename from tests/regressiontests/builtin_server/models.py
rename to tests/db_typecasts/models.py
diff --git a/tests/regressiontests/db_typecasts/tests.py b/tests/db_typecasts/tests.py
similarity index 100%
rename from tests/regressiontests/db_typecasts/tests.py
rename to tests/db_typecasts/tests.py
diff --git a/tests/modeltests/reserved_names/__init__.py b/tests/decorators/__init__.py
similarity index 100%
rename from tests/modeltests/reserved_names/__init__.py
rename to tests/decorators/__init__.py
diff --git a/tests/regressiontests/decorators/models.py b/tests/decorators/models.py
similarity index 100%
rename from tests/regressiontests/decorators/models.py
rename to tests/decorators/models.py
diff --git a/tests/regressiontests/decorators/tests.py b/tests/decorators/tests.py
similarity index 100%
rename from tests/regressiontests/decorators/tests.py
rename to tests/decorators/tests.py
diff --git a/tests/modeltests/reverse_lookup/__init__.py b/tests/defaultfilters/__init__.py
similarity index 100%
rename from tests/modeltests/reverse_lookup/__init__.py
rename to tests/defaultfilters/__init__.py
diff --git a/tests/regressiontests/createsuperuser/models.py b/tests/defaultfilters/models.py
similarity index 100%
rename from tests/regressiontests/createsuperuser/models.py
rename to tests/defaultfilters/models.py
diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/defaultfilters/tests.py
similarity index 100%
rename from tests/regressiontests/defaultfilters/tests.py
rename to tests/defaultfilters/tests.py
diff --git a/tests/modeltests/save_delete_hooks/__init__.py b/tests/defer/__init__.py
similarity index 100%
rename from tests/modeltests/save_delete_hooks/__init__.py
rename to tests/defer/__init__.py
diff --git a/tests/modeltests/defer/models.py b/tests/defer/models.py
similarity index 100%
rename from tests/modeltests/defer/models.py
rename to tests/defer/models.py
diff --git a/tests/modeltests/defer/tests.py b/tests/defer/tests.py
similarity index 100%
rename from tests/modeltests/defer/tests.py
rename to tests/defer/tests.py
diff --git a/tests/modeltests/select_related/__init__.py b/tests/defer_regress/__init__.py
similarity index 100%
rename from tests/modeltests/select_related/__init__.py
rename to tests/defer_regress/__init__.py
diff --git a/tests/regressiontests/defer_regress/models.py b/tests/defer_regress/models.py
similarity index 100%
rename from tests/regressiontests/defer_regress/models.py
rename to tests/defer_regress/models.py
diff --git a/tests/regressiontests/defer_regress/tests.py b/tests/defer_regress/tests.py
similarity index 100%
rename from tests/regressiontests/defer_regress/tests.py
rename to tests/defer_regress/tests.py
diff --git a/tests/modeltests/serializers/__init__.py b/tests/delete/__init__.py
similarity index 100%
rename from tests/modeltests/serializers/__init__.py
rename to tests/delete/__init__.py
diff --git a/tests/modeltests/delete/models.py b/tests/delete/models.py
similarity index 100%
rename from tests/modeltests/delete/models.py
rename to tests/delete/models.py
diff --git a/tests/modeltests/delete/tests.py b/tests/delete/tests.py
similarity index 100%
rename from tests/modeltests/delete/tests.py
rename to tests/delete/tests.py
diff --git a/tests/modeltests/model_package/__init__.py b/tests/delete_regress/__init__.py
similarity index 100%
rename from tests/modeltests/model_package/__init__.py
rename to tests/delete_regress/__init__.py
diff --git a/tests/regressiontests/delete_regress/models.py b/tests/delete_regress/models.py
similarity index 100%
rename from tests/regressiontests/delete_regress/models.py
rename to tests/delete_regress/models.py
diff --git a/tests/regressiontests/delete_regress/tests.py b/tests/delete_regress/tests.py
similarity index 100%
rename from tests/regressiontests/delete_regress/tests.py
rename to tests/delete_regress/tests.py
diff --git a/tests/regressiontests/dispatch/__init__.py b/tests/dispatch/__init__.py
similarity index 100%
rename from tests/regressiontests/dispatch/__init__.py
rename to tests/dispatch/__init__.py
diff --git a/tests/regressiontests/db_typecasts/models.py b/tests/dispatch/models.py
similarity index 100%
rename from tests/regressiontests/db_typecasts/models.py
rename to tests/dispatch/models.py
diff --git a/tests/regressiontests/dispatch/tests/__init__.py b/tests/dispatch/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/dispatch/tests/__init__.py
rename to tests/dispatch/tests/__init__.py
diff --git a/tests/regressiontests/dispatch/tests/test_dispatcher.py b/tests/dispatch/tests/test_dispatcher.py
similarity index 100%
rename from tests/regressiontests/dispatch/tests/test_dispatcher.py
rename to tests/dispatch/tests/test_dispatcher.py
diff --git a/tests/regressiontests/dispatch/tests/test_saferef.py b/tests/dispatch/tests/test_saferef.py
similarity index 100%
rename from tests/regressiontests/dispatch/tests/test_saferef.py
rename to tests/dispatch/tests/test_saferef.py
diff --git a/tests/modeltests/select_for_update/__init__.py b/tests/distinct_on_fields/__init__.py
similarity index 100%
rename from tests/modeltests/select_for_update/__init__.py
rename to tests/distinct_on_fields/__init__.py
diff --git a/tests/modeltests/distinct_on_fields/models.py b/tests/distinct_on_fields/models.py
similarity index 100%
rename from tests/modeltests/distinct_on_fields/models.py
rename to tests/distinct_on_fields/models.py
diff --git a/tests/modeltests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py
similarity index 100%
rename from tests/modeltests/distinct_on_fields/tests.py
rename to tests/distinct_on_fields/tests.py
diff --git a/tests/modeltests/signals/__init__.py b/tests/empty/__init__.py
similarity index 100%
rename from tests/modeltests/signals/__init__.py
rename to tests/empty/__init__.py
diff --git a/tests/modeltests/empty/models.py b/tests/empty/models.py
similarity index 100%
rename from tests/modeltests/empty/models.py
rename to tests/empty/models.py
diff --git a/tests/modeltests/str/__init__.py b/tests/empty/no_models/__init__.py
similarity index 100%
rename from tests/modeltests/str/__init__.py
rename to tests/empty/no_models/__init__.py
diff --git a/tests/modeltests/empty/no_models/tests.py b/tests/empty/no_models/tests.py
similarity index 100%
rename from tests/modeltests/empty/no_models/tests.py
rename to tests/empty/no_models/tests.py
diff --git a/tests/modeltests/empty/tests.py b/tests/empty/tests.py
similarity index 100%
rename from tests/modeltests/empty/tests.py
rename to tests/empty/tests.py
diff --git a/tests/modeltests/tablespaces/__init__.py b/tests/expressions/__init__.py
similarity index 100%
rename from tests/modeltests/tablespaces/__init__.py
rename to tests/expressions/__init__.py
diff --git a/tests/modeltests/expressions/models.py b/tests/expressions/models.py
similarity index 100%
rename from tests/modeltests/expressions/models.py
rename to tests/expressions/models.py
diff --git a/tests/modeltests/expressions/tests.py b/tests/expressions/tests.py
similarity index 100%
rename from tests/modeltests/expressions/tests.py
rename to tests/expressions/tests.py
diff --git a/tests/modeltests/test_client/__init__.py b/tests/expressions_regress/__init__.py
similarity index 100%
rename from tests/modeltests/test_client/__init__.py
rename to tests/expressions_regress/__init__.py
diff --git a/tests/regressiontests/expressions_regress/models.py b/tests/expressions_regress/models.py
similarity index 100%
rename from tests/regressiontests/expressions_regress/models.py
rename to tests/expressions_regress/models.py
diff --git a/tests/regressiontests/expressions_regress/tests.py b/tests/expressions_regress/tests.py
similarity index 100%
rename from tests/regressiontests/expressions_regress/tests.py
rename to tests/expressions_regress/tests.py
diff --git a/tests/modeltests/timezones/__init__.py b/tests/extra_regress/__init__.py
similarity index 100%
rename from tests/modeltests/timezones/__init__.py
rename to tests/extra_regress/__init__.py
diff --git a/tests/regressiontests/extra_regress/models.py b/tests/extra_regress/models.py
similarity index 100%
rename from tests/regressiontests/extra_regress/models.py
rename to tests/extra_regress/models.py
diff --git a/tests/regressiontests/extra_regress/tests.py b/tests/extra_regress/tests.py
similarity index 100%
rename from tests/regressiontests/extra_regress/tests.py
rename to tests/extra_regress/tests.py
diff --git a/tests/modeltests/transactions/__init__.py b/tests/field_defaults/__init__.py
similarity index 100%
rename from tests/modeltests/transactions/__init__.py
rename to tests/field_defaults/__init__.py
diff --git a/tests/modeltests/field_defaults/models.py b/tests/field_defaults/models.py
similarity index 100%
rename from tests/modeltests/field_defaults/models.py
rename to tests/field_defaults/models.py
diff --git a/tests/modeltests/field_defaults/tests.py b/tests/field_defaults/tests.py
similarity index 100%
rename from tests/modeltests/field_defaults/tests.py
rename to tests/field_defaults/tests.py
diff --git a/tests/modeltests/update/__init__.py b/tests/field_subclassing/__init__.py
similarity index 100%
rename from tests/modeltests/update/__init__.py
rename to tests/field_subclassing/__init__.py
diff --git a/tests/modeltests/field_subclassing/fields.py b/tests/field_subclassing/fields.py
similarity index 100%
rename from tests/modeltests/field_subclassing/fields.py
rename to tests/field_subclassing/fields.py
diff --git a/tests/modeltests/field_subclassing/models.py b/tests/field_subclassing/models.py
similarity index 100%
rename from tests/modeltests/field_subclassing/models.py
rename to tests/field_subclassing/models.py
diff --git a/tests/modeltests/field_subclassing/tests.py b/tests/field_subclassing/tests.py
similarity index 100%
rename from tests/modeltests/field_subclassing/tests.py
rename to tests/field_subclassing/tests.py
diff --git a/tests/regressiontests/bash_completion/__init__.py b/tests/file_storage/__init__.py
similarity index 100%
rename from tests/regressiontests/bash_completion/__init__.py
rename to tests/file_storage/__init__.py
diff --git a/tests/regressiontests/file_storage/magic.png b/tests/file_storage/magic.png
similarity index 100%
rename from tests/regressiontests/file_storage/magic.png
rename to tests/file_storage/magic.png
diff --git a/tests/regressiontests/defaultfilters/models.py b/tests/file_storage/models.py
similarity index 100%
rename from tests/regressiontests/defaultfilters/models.py
rename to tests/file_storage/models.py
diff --git a/tests/modeltests/model_forms/test.png b/tests/file_storage/test.png
similarity index 100%
rename from tests/modeltests/model_forms/test.png
rename to tests/file_storage/test.png
diff --git a/tests/regressiontests/file_storage/test1.png b/tests/file_storage/test1.png
similarity index 100%
rename from tests/regressiontests/file_storage/test1.png
rename to tests/file_storage/test1.png
diff --git a/tests/regressiontests/file_storage/tests.py b/tests/file_storage/tests.py
similarity index 100%
rename from tests/regressiontests/file_storage/tests.py
rename to tests/file_storage/tests.py
diff --git a/tests/modeltests/update_only_fields/__init__.py b/tests/file_uploads/__init__.py
similarity index 100%
rename from tests/modeltests/update_only_fields/__init__.py
rename to tests/file_uploads/__init__.py
diff --git a/tests/regressiontests/file_uploads/models.py b/tests/file_uploads/models.py
similarity index 100%
rename from tests/regressiontests/file_uploads/models.py
rename to tests/file_uploads/models.py
diff --git a/tests/regressiontests/file_uploads/tests.py b/tests/file_uploads/tests.py
similarity index 100%
rename from tests/regressiontests/file_uploads/tests.py
rename to tests/file_uploads/tests.py
diff --git a/tests/regressiontests/file_uploads/uploadhandler.py b/tests/file_uploads/uploadhandler.py
similarity index 100%
rename from tests/regressiontests/file_uploads/uploadhandler.py
rename to tests/file_uploads/uploadhandler.py
diff --git a/tests/regressiontests/file_uploads/urls.py b/tests/file_uploads/urls.py
similarity index 100%
rename from tests/regressiontests/file_uploads/urls.py
rename to tests/file_uploads/urls.py
diff --git a/tests/regressiontests/file_uploads/views.py b/tests/file_uploads/views.py
similarity index 100%
rename from tests/regressiontests/file_uploads/views.py
rename to tests/file_uploads/views.py
diff --git a/tests/regressiontests/bash_completion/management/__init__.py b/tests/files/__init__.py
similarity index 100%
rename from tests/regressiontests/bash_completion/management/__init__.py
rename to tests/files/__init__.py
diff --git a/tests/modeltests/files/models.py b/tests/files/models.py
similarity index 100%
rename from tests/modeltests/files/models.py
rename to tests/files/models.py
diff --git a/tests/modeltests/files/tests.py b/tests/files/tests.py
similarity index 100%
rename from tests/modeltests/files/tests.py
rename to tests/files/tests.py
diff --git a/tests/modeltests/fixtures/__init__.py b/tests/fixtures/__init__.py
similarity index 100%
rename from tests/modeltests/fixtures/__init__.py
rename to tests/fixtures/__init__.py
diff --git a/tests/modeltests/fixtures/fixtures/db_fixture_1.default.json b/tests/fixtures/fixtures/db_fixture_1.default.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/db_fixture_1.default.json
rename to tests/fixtures/fixtures/db_fixture_1.default.json
diff --git a/tests/modeltests/fixtures/fixtures/db_fixture_2.default.json.gz b/tests/fixtures/fixtures/db_fixture_2.default.json.gz
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/db_fixture_2.default.json.gz
rename to tests/fixtures/fixtures/db_fixture_2.default.json.gz
diff --git a/tests/modeltests/fixtures/fixtures/db_fixture_3.nosuchdb.json b/tests/fixtures/fixtures/db_fixture_3.nosuchdb.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/db_fixture_3.nosuchdb.json
rename to tests/fixtures/fixtures/db_fixture_3.nosuchdb.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture1.json b/tests/fixtures/fixtures/fixture1.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture1.json
rename to tests/fixtures/fixtures/fixture1.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture2.json b/tests/fixtures/fixtures/fixture2.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture2.json
rename to tests/fixtures/fixtures/fixture2.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture2.xml b/tests/fixtures/fixtures/fixture2.xml
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture2.xml
rename to tests/fixtures/fixtures/fixture2.xml
diff --git a/tests/modeltests/fixtures/fixtures/fixture3.xml b/tests/fixtures/fixtures/fixture3.xml
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture3.xml
rename to tests/fixtures/fixtures/fixture3.xml
diff --git a/tests/modeltests/fixtures/fixtures/fixture4.json.zip b/tests/fixtures/fixtures/fixture4.json.zip
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture4.json.zip
rename to tests/fixtures/fixtures/fixture4.json.zip
diff --git a/tests/modeltests/fixtures/fixtures/fixture5.json.gz b/tests/fixtures/fixtures/fixture5.json.gz
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture5.json.gz
rename to tests/fixtures/fixtures/fixture5.json.gz
diff --git a/tests/modeltests/fixtures/fixtures/fixture5.json.zip b/tests/fixtures/fixtures/fixture5.json.zip
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture5.json.zip
rename to tests/fixtures/fixtures/fixture5.json.zip
diff --git a/tests/modeltests/fixtures/fixtures/fixture6.json b/tests/fixtures/fixtures/fixture6.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture6.json
rename to tests/fixtures/fixtures/fixture6.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture7.xml b/tests/fixtures/fixtures/fixture7.xml
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture7.xml
rename to tests/fixtures/fixtures/fixture7.xml
diff --git a/tests/modeltests/fixtures/fixtures/fixture8.json b/tests/fixtures/fixtures/fixture8.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture8.json
rename to tests/fixtures/fixtures/fixture8.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture9.xml b/tests/fixtures/fixtures/fixture9.xml
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture9.xml
rename to tests/fixtures/fixtures/fixture9.xml
diff --git a/tests/modeltests/fixtures/fixtures/initial_data.json b/tests/fixtures/fixtures/initial_data.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/initial_data.json
rename to tests/fixtures/fixtures/initial_data.json
diff --git a/tests/modeltests/fixtures/fixtures/invalid.json b/tests/fixtures/fixtures/invalid.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/invalid.json
rename to tests/fixtures/fixtures/invalid.json
diff --git a/tests/modeltests/fixtures/models.py b/tests/fixtures/models.py
similarity index 100%
rename from tests/modeltests/fixtures/models.py
rename to tests/fixtures/models.py
diff --git a/tests/modeltests/fixtures/tests.py b/tests/fixtures/tests.py
similarity index 100%
rename from tests/modeltests/fixtures/tests.py
rename to tests/fixtures/tests.py
diff --git a/tests/modeltests/fixtures_model_package/__init__.py b/tests/fixtures_model_package/__init__.py
similarity index 100%
rename from tests/modeltests/fixtures_model_package/__init__.py
rename to tests/fixtures_model_package/__init__.py
diff --git a/tests/modeltests/fixtures_model_package/fixtures/fixture1.json b/tests/fixtures_model_package/fixtures/fixture1.json
similarity index 100%
rename from tests/modeltests/fixtures_model_package/fixtures/fixture1.json
rename to tests/fixtures_model_package/fixtures/fixture1.json
diff --git a/tests/modeltests/fixtures_model_package/fixtures/fixture2.json b/tests/fixtures_model_package/fixtures/fixture2.json
similarity index 100%
rename from tests/modeltests/fixtures_model_package/fixtures/fixture2.json
rename to tests/fixtures_model_package/fixtures/fixture2.json
diff --git a/tests/modeltests/fixtures_model_package/fixtures/fixture2.xml b/tests/fixtures_model_package/fixtures/fixture2.xml
similarity index 100%
rename from tests/modeltests/fixtures_model_package/fixtures/fixture2.xml
rename to tests/fixtures_model_package/fixtures/fixture2.xml
diff --git a/tests/modeltests/fixtures_model_package/fixtures/initial_data.json b/tests/fixtures_model_package/fixtures/initial_data.json
similarity index 100%
rename from tests/modeltests/fixtures_model_package/fixtures/initial_data.json
rename to tests/fixtures_model_package/fixtures/initial_data.json
diff --git a/tests/modeltests/fixtures_model_package/models/__init__.py b/tests/fixtures_model_package/models/__init__.py
similarity index 100%
rename from tests/modeltests/fixtures_model_package/models/__init__.py
rename to tests/fixtures_model_package/models/__init__.py
diff --git a/tests/modeltests/fixtures_model_package/tests.py b/tests/fixtures_model_package/tests.py
similarity index 100%
rename from tests/modeltests/fixtures_model_package/tests.py
rename to tests/fixtures_model_package/tests.py
diff --git a/tests/modeltests/user_commands/__init__.py b/tests/fixtures_regress/__init__.py
similarity index 100%
rename from tests/modeltests/user_commands/__init__.py
rename to tests/fixtures_regress/__init__.py
diff --git a/tests/regressiontests/fixtures_regress/fixtures/absolute.json b/tests/fixtures_regress/fixtures/absolute.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/absolute.json
rename to tests/fixtures_regress/fixtures/absolute.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/animal.xml b/tests/fixtures_regress/fixtures/animal.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/animal.xml
rename to tests/fixtures_regress/fixtures/animal.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/bad_fixture1.unkn b/tests/fixtures_regress/fixtures/bad_fixture1.unkn
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/bad_fixture1.unkn
rename to tests/fixtures_regress/fixtures/bad_fixture1.unkn
diff --git a/tests/regressiontests/fixtures_regress/fixtures/bad_fixture2.xml b/tests/fixtures_regress/fixtures/bad_fixture2.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/bad_fixture2.xml
rename to tests/fixtures_regress/fixtures/bad_fixture2.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/big-fixture.json b/tests/fixtures_regress/fixtures/big-fixture.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/big-fixture.json
rename to tests/fixtures_regress/fixtures/big-fixture.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/empty.json b/tests/fixtures_regress/fixtures/empty.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/empty.json
rename to tests/fixtures_regress/fixtures/empty.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/forward_ref.json b/tests/fixtures_regress/fixtures/forward_ref.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/forward_ref.json
rename to tests/fixtures_regress/fixtures/forward_ref.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/forward_ref_bad_data.json b/tests/fixtures_regress/fixtures/forward_ref_bad_data.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/forward_ref_bad_data.json
rename to tests/fixtures_regress/fixtures/forward_ref_bad_data.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/forward_ref_lookup.json b/tests/fixtures_regress/fixtures/forward_ref_lookup.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/forward_ref_lookup.json
rename to tests/fixtures_regress/fixtures/forward_ref_lookup.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/model-inheritance.json b/tests/fixtures_regress/fixtures/model-inheritance.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/model-inheritance.json
rename to tests/fixtures_regress/fixtures/model-inheritance.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/nk-inheritance.json b/tests/fixtures_regress/fixtures/nk-inheritance.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/nk-inheritance.json
rename to tests/fixtures_regress/fixtures/nk-inheritance.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/nk-inheritance2.xml b/tests/fixtures_regress/fixtures/nk-inheritance2.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/nk-inheritance2.xml
rename to tests/fixtures_regress/fixtures/nk-inheritance2.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/non_natural_1.json b/tests/fixtures_regress/fixtures/non_natural_1.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/non_natural_1.json
rename to tests/fixtures_regress/fixtures/non_natural_1.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/non_natural_2.xml b/tests/fixtures_regress/fixtures/non_natural_2.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/non_natural_2.xml
rename to tests/fixtures_regress/fixtures/non_natural_2.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/pretty.xml b/tests/fixtures_regress/fixtures/pretty.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/pretty.xml
rename to tests/fixtures_regress/fixtures/pretty.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/sequence.json b/tests/fixtures_regress/fixtures/sequence.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/sequence.json
rename to tests/fixtures_regress/fixtures/sequence.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/sequence_extra.json b/tests/fixtures_regress/fixtures/sequence_extra.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/sequence_extra.json
rename to tests/fixtures_regress/fixtures/sequence_extra.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/thingy.json b/tests/fixtures_regress/fixtures/thingy.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/thingy.json
rename to tests/fixtures_regress/fixtures/thingy.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures_1/forward_ref_1.json b/tests/fixtures_regress/fixtures_1/forward_ref_1.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures_1/forward_ref_1.json
rename to tests/fixtures_regress/fixtures_1/forward_ref_1.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures_2/forward_ref_2.json b/tests/fixtures_regress/fixtures_2/forward_ref_2.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures_2/forward_ref_2.json
rename to tests/fixtures_regress/fixtures_2/forward_ref_2.json
diff --git a/tests/regressiontests/fixtures_regress/models.py b/tests/fixtures_regress/models.py
similarity index 100%
rename from tests/regressiontests/fixtures_regress/models.py
rename to tests/fixtures_regress/models.py
diff --git a/tests/regressiontests/fixtures_regress/tests.py b/tests/fixtures_regress/tests.py
similarity index 100%
rename from tests/regressiontests/fixtures_regress/tests.py
rename to tests/fixtures_regress/tests.py
diff --git a/tests/modeltests/user_commands/management/__init__.py b/tests/force_insert_update/__init__.py
similarity index 100%
rename from tests/modeltests/user_commands/management/__init__.py
rename to tests/force_insert_update/__init__.py
diff --git a/tests/modeltests/force_insert_update/models.py b/tests/force_insert_update/models.py
similarity index 100%
rename from tests/modeltests/force_insert_update/models.py
rename to tests/force_insert_update/models.py
diff --git a/tests/modeltests/force_insert_update/tests.py b/tests/force_insert_update/tests.py
similarity index 100%
rename from tests/modeltests/force_insert_update/tests.py
rename to tests/force_insert_update/tests.py
diff --git a/tests/modeltests/user_commands/management/commands/__init__.py b/tests/forms/__init__.py
similarity index 100%
rename from tests/modeltests/user_commands/management/commands/__init__.py
rename to tests/forms/__init__.py
diff --git a/tests/regressiontests/forms/models.py b/tests/forms/models.py
similarity index 100%
rename from tests/regressiontests/forms/models.py
rename to tests/forms/models.py
diff --git a/tests/regressiontests/forms/templates/forms/article_form.html b/tests/forms/templates/forms/article_form.html
similarity index 100%
rename from tests/regressiontests/forms/templates/forms/article_form.html
rename to tests/forms/templates/forms/article_form.html
diff --git a/tests/regressiontests/forms/tests/__init__.py b/tests/forms/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/forms/tests/__init__.py
rename to tests/forms/tests/__init__.py
diff --git a/tests/regressiontests/forms/tests/error_messages.py b/tests/forms/tests/error_messages.py
similarity index 100%
rename from tests/regressiontests/forms/tests/error_messages.py
rename to tests/forms/tests/error_messages.py
diff --git a/tests/regressiontests/forms/tests/extra.py b/tests/forms/tests/extra.py
similarity index 100%
rename from tests/regressiontests/forms/tests/extra.py
rename to tests/forms/tests/extra.py
diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/forms/tests/fields.py
similarity index 100%
rename from tests/regressiontests/forms/tests/fields.py
rename to tests/forms/tests/fields.py
diff --git a/tests/regressiontests/forms/tests/filepath_test_files/.dot-file b/tests/forms/tests/filepath_test_files/.dot-file
similarity index 100%
rename from tests/regressiontests/forms/tests/filepath_test_files/.dot-file
rename to tests/forms/tests/filepath_test_files/.dot-file
diff --git a/tests/regressiontests/forms/tests/filepath_test_files/directory/.keep b/tests/forms/tests/filepath_test_files/directory/.keep
similarity index 100%
rename from tests/regressiontests/forms/tests/filepath_test_files/directory/.keep
rename to tests/forms/tests/filepath_test_files/directory/.keep
diff --git a/tests/regressiontests/forms/tests/filepath_test_files/fake-image.jpg b/tests/forms/tests/filepath_test_files/fake-image.jpg
similarity index 100%
rename from tests/regressiontests/forms/tests/filepath_test_files/fake-image.jpg
rename to tests/forms/tests/filepath_test_files/fake-image.jpg
diff --git a/tests/regressiontests/forms/tests/filepath_test_files/real-text-file.txt b/tests/forms/tests/filepath_test_files/real-text-file.txt
similarity index 100%
rename from tests/regressiontests/forms/tests/filepath_test_files/real-text-file.txt
rename to tests/forms/tests/filepath_test_files/real-text-file.txt
diff --git a/tests/regressiontests/forms/tests/forms.py b/tests/forms/tests/forms.py
similarity index 100%
rename from tests/regressiontests/forms/tests/forms.py
rename to tests/forms/tests/forms.py
diff --git a/tests/regressiontests/forms/tests/formsets.py b/tests/forms/tests/formsets.py
similarity index 100%
rename from tests/regressiontests/forms/tests/formsets.py
rename to tests/forms/tests/formsets.py
diff --git a/tests/regressiontests/forms/tests/input_formats.py b/tests/forms/tests/input_formats.py
similarity index 100%
rename from tests/regressiontests/forms/tests/input_formats.py
rename to tests/forms/tests/input_formats.py
diff --git a/tests/regressiontests/forms/tests/media.py b/tests/forms/tests/media.py
similarity index 100%
rename from tests/regressiontests/forms/tests/media.py
rename to tests/forms/tests/media.py
diff --git a/tests/regressiontests/forms/tests/models.py b/tests/forms/tests/models.py
similarity index 100%
rename from tests/regressiontests/forms/tests/models.py
rename to tests/forms/tests/models.py
diff --git a/tests/regressiontests/forms/tests/regressions.py b/tests/forms/tests/regressions.py
similarity index 100%
rename from tests/regressiontests/forms/tests/regressions.py
rename to tests/forms/tests/regressions.py
diff --git a/tests/regressiontests/forms/tests/util.py b/tests/forms/tests/util.py
similarity index 100%
rename from tests/regressiontests/forms/tests/util.py
rename to tests/forms/tests/util.py
diff --git a/tests/regressiontests/forms/tests/validators.py b/tests/forms/tests/validators.py
similarity index 100%
rename from tests/regressiontests/forms/tests/validators.py
rename to tests/forms/tests/validators.py
diff --git a/tests/regressiontests/forms/tests/widgets.py b/tests/forms/tests/widgets.py
similarity index 100%
rename from tests/regressiontests/forms/tests/widgets.py
rename to tests/forms/tests/widgets.py
diff --git a/tests/regressiontests/forms/urls.py b/tests/forms/urls.py
similarity index 100%
rename from tests/regressiontests/forms/urls.py
rename to tests/forms/urls.py
diff --git a/tests/regressiontests/forms/views.py b/tests/forms/views.py
similarity index 100%
rename from tests/regressiontests/forms/views.py
rename to tests/forms/views.py
diff --git a/tests/modeltests/validators/__init__.py b/tests/generic_inline_admin/__init__.py
similarity index 100%
rename from tests/modeltests/validators/__init__.py
rename to tests/generic_inline_admin/__init__.py
diff --git a/tests/regressiontests/generic_inline_admin/admin.py b/tests/generic_inline_admin/admin.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/admin.py
rename to tests/generic_inline_admin/admin.py
diff --git a/tests/regressiontests/generic_inline_admin/fixtures/users.xml b/tests/generic_inline_admin/fixtures/users.xml
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/fixtures/users.xml
rename to tests/generic_inline_admin/fixtures/users.xml
diff --git a/tests/regressiontests/generic_inline_admin/models.py b/tests/generic_inline_admin/models.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/models.py
rename to tests/generic_inline_admin/models.py
diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/tests.py
rename to tests/generic_inline_admin/tests.py
diff --git a/tests/regressiontests/generic_inline_admin/urls.py b/tests/generic_inline_admin/urls.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/urls.py
rename to tests/generic_inline_admin/urls.py
diff --git a/tests/regressiontests/admin_changelist/__init__.py b/tests/generic_relations/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_changelist/__init__.py
rename to tests/generic_relations/__init__.py
diff --git a/tests/modeltests/generic_relations/models.py b/tests/generic_relations/models.py
similarity index 100%
rename from tests/modeltests/generic_relations/models.py
rename to tests/generic_relations/models.py
diff --git a/tests/modeltests/generic_relations/tests.py b/tests/generic_relations/tests.py
similarity index 100%
rename from tests/modeltests/generic_relations/tests.py
rename to tests/generic_relations/tests.py
diff --git a/tests/regressiontests/admin_filters/__init__.py b/tests/generic_relations_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_filters/__init__.py
rename to tests/generic_relations_regress/__init__.py
diff --git a/tests/regressiontests/generic_relations_regress/models.py b/tests/generic_relations_regress/models.py
similarity index 100%
rename from tests/regressiontests/generic_relations_regress/models.py
rename to tests/generic_relations_regress/models.py
diff --git a/tests/regressiontests/generic_relations_regress/tests.py b/tests/generic_relations_regress/tests.py
similarity index 100%
rename from tests/regressiontests/generic_relations_regress/tests.py
rename to tests/generic_relations_regress/tests.py
diff --git a/tests/regressiontests/admin_inlines/__init__.py b/tests/generic_views/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_inlines/__init__.py
rename to tests/generic_views/__init__.py
diff --git a/tests/regressiontests/generic_views/base.py b/tests/generic_views/base.py
similarity index 100%
rename from tests/regressiontests/generic_views/base.py
rename to tests/generic_views/base.py
diff --git a/tests/regressiontests/generic_views/dates.py b/tests/generic_views/dates.py
similarity index 100%
rename from tests/regressiontests/generic_views/dates.py
rename to tests/generic_views/dates.py
diff --git a/tests/regressiontests/generic_views/detail.py b/tests/generic_views/detail.py
similarity index 100%
rename from tests/regressiontests/generic_views/detail.py
rename to tests/generic_views/detail.py
diff --git a/tests/regressiontests/generic_views/edit.py b/tests/generic_views/edit.py
similarity index 100%
rename from tests/regressiontests/generic_views/edit.py
rename to tests/generic_views/edit.py
diff --git a/tests/regressiontests/generic_views/fixtures/generic-views-test-data.json b/tests/generic_views/fixtures/generic-views-test-data.json
similarity index 100%
rename from tests/regressiontests/generic_views/fixtures/generic-views-test-data.json
rename to tests/generic_views/fixtures/generic-views-test-data.json
diff --git a/tests/regressiontests/generic_views/forms.py b/tests/generic_views/forms.py
similarity index 100%
rename from tests/regressiontests/generic_views/forms.py
rename to tests/generic_views/forms.py
diff --git a/tests/regressiontests/generic_views/list.py b/tests/generic_views/list.py
similarity index 100%
rename from tests/regressiontests/generic_views/list.py
rename to tests/generic_views/list.py
diff --git a/tests/regressiontests/generic_views/models.py b/tests/generic_views/models.py
similarity index 100%
rename from tests/regressiontests/generic_views/models.py
rename to tests/generic_views/models.py
diff --git a/tests/regressiontests/generic_views/templates/generic_views/about.html b/tests/generic_views/templates/generic_views/about.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/about.html
rename to tests/generic_views/templates/generic_views/about.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/apple_detail.html b/tests/generic_views/templates/generic_views/apple_detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/apple_detail.html
rename to tests/generic_views/templates/generic_views/apple_detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/artist_detail.html b/tests/generic_views/templates/generic_views/artist_detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/artist_detail.html
rename to tests/generic_views/templates/generic_views/artist_detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/artist_form.html b/tests/generic_views/templates/generic_views/artist_form.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/artist_form.html
rename to tests/generic_views/templates/generic_views/artist_form.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_confirm_delete.html b/tests/generic_views/templates/generic_views/author_confirm_delete.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_confirm_delete.html
rename to tests/generic_views/templates/generic_views/author_confirm_delete.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_detail.html b/tests/generic_views/templates/generic_views/author_detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_detail.html
rename to tests/generic_views/templates/generic_views/author_detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_form.html b/tests/generic_views/templates/generic_views/author_form.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_form.html
rename to tests/generic_views/templates/generic_views/author_form.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_list.html b/tests/generic_views/templates/generic_views/author_list.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_list.html
rename to tests/generic_views/templates/generic_views/author_list.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_objects.html b/tests/generic_views/templates/generic_views/author_objects.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_objects.html
rename to tests/generic_views/templates/generic_views/author_objects.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_view.html b/tests/generic_views/templates/generic_views/author_view.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_view.html
rename to tests/generic_views/templates/generic_views/author_view.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive.html b/tests/generic_views/templates/generic_views/book_archive.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive.html
rename to tests/generic_views/templates/generic_views/book_archive.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive_day.html b/tests/generic_views/templates/generic_views/book_archive_day.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive_day.html
rename to tests/generic_views/templates/generic_views/book_archive_day.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive_month.html b/tests/generic_views/templates/generic_views/book_archive_month.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive_month.html
rename to tests/generic_views/templates/generic_views/book_archive_month.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive_week.html b/tests/generic_views/templates/generic_views/book_archive_week.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive_week.html
rename to tests/generic_views/templates/generic_views/book_archive_week.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive_year.html b/tests/generic_views/templates/generic_views/book_archive_year.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive_year.html
rename to tests/generic_views/templates/generic_views/book_archive_year.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_detail.html b/tests/generic_views/templates/generic_views/book_detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_detail.html
rename to tests/generic_views/templates/generic_views/book_detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_list.html b/tests/generic_views/templates/generic_views/book_list.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_list.html
rename to tests/generic_views/templates/generic_views/book_list.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/confirm_delete.html b/tests/generic_views/templates/generic_views/confirm_delete.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/confirm_delete.html
rename to tests/generic_views/templates/generic_views/confirm_delete.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/detail.html b/tests/generic_views/templates/generic_views/detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/detail.html
rename to tests/generic_views/templates/generic_views/detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/form.html b/tests/generic_views/templates/generic_views/form.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/form.html
rename to tests/generic_views/templates/generic_views/form.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/list.html b/tests/generic_views/templates/generic_views/list.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/list.html
rename to tests/generic_views/templates/generic_views/list.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/page_template.html b/tests/generic_views/templates/generic_views/page_template.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/page_template.html
rename to tests/generic_views/templates/generic_views/page_template.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/robots.txt b/tests/generic_views/templates/generic_views/robots.txt
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/robots.txt
rename to tests/generic_views/templates/generic_views/robots.txt
diff --git a/tests/regressiontests/generic_views/templates/registration/login.html b/tests/generic_views/templates/registration/login.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/registration/login.html
rename to tests/generic_views/templates/registration/login.html
diff --git a/tests/regressiontests/generic_views/tests.py b/tests/generic_views/tests.py
similarity index 100%
rename from tests/regressiontests/generic_views/tests.py
rename to tests/generic_views/tests.py
diff --git a/tests/regressiontests/generic_views/urls.py b/tests/generic_views/urls.py
similarity index 100%
rename from tests/regressiontests/generic_views/urls.py
rename to tests/generic_views/urls.py
diff --git a/tests/regressiontests/generic_views/views.py b/tests/generic_views/views.py
similarity index 100%
rename from tests/regressiontests/generic_views/views.py
rename to tests/generic_views/views.py
diff --git a/tests/regressiontests/admin_ordering/__init__.py b/tests/get_earliest_or_latest/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_ordering/__init__.py
rename to tests/get_earliest_or_latest/__init__.py
diff --git a/tests/modeltests/get_earliest_or_latest/models.py b/tests/get_earliest_or_latest/models.py
similarity index 100%
rename from tests/modeltests/get_earliest_or_latest/models.py
rename to tests/get_earliest_or_latest/models.py
diff --git a/tests/modeltests/get_earliest_or_latest/tests.py b/tests/get_earliest_or_latest/tests.py
similarity index 100%
rename from tests/modeltests/get_earliest_or_latest/tests.py
rename to tests/get_earliest_or_latest/tests.py
diff --git a/tests/regressiontests/admin_registration/__init__.py b/tests/get_object_or_404/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_registration/__init__.py
rename to tests/get_object_or_404/__init__.py
diff --git a/tests/modeltests/get_object_or_404/models.py b/tests/get_object_or_404/models.py
similarity index 100%
rename from tests/modeltests/get_object_or_404/models.py
rename to tests/get_object_or_404/models.py
diff --git a/tests/modeltests/get_object_or_404/tests.py b/tests/get_object_or_404/tests.py
similarity index 100%
rename from tests/modeltests/get_object_or_404/tests.py
rename to tests/get_object_or_404/tests.py
diff --git a/tests/regressiontests/admin_scripts/__init__.py b/tests/get_or_create/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/__init__.py
rename to tests/get_or_create/__init__.py
diff --git a/tests/modeltests/get_or_create/models.py b/tests/get_or_create/models.py
similarity index 100%
rename from tests/modeltests/get_or_create/models.py
rename to tests/get_or_create/models.py
diff --git a/tests/modeltests/get_or_create/tests.py b/tests/get_or_create/tests.py
similarity index 100%
rename from tests/modeltests/get_or_create/tests.py
rename to tests/get_or_create/tests.py
diff --git a/tests/regressiontests/admin_scripts/app_with_import/__init__.py b/tests/get_or_create_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/app_with_import/__init__.py
rename to tests/get_or_create_regress/__init__.py
diff --git a/tests/regressiontests/get_or_create_regress/models.py b/tests/get_or_create_regress/models.py
similarity index 100%
rename from tests/regressiontests/get_or_create_regress/models.py
rename to tests/get_or_create_regress/models.py
diff --git a/tests/regressiontests/get_or_create_regress/tests.py b/tests/get_or_create_regress/tests.py
similarity index 100%
rename from tests/regressiontests/get_or_create_regress/tests.py
rename to tests/get_or_create_regress/tests.py
diff --git a/tests/regressiontests/admin_scripts/broken_app/__init__.py b/tests/handlers/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/broken_app/__init__.py
rename to tests/handlers/__init__.py
diff --git a/tests/regressiontests/dispatch/models.py b/tests/handlers/models.py
similarity index 100%
rename from tests/regressiontests/dispatch/models.py
rename to tests/handlers/models.py
diff --git a/tests/regressiontests/handlers/tests.py b/tests/handlers/tests.py
similarity index 100%
rename from tests/regressiontests/handlers/tests.py
rename to tests/handlers/tests.py
diff --git a/tests/regressiontests/handlers/urls.py b/tests/handlers/urls.py
similarity index 100%
rename from tests/regressiontests/handlers/urls.py
rename to tests/handlers/urls.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/__init__.py b/tests/http_utils/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/__init__.py
rename to tests/http_utils/__init__.py
diff --git a/tests/regressiontests/file_storage/models.py b/tests/http_utils/models.py
similarity index 100%
rename from tests/regressiontests/file_storage/models.py
rename to tests/http_utils/models.py
diff --git a/tests/regressiontests/http_utils/tests.py b/tests/http_utils/tests.py
similarity index 100%
rename from tests/regressiontests/http_utils/tests.py
rename to tests/http_utils/tests.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py b/tests/httpwrappers/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
rename to tests/httpwrappers/__init__.py
diff --git a/tests/regressiontests/httpwrappers/abc.txt b/tests/httpwrappers/abc.txt
similarity index 100%
rename from tests/regressiontests/httpwrappers/abc.txt
rename to tests/httpwrappers/abc.txt
diff --git a/tests/regressiontests/handlers/models.py b/tests/httpwrappers/models.py
similarity index 100%
rename from tests/regressiontests/handlers/models.py
rename to tests/httpwrappers/models.py
diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/httpwrappers/tests.py
similarity index 100%
rename from tests/regressiontests/httpwrappers/tests.py
rename to tests/httpwrappers/tests.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/app_template/__init__.py b/tests/i18n/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/app_template/__init__.py
rename to tests/i18n/__init__.py
diff --git a/tests/regressiontests/i18n/commands/__init__.py b/tests/i18n/commands/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/commands/__init__.py
rename to tests/i18n/commands/__init__.py
diff --git a/tests/regressiontests/i18n/commands/code.sample b/tests/i18n/commands/code.sample
similarity index 100%
rename from tests/regressiontests/i18n/commands/code.sample
rename to tests/i18n/commands/code.sample
diff --git a/tests/regressiontests/i18n/commands/compilation.py b/tests/i18n/commands/compilation.py
similarity index 100%
rename from tests/regressiontests/i18n/commands/compilation.py
rename to tests/i18n/commands/compilation.py
diff --git a/tests/regressiontests/i18n/commands/extraction.py b/tests/i18n/commands/extraction.py
similarity index 100%
rename from tests/regressiontests/i18n/commands/extraction.py
rename to tests/i18n/commands/extraction.py
diff --git a/tests/regressiontests/i18n/commands/ignore_dir/ignored.html b/tests/i18n/commands/ignore_dir/ignored.html
similarity index 100%
rename from tests/regressiontests/i18n/commands/ignore_dir/ignored.html
rename to tests/i18n/commands/ignore_dir/ignored.html
diff --git a/tests/regressiontests/i18n/commands/javascript.js b/tests/i18n/commands/javascript.js
similarity index 100%
rename from tests/regressiontests/i18n/commands/javascript.js
rename to tests/i18n/commands/javascript.js
diff --git a/tests/regressiontests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po b/tests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po
rename to tests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/commands/locale/fr/LC_MESSAGES/django.po b/tests/i18n/commands/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/commands/locale/fr/LC_MESSAGES/django.po
rename to tests/i18n/commands/locale/fr/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/commands/locale/hr/LC_MESSAGES/django.po b/tests/i18n/commands/locale/hr/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/commands/locale/hr/LC_MESSAGES/django.po
rename to tests/i18n/commands/locale/hr/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.mo b/tests/i18n/commands/locale/it/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.mo
rename to tests/i18n/commands/locale/it/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.po b/tests/i18n/commands/locale/it/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.po
rename to tests/i18n/commands/locale/it/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/commands/templates/comments.thtml b/tests/i18n/commands/templates/comments.thtml
similarity index 100%
rename from tests/regressiontests/i18n/commands/templates/comments.thtml
rename to tests/i18n/commands/templates/comments.thtml
diff --git a/tests/regressiontests/i18n/commands/templates/template_with_error.tpl b/tests/i18n/commands/templates/template_with_error.tpl
similarity index 100%
rename from tests/regressiontests/i18n/commands/templates/template_with_error.tpl
rename to tests/i18n/commands/templates/template_with_error.tpl
diff --git a/tests/regressiontests/i18n/commands/templates/test.html b/tests/i18n/commands/templates/test.html
similarity index 100%
rename from tests/regressiontests/i18n/commands/templates/test.html
rename to tests/i18n/commands/templates/test.html
diff --git a/tests/regressiontests/i18n/commands/tests.py b/tests/i18n/commands/tests.py
similarity index 100%
rename from tests/regressiontests/i18n/commands/tests.py
rename to tests/i18n/commands/tests.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/project_name/__init__.py b/tests/i18n/contenttypes/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/project_name/__init__.py
rename to tests/i18n/contenttypes/__init__.py
diff --git a/tests/regressiontests/i18n/contenttypes/locale/en/LC_MESSAGES/django.mo b/tests/i18n/contenttypes/locale/en/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/locale/en/LC_MESSAGES/django.mo
rename to tests/i18n/contenttypes/locale/en/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/contenttypes/locale/en/LC_MESSAGES/django.po b/tests/i18n/contenttypes/locale/en/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/locale/en/LC_MESSAGES/django.po
rename to tests/i18n/contenttypes/locale/en/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.mo b/tests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.mo
rename to tests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.po b/tests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.po
rename to tests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/contenttypes/tests.py b/tests/i18n/contenttypes/tests.py
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/tests.py
rename to tests/i18n/contenttypes/tests.py
diff --git a/tests/regressiontests/i18n/forms.py b/tests/i18n/forms.py
similarity index 100%
rename from tests/regressiontests/i18n/forms.py
rename to tests/i18n/forms.py
diff --git a/tests/regressiontests/i18n/models.py b/tests/i18n/models.py
similarity index 100%
rename from tests/regressiontests/i18n/models.py
rename to tests/i18n/models.py
diff --git a/tests/regressiontests/admin_scripts/management/__init__.py b/tests/i18n/other/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/__init__.py
rename to tests/i18n/other/__init__.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/__init__.py b/tests/i18n/other/locale/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/__init__.py
rename to tests/i18n/other/locale/__init__.py
diff --git a/tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.mo b/tests/i18n/other/locale/de/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.mo
rename to tests/i18n/other/locale/de/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.po b/tests/i18n/other/locale/de/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.po
rename to tests/i18n/other/locale/de/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/admin_scripts/simple_app/__init__.py b/tests/i18n/other/locale/de/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/simple_app/__init__.py
rename to tests/i18n/other/locale/de/__init__.py
diff --git a/tests/regressiontests/i18n/other/locale/de/formats.py b/tests/i18n/other/locale/de/formats.py
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/de/formats.py
rename to tests/i18n/other/locale/de/formats.py
diff --git a/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.mo b/tests/i18n/other/locale/fr/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.mo
rename to tests/i18n/other/locale/fr/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.po b/tests/i18n/other/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.po
rename to tests/i18n/other/locale/fr/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/admin_util/__init__.py b/tests/i18n/patterns/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_util/__init__.py
rename to tests/i18n/patterns/__init__.py
diff --git a/tests/regressiontests/i18n/patterns/locale/en/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/en/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/en/LC_MESSAGES/django.mo
rename to tests/i18n/patterns/locale/en/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/patterns/locale/en/LC_MESSAGES/django.po b/tests/i18n/patterns/locale/en/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/en/LC_MESSAGES/django.po
rename to tests/i18n/patterns/locale/en/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo
rename to tests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/patterns/locale/nl/LC_MESSAGES/django.po b/tests/i18n/patterns/locale/nl/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/nl/LC_MESSAGES/django.po
rename to tests/i18n/patterns/locale/nl/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo
rename to tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po b/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po
rename to tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/patterns/templates/404.html b/tests/i18n/patterns/templates/404.html
similarity index 100%
rename from tests/regressiontests/i18n/patterns/templates/404.html
rename to tests/i18n/patterns/templates/404.html
diff --git a/tests/regressiontests/i18n/patterns/templates/dummy.html b/tests/i18n/patterns/templates/dummy.html
similarity index 100%
rename from tests/regressiontests/i18n/patterns/templates/dummy.html
rename to tests/i18n/patterns/templates/dummy.html
diff --git a/tests/regressiontests/i18n/patterns/tests.py b/tests/i18n/patterns/tests.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/tests.py
rename to tests/i18n/patterns/tests.py
diff --git a/tests/regressiontests/admin_validation/__init__.py b/tests/i18n/patterns/urls/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_validation/__init__.py
rename to tests/i18n/patterns/urls/__init__.py
diff --git a/tests/regressiontests/i18n/patterns/urls/default.py b/tests/i18n/patterns/urls/default.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/default.py
rename to tests/i18n/patterns/urls/default.py
diff --git a/tests/regressiontests/i18n/patterns/urls/disabled.py b/tests/i18n/patterns/urls/disabled.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/disabled.py
rename to tests/i18n/patterns/urls/disabled.py
diff --git a/tests/regressiontests/i18n/patterns/urls/namespace.py b/tests/i18n/patterns/urls/namespace.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/namespace.py
rename to tests/i18n/patterns/urls/namespace.py
diff --git a/tests/regressiontests/i18n/patterns/urls/path_unused.py b/tests/i18n/patterns/urls/path_unused.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/path_unused.py
rename to tests/i18n/patterns/urls/path_unused.py
diff --git a/tests/regressiontests/i18n/patterns/urls/wrong.py b/tests/i18n/patterns/urls/wrong.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/wrong.py
rename to tests/i18n/patterns/urls/wrong.py
diff --git a/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py b/tests/i18n/patterns/urls/wrong_namespace.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/wrong_namespace.py
rename to tests/i18n/patterns/urls/wrong_namespace.py
diff --git a/tests/regressiontests/admin_views/__init__.py b/tests/i18n/resolution/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_views/__init__.py
rename to tests/i18n/resolution/__init__.py
diff --git a/tests/regressiontests/i18n/resolution/locale/de/LC_MESSAGES/django.mo b/tests/i18n/resolution/locale/de/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/resolution/locale/de/LC_MESSAGES/django.mo
rename to tests/i18n/resolution/locale/de/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/resolution/locale/de/LC_MESSAGES/django.po b/tests/i18n/resolution/locale/de/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/resolution/locale/de/LC_MESSAGES/django.po
rename to tests/i18n/resolution/locale/de/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/resolution/models.py b/tests/i18n/resolution/models.py
similarity index 100%
rename from tests/regressiontests/i18n/resolution/models.py
rename to tests/i18n/resolution/models.py
diff --git a/tests/regressiontests/i18n/tests.py b/tests/i18n/tests.py
similarity index 100%
rename from tests/regressiontests/i18n/tests.py
rename to tests/i18n/tests.py
diff --git a/tests/regressiontests/admin_widgets/__init__.py b/tests/indexes/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_widgets/__init__.py
rename to tests/indexes/__init__.py
diff --git a/tests/regressiontests/indexes/models.py b/tests/indexes/models.py
similarity index 100%
rename from tests/regressiontests/indexes/models.py
rename to tests/indexes/models.py
diff --git a/tests/regressiontests/indexes/tests.py b/tests/indexes/tests.py
similarity index 100%
rename from tests/regressiontests/indexes/tests.py
rename to tests/indexes/tests.py
diff --git a/tests/regressiontests/aggregation_regress/__init__.py b/tests/initial_sql_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/aggregation_regress/__init__.py
rename to tests/initial_sql_regress/__init__.py
diff --git a/tests/regressiontests/initial_sql_regress/models.py b/tests/initial_sql_regress/models.py
similarity index 100%
rename from tests/regressiontests/initial_sql_regress/models.py
rename to tests/initial_sql_regress/models.py
diff --git a/tests/regressiontests/initial_sql_regress/sql/simple.sql b/tests/initial_sql_regress/sql/simple.sql
similarity index 100%
rename from tests/regressiontests/initial_sql_regress/sql/simple.sql
rename to tests/initial_sql_regress/sql/simple.sql
diff --git a/tests/regressiontests/initial_sql_regress/tests.py b/tests/initial_sql_regress/tests.py
similarity index 100%
rename from tests/regressiontests/initial_sql_regress/tests.py
rename to tests/initial_sql_regress/tests.py
diff --git a/tests/regressiontests/app_loading/__init__.py b/tests/inline_formsets/__init__.py
similarity index 100%
rename from tests/regressiontests/app_loading/__init__.py
rename to tests/inline_formsets/__init__.py
diff --git a/tests/regressiontests/inline_formsets/models.py b/tests/inline_formsets/models.py
similarity index 100%
rename from tests/regressiontests/inline_formsets/models.py
rename to tests/inline_formsets/models.py
diff --git a/tests/regressiontests/inline_formsets/tests.py b/tests/inline_formsets/tests.py
similarity index 100%
rename from tests/regressiontests/inline_formsets/tests.py
rename to tests/inline_formsets/tests.py
diff --git a/tests/regressiontests/bash_completion/management/commands/__init__.py b/tests/inspectdb/__init__.py
similarity index 100%
rename from tests/regressiontests/bash_completion/management/commands/__init__.py
rename to tests/inspectdb/__init__.py
diff --git a/tests/regressiontests/inspectdb/models.py b/tests/inspectdb/models.py
similarity index 100%
rename from tests/regressiontests/inspectdb/models.py
rename to tests/inspectdb/models.py
diff --git a/tests/regressiontests/inspectdb/tests.py b/tests/inspectdb/tests.py
similarity index 100%
rename from tests/regressiontests/inspectdb/tests.py
rename to tests/inspectdb/tests.py
diff --git a/tests/regressiontests/app_loading/not_installed/__init__.py b/tests/introspection/__init__.py
similarity index 100%
rename from tests/regressiontests/app_loading/not_installed/__init__.py
rename to tests/introspection/__init__.py
diff --git a/tests/regressiontests/introspection/models.py b/tests/introspection/models.py
similarity index 100%
rename from tests/regressiontests/introspection/models.py
rename to tests/introspection/models.py
diff --git a/tests/regressiontests/introspection/tests.py b/tests/introspection/tests.py
similarity index 100%
rename from tests/regressiontests/introspection/tests.py
rename to tests/introspection/tests.py
diff --git a/tests/regressiontests/delete_regress/__init__.py b/tests/invalid_models/__init__.py
similarity index 100%
rename from tests/regressiontests/delete_regress/__init__.py
rename to tests/invalid_models/__init__.py
diff --git a/tests/regressiontests/backends/__init__.py b/tests/invalid_models/invalid_models/__init__.py
similarity index 100%
rename from tests/regressiontests/backends/__init__.py
rename to tests/invalid_models/invalid_models/__init__.py
diff --git a/tests/modeltests/invalid_models/invalid_models/models.py b/tests/invalid_models/invalid_models/models.py
similarity index 100%
rename from tests/modeltests/invalid_models/invalid_models/models.py
rename to tests/invalid_models/invalid_models/models.py
diff --git a/tests/regressiontests/http_utils/models.py b/tests/invalid_models/models.py
similarity index 100%
rename from tests/regressiontests/http_utils/models.py
rename to tests/invalid_models/models.py
diff --git a/tests/modeltests/invalid_models/tests.py b/tests/invalid_models/tests.py
similarity index 100%
rename from tests/modeltests/invalid_models/tests.py
rename to tests/invalid_models/tests.py
diff --git a/tests/regressiontests/bug639/__init__.py b/tests/known_related_objects/__init__.py
similarity index 100%
rename from tests/regressiontests/bug639/__init__.py
rename to tests/known_related_objects/__init__.py
diff --git a/tests/modeltests/known_related_objects/fixtures/tournament.json b/tests/known_related_objects/fixtures/tournament.json
similarity index 100%
rename from tests/modeltests/known_related_objects/fixtures/tournament.json
rename to tests/known_related_objects/fixtures/tournament.json
diff --git a/tests/modeltests/known_related_objects/models.py b/tests/known_related_objects/models.py
similarity index 100%
rename from tests/modeltests/known_related_objects/models.py
rename to tests/known_related_objects/models.py
diff --git a/tests/modeltests/known_related_objects/tests.py b/tests/known_related_objects/tests.py
similarity index 100%
rename from tests/modeltests/known_related_objects/tests.py
rename to tests/known_related_objects/tests.py
diff --git a/tests/regressiontests/bug8245/__init__.py b/tests/logging_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/bug8245/__init__.py
rename to tests/logging_tests/__init__.py
diff --git a/tests/regressiontests/logging_tests/logconfig.py b/tests/logging_tests/logconfig.py
similarity index 100%
rename from tests/regressiontests/logging_tests/logconfig.py
rename to tests/logging_tests/logconfig.py
diff --git a/tests/regressiontests/httpwrappers/models.py b/tests/logging_tests/models.py
similarity index 100%
rename from tests/regressiontests/httpwrappers/models.py
rename to tests/logging_tests/models.py
diff --git a/tests/regressiontests/logging_tests/tests.py b/tests/logging_tests/tests.py
similarity index 100%
rename from tests/regressiontests/logging_tests/tests.py
rename to tests/logging_tests/tests.py
diff --git a/tests/regressiontests/builtin_server/__init__.py b/tests/lookup/__init__.py
similarity index 100%
rename from tests/regressiontests/builtin_server/__init__.py
rename to tests/lookup/__init__.py
diff --git a/tests/modeltests/lookup/models.py b/tests/lookup/models.py
similarity index 100%
rename from tests/modeltests/lookup/models.py
rename to tests/lookup/models.py
diff --git a/tests/modeltests/lookup/tests.py b/tests/lookup/tests.py
similarity index 100%
rename from tests/modeltests/lookup/tests.py
rename to tests/lookup/tests.py
diff --git a/tests/regressiontests/bulk_create/__init__.py b/tests/m2m_and_m2o/__init__.py
similarity index 100%
rename from tests/regressiontests/bulk_create/__init__.py
rename to tests/m2m_and_m2o/__init__.py
diff --git a/tests/modeltests/m2m_and_m2o/models.py b/tests/m2m_and_m2o/models.py
similarity index 100%
rename from tests/modeltests/m2m_and_m2o/models.py
rename to tests/m2m_and_m2o/models.py
diff --git a/tests/modeltests/m2m_and_m2o/tests.py b/tests/m2m_and_m2o/tests.py
similarity index 100%
rename from tests/modeltests/m2m_and_m2o/tests.py
rename to tests/m2m_and_m2o/tests.py
diff --git a/tests/regressiontests/cache/__init__.py b/tests/m2m_intermediary/__init__.py
similarity index 100%
rename from tests/regressiontests/cache/__init__.py
rename to tests/m2m_intermediary/__init__.py
diff --git a/tests/modeltests/m2m_intermediary/models.py b/tests/m2m_intermediary/models.py
similarity index 100%
rename from tests/modeltests/m2m_intermediary/models.py
rename to tests/m2m_intermediary/models.py
diff --git a/tests/modeltests/m2m_intermediary/tests.py b/tests/m2m_intermediary/tests.py
similarity index 100%
rename from tests/modeltests/m2m_intermediary/tests.py
rename to tests/m2m_intermediary/tests.py
diff --git a/tests/regressiontests/commands_sql/__init__.py b/tests/m2m_multiple/__init__.py
similarity index 100%
rename from tests/regressiontests/commands_sql/__init__.py
rename to tests/m2m_multiple/__init__.py
diff --git a/tests/modeltests/m2m_multiple/models.py b/tests/m2m_multiple/models.py
similarity index 100%
rename from tests/modeltests/m2m_multiple/models.py
rename to tests/m2m_multiple/models.py
diff --git a/tests/modeltests/m2m_multiple/tests.py b/tests/m2m_multiple/tests.py
similarity index 100%
rename from tests/modeltests/m2m_multiple/tests.py
rename to tests/m2m_multiple/tests.py
diff --git a/tests/regressiontests/comment_tests/__init__.py b/tests/m2m_recursive/__init__.py
similarity index 100%
rename from tests/regressiontests/comment_tests/__init__.py
rename to tests/m2m_recursive/__init__.py
diff --git a/tests/modeltests/m2m_recursive/models.py b/tests/m2m_recursive/models.py
similarity index 100%
rename from tests/modeltests/m2m_recursive/models.py
rename to tests/m2m_recursive/models.py
diff --git a/tests/modeltests/m2m_recursive/tests.py b/tests/m2m_recursive/tests.py
similarity index 100%
rename from tests/modeltests/m2m_recursive/tests.py
rename to tests/m2m_recursive/tests.py
diff --git a/tests/regressiontests/context_processors/__init__.py b/tests/m2m_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/context_processors/__init__.py
rename to tests/m2m_regress/__init__.py
diff --git a/tests/regressiontests/m2m_regress/models.py b/tests/m2m_regress/models.py
similarity index 100%
rename from tests/regressiontests/m2m_regress/models.py
rename to tests/m2m_regress/models.py
diff --git a/tests/regressiontests/m2m_regress/tests.py b/tests/m2m_regress/tests.py
similarity index 100%
rename from tests/regressiontests/m2m_regress/tests.py
rename to tests/m2m_regress/tests.py
diff --git a/tests/regressiontests/file_storage/__init__.py b/tests/m2m_signals/__init__.py
similarity index 100%
rename from tests/regressiontests/file_storage/__init__.py
rename to tests/m2m_signals/__init__.py
diff --git a/tests/modeltests/m2m_signals/models.py b/tests/m2m_signals/models.py
similarity index 100%
rename from tests/modeltests/m2m_signals/models.py
rename to tests/m2m_signals/models.py
diff --git a/tests/modeltests/m2m_signals/tests.py b/tests/m2m_signals/tests.py
similarity index 100%
rename from tests/modeltests/m2m_signals/tests.py
rename to tests/m2m_signals/tests.py
diff --git a/tests/modeltests/m2m_through/__init__.py b/tests/m2m_through/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_through/__init__.py
rename to tests/m2m_through/__init__.py
diff --git a/tests/modeltests/m2m_through/models.py b/tests/m2m_through/models.py
similarity index 100%
rename from tests/modeltests/m2m_through/models.py
rename to tests/m2m_through/models.py
diff --git a/tests/modeltests/m2m_through/tests.py b/tests/m2m_through/tests.py
similarity index 100%
rename from tests/modeltests/m2m_through/tests.py
rename to tests/m2m_through/tests.py
diff --git a/tests/modeltests/unmanaged_models/__init__.py b/tests/m2m_through_regress/__init__.py
similarity index 100%
rename from tests/modeltests/unmanaged_models/__init__.py
rename to tests/m2m_through_regress/__init__.py
diff --git a/tests/regressiontests/m2m_through_regress/fixtures/m2m_through.json b/tests/m2m_through_regress/fixtures/m2m_through.json
similarity index 100%
rename from tests/regressiontests/m2m_through_regress/fixtures/m2m_through.json
rename to tests/m2m_through_regress/fixtures/m2m_through.json
diff --git a/tests/regressiontests/m2m_through_regress/models.py b/tests/m2m_through_regress/models.py
similarity index 100%
rename from tests/regressiontests/m2m_through_regress/models.py
rename to tests/m2m_through_regress/models.py
diff --git a/tests/regressiontests/m2m_through_regress/tests.py b/tests/m2m_through_regress/tests.py
similarity index 100%
rename from tests/regressiontests/m2m_through_regress/tests.py
rename to tests/m2m_through_regress/tests.py
diff --git a/tests/regressiontests/createsuperuser/__init__.py b/tests/m2o_recursive/__init__.py
similarity index 100%
rename from tests/regressiontests/createsuperuser/__init__.py
rename to tests/m2o_recursive/__init__.py
diff --git a/tests/modeltests/m2o_recursive/models.py b/tests/m2o_recursive/models.py
similarity index 100%
rename from tests/modeltests/m2o_recursive/models.py
rename to tests/m2o_recursive/models.py
diff --git a/tests/modeltests/m2o_recursive/tests.py b/tests/m2o_recursive/tests.py
similarity index 100%
rename from tests/modeltests/m2o_recursive/tests.py
rename to tests/m2o_recursive/tests.py
diff --git a/tests/regressiontests/m2m_through_regress/__init__.py b/tests/mail/__init__.py
similarity index 100%
rename from tests/regressiontests/m2m_through_regress/__init__.py
rename to tests/mail/__init__.py
diff --git a/tests/regressiontests/mail/custombackend.py b/tests/mail/custombackend.py
similarity index 100%
rename from tests/regressiontests/mail/custombackend.py
rename to tests/mail/custombackend.py
diff --git a/tests/regressiontests/mail/models.py b/tests/mail/models.py
similarity index 100%
rename from tests/regressiontests/mail/models.py
rename to tests/mail/models.py
diff --git a/tests/regressiontests/mail/tests.py b/tests/mail/tests.py
similarity index 100%
rename from tests/regressiontests/mail/tests.py
rename to tests/mail/tests.py
diff --git a/tests/regressiontests/csrf_tests/__init__.py b/tests/managers_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/csrf_tests/__init__.py
rename to tests/managers_regress/__init__.py
diff --git a/tests/regressiontests/managers_regress/models.py b/tests/managers_regress/models.py
similarity index 100%
rename from tests/regressiontests/managers_regress/models.py
rename to tests/managers_regress/models.py
diff --git a/tests/regressiontests/managers_regress/tests.py b/tests/managers_regress/tests.py
similarity index 100%
rename from tests/regressiontests/managers_regress/tests.py
rename to tests/managers_regress/tests.py
diff --git a/tests/regressiontests/custom_columns_regress/__init__.py b/tests/many_to_many/__init__.py
similarity index 100%
rename from tests/regressiontests/custom_columns_regress/__init__.py
rename to tests/many_to_many/__init__.py
diff --git a/tests/modeltests/many_to_many/models.py b/tests/many_to_many/models.py
similarity index 100%
rename from tests/modeltests/many_to_many/models.py
rename to tests/many_to_many/models.py
diff --git a/tests/modeltests/many_to_many/tests.py b/tests/many_to_many/tests.py
similarity index 100%
rename from tests/modeltests/many_to_many/tests.py
rename to tests/many_to_many/tests.py
diff --git a/tests/regressiontests/custom_managers_regress/__init__.py b/tests/many_to_one/__init__.py
similarity index 100%
rename from tests/regressiontests/custom_managers_regress/__init__.py
rename to tests/many_to_one/__init__.py
diff --git a/tests/modeltests/many_to_one/models.py b/tests/many_to_one/models.py
similarity index 100%
rename from tests/modeltests/many_to_one/models.py
rename to tests/many_to_one/models.py
diff --git a/tests/modeltests/many_to_one/tests.py b/tests/many_to_one/tests.py
similarity index 100%
rename from tests/modeltests/many_to_one/tests.py
rename to tests/many_to_one/tests.py
diff --git a/tests/regressiontests/datatypes/__init__.py b/tests/many_to_one_null/__init__.py
similarity index 100%
rename from tests/regressiontests/datatypes/__init__.py
rename to tests/many_to_one_null/__init__.py
diff --git a/tests/modeltests/many_to_one_null/models.py b/tests/many_to_one_null/models.py
similarity index 100%
rename from tests/modeltests/many_to_one_null/models.py
rename to tests/many_to_one_null/models.py
diff --git a/tests/modeltests/many_to_one_null/tests.py b/tests/many_to_one_null/tests.py
similarity index 100%
rename from tests/modeltests/many_to_one_null/tests.py
rename to tests/many_to_one_null/tests.py
diff --git a/tests/regressiontests/dates/__init__.py b/tests/many_to_one_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/dates/__init__.py
rename to tests/many_to_one_regress/__init__.py
diff --git a/tests/regressiontests/many_to_one_regress/models.py b/tests/many_to_one_regress/models.py
similarity index 100%
rename from tests/regressiontests/many_to_one_regress/models.py
rename to tests/many_to_one_regress/models.py
diff --git a/tests/regressiontests/many_to_one_regress/tests.py b/tests/many_to_one_regress/tests.py
similarity index 100%
rename from tests/regressiontests/many_to_one_regress/tests.py
rename to tests/many_to_one_regress/tests.py
diff --git a/tests/regressiontests/inspectdb/__init__.py b/tests/max_lengths/__init__.py
similarity index 100%
rename from tests/regressiontests/inspectdb/__init__.py
rename to tests/max_lengths/__init__.py
diff --git a/tests/regressiontests/max_lengths/models.py b/tests/max_lengths/models.py
similarity index 100%
rename from tests/regressiontests/max_lengths/models.py
rename to tests/max_lengths/models.py
diff --git a/tests/regressiontests/max_lengths/tests.py b/tests/max_lengths/tests.py
similarity index 100%
rename from tests/regressiontests/max_lengths/tests.py
rename to tests/max_lengths/tests.py
diff --git a/tests/regressiontests/datetimes/__init__.py b/tests/middleware/__init__.py
similarity index 100%
rename from tests/regressiontests/datetimes/__init__.py
rename to tests/middleware/__init__.py
diff --git a/tests/regressiontests/middleware/cond_get_urls.py b/tests/middleware/cond_get_urls.py
similarity index 100%
rename from tests/regressiontests/middleware/cond_get_urls.py
rename to tests/middleware/cond_get_urls.py
diff --git a/tests/regressiontests/middleware/extra_urls.py b/tests/middleware/extra_urls.py
similarity index 100%
rename from tests/regressiontests/middleware/extra_urls.py
rename to tests/middleware/extra_urls.py
diff --git a/tests/regressiontests/middleware/models.py b/tests/middleware/models.py
similarity index 100%
rename from tests/regressiontests/middleware/models.py
rename to tests/middleware/models.py
diff --git a/tests/regressiontests/middleware/tests.py b/tests/middleware/tests.py
similarity index 100%
rename from tests/regressiontests/middleware/tests.py
rename to tests/middleware/tests.py
diff --git a/tests/regressiontests/middleware/urls.py b/tests/middleware/urls.py
similarity index 100%
rename from tests/regressiontests/middleware/urls.py
rename to tests/middleware/urls.py
diff --git a/tests/regressiontests/db_typecasts/__init__.py b/tests/middleware_exceptions/__init__.py
similarity index 100%
rename from tests/regressiontests/db_typecasts/__init__.py
rename to tests/middleware_exceptions/__init__.py
diff --git a/tests/regressiontests/logging_tests/models.py b/tests/middleware_exceptions/models.py
similarity index 100%
rename from tests/regressiontests/logging_tests/models.py
rename to tests/middleware_exceptions/models.py
diff --git a/tests/regressiontests/middleware_exceptions/tests.py b/tests/middleware_exceptions/tests.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/tests.py
rename to tests/middleware_exceptions/tests.py
diff --git a/tests/regressiontests/middleware_exceptions/urls.py b/tests/middleware_exceptions/urls.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/urls.py
rename to tests/middleware_exceptions/urls.py
diff --git a/tests/regressiontests/middleware_exceptions/views.py b/tests/middleware_exceptions/views.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/views.py
rename to tests/middleware_exceptions/views.py
diff --git a/tests/regressiontests/model_fields/4x8.png b/tests/model_fields/4x8.png
similarity index 100%
rename from tests/regressiontests/model_fields/4x8.png
rename to tests/model_fields/4x8.png
diff --git a/tests/regressiontests/model_fields/8x4.png b/tests/model_fields/8x4.png
similarity index 100%
rename from tests/regressiontests/model_fields/8x4.png
rename to tests/model_fields/8x4.png
diff --git a/tests/regressiontests/decorators/__init__.py b/tests/model_fields/__init__.py
similarity index 100%
rename from tests/regressiontests/decorators/__init__.py
rename to tests/model_fields/__init__.py
diff --git a/tests/regressiontests/model_fields/imagefield.py b/tests/model_fields/imagefield.py
similarity index 100%
rename from tests/regressiontests/model_fields/imagefield.py
rename to tests/model_fields/imagefield.py
diff --git a/tests/regressiontests/model_fields/models.py b/tests/model_fields/models.py
similarity index 100%
rename from tests/regressiontests/model_fields/models.py
rename to tests/model_fields/models.py
diff --git a/tests/regressiontests/model_fields/tests.py b/tests/model_fields/tests.py
similarity index 100%
rename from tests/regressiontests/model_fields/tests.py
rename to tests/model_fields/tests.py
diff --git a/tests/regressiontests/defaultfilters/__init__.py b/tests/model_forms/__init__.py
similarity index 100%
rename from tests/regressiontests/defaultfilters/__init__.py
rename to tests/model_forms/__init__.py
diff --git a/tests/modeltests/model_forms/models.py b/tests/model_forms/models.py
similarity index 100%
rename from tests/modeltests/model_forms/models.py
rename to tests/model_forms/models.py
diff --git a/tests/regressiontests/file_storage/test.png b/tests/model_forms/test.png
similarity index 100%
rename from tests/regressiontests/file_storage/test.png
rename to tests/model_forms/test.png
diff --git a/tests/modeltests/model_forms/test2.png b/tests/model_forms/test2.png
similarity index 100%
rename from tests/modeltests/model_forms/test2.png
rename to tests/model_forms/test2.png
diff --git a/tests/modeltests/model_forms/tests.py b/tests/model_forms/tests.py
similarity index 100%
rename from tests/modeltests/model_forms/tests.py
rename to tests/model_forms/tests.py
diff --git a/tests/regressiontests/defer_regress/__init__.py b/tests/model_forms_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/defer_regress/__init__.py
rename to tests/model_forms_regress/__init__.py
diff --git a/tests/regressiontests/model_forms_regress/models.py b/tests/model_forms_regress/models.py
similarity index 100%
rename from tests/regressiontests/model_forms_regress/models.py
rename to tests/model_forms_regress/models.py
diff --git a/tests/regressiontests/model_forms_regress/tests.py b/tests/model_forms_regress/tests.py
similarity index 100%
rename from tests/regressiontests/model_forms_regress/tests.py
rename to tests/model_forms_regress/tests.py
diff --git a/tests/regressiontests/expressions_regress/__init__.py b/tests/model_formsets/__init__.py
similarity index 100%
rename from tests/regressiontests/expressions_regress/__init__.py
rename to tests/model_formsets/__init__.py
diff --git a/tests/modeltests/model_formsets/models.py b/tests/model_formsets/models.py
similarity index 100%
rename from tests/modeltests/model_formsets/models.py
rename to tests/model_formsets/models.py
diff --git a/tests/modeltests/model_formsets/tests.py b/tests/model_formsets/tests.py
similarity index 100%
rename from tests/modeltests/model_formsets/tests.py
rename to tests/model_formsets/tests.py
diff --git a/tests/regressiontests/extra_regress/__init__.py b/tests/model_formsets_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/extra_regress/__init__.py
rename to tests/model_formsets_regress/__init__.py
diff --git a/tests/regressiontests/model_formsets_regress/models.py b/tests/model_formsets_regress/models.py
similarity index 100%
rename from tests/regressiontests/model_formsets_regress/models.py
rename to tests/model_formsets_regress/models.py
diff --git a/tests/regressiontests/model_formsets_regress/tests.py b/tests/model_formsets_regress/tests.py
similarity index 100%
rename from tests/regressiontests/model_formsets_regress/tests.py
rename to tests/model_formsets_regress/tests.py
diff --git a/tests/regressiontests/file_uploads/__init__.py b/tests/model_inheritance/__init__.py
similarity index 100%
rename from tests/regressiontests/file_uploads/__init__.py
rename to tests/model_inheritance/__init__.py
diff --git a/tests/modeltests/model_inheritance/models.py b/tests/model_inheritance/models.py
similarity index 100%
rename from tests/modeltests/model_inheritance/models.py
rename to tests/model_inheritance/models.py
diff --git a/tests/modeltests/model_inheritance/tests.py b/tests/model_inheritance/tests.py
similarity index 100%
rename from tests/modeltests/model_inheritance/tests.py
rename to tests/model_inheritance/tests.py
diff --git a/tests/regressiontests/fixtures_regress/__init__.py b/tests/model_inheritance_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/fixtures_regress/__init__.py
rename to tests/model_inheritance_regress/__init__.py
diff --git a/tests/regressiontests/model_inheritance_regress/models.py b/tests/model_inheritance_regress/models.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_regress/models.py
rename to tests/model_inheritance_regress/models.py
diff --git a/tests/regressiontests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_regress/tests.py
rename to tests/model_inheritance_regress/tests.py
diff --git a/tests/regressiontests/forms/__init__.py b/tests/model_inheritance_same_model_name/__init__.py
similarity index 100%
rename from tests/regressiontests/forms/__init__.py
rename to tests/model_inheritance_same_model_name/__init__.py
diff --git a/tests/modeltests/model_inheritance_same_model_name/models.py b/tests/model_inheritance_same_model_name/models.py
similarity index 100%
rename from tests/modeltests/model_inheritance_same_model_name/models.py
rename to tests/model_inheritance_same_model_name/models.py
diff --git a/tests/modeltests/model_inheritance_same_model_name/tests.py b/tests/model_inheritance_same_model_name/tests.py
similarity index 100%
rename from tests/modeltests/model_inheritance_same_model_name/tests.py
rename to tests/model_inheritance_same_model_name/tests.py
diff --git a/tests/regressiontests/generic_inline_admin/__init__.py b/tests/model_inheritance_select_related/__init__.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/__init__.py
rename to tests/model_inheritance_select_related/__init__.py
diff --git a/tests/regressiontests/model_inheritance_select_related/models.py b/tests/model_inheritance_select_related/models.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_select_related/models.py
rename to tests/model_inheritance_select_related/models.py
diff --git a/tests/regressiontests/model_inheritance_select_related/tests.py b/tests/model_inheritance_select_related/tests.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_select_related/tests.py
rename to tests/model_inheritance_select_related/tests.py
diff --git a/tests/regressiontests/max_lengths/__init__.py b/tests/model_package/__init__.py
similarity index 100%
rename from tests/regressiontests/max_lengths/__init__.py
rename to tests/model_package/__init__.py
diff --git a/tests/modeltests/model_package/models/__init__.py b/tests/model_package/models/__init__.py
similarity index 100%
rename from tests/modeltests/model_package/models/__init__.py
rename to tests/model_package/models/__init__.py
diff --git a/tests/modeltests/model_package/models/article.py b/tests/model_package/models/article.py
similarity index 100%
rename from tests/modeltests/model_package/models/article.py
rename to tests/model_package/models/article.py
diff --git a/tests/modeltests/model_package/models/publication.py b/tests/model_package/models/publication.py
similarity index 100%
rename from tests/modeltests/model_package/models/publication.py
rename to tests/model_package/models/publication.py
diff --git a/tests/modeltests/model_package/tests.py b/tests/model_package/tests.py
similarity index 100%
rename from tests/modeltests/model_package/tests.py
rename to tests/model_package/tests.py
diff --git a/tests/regressiontests/generic_relations_regress/__init__.py b/tests/model_permalink/__init__.py
similarity index 100%
rename from tests/regressiontests/generic_relations_regress/__init__.py
rename to tests/model_permalink/__init__.py
diff --git a/tests/regressiontests/model_permalink/models.py b/tests/model_permalink/models.py
similarity index 100%
rename from tests/regressiontests/model_permalink/models.py
rename to tests/model_permalink/models.py
diff --git a/tests/regressiontests/model_permalink/tests.py b/tests/model_permalink/tests.py
similarity index 100%
rename from tests/regressiontests/model_permalink/tests.py
rename to tests/model_permalink/tests.py
diff --git a/tests/regressiontests/model_permalink/urls.py b/tests/model_permalink/urls.py
similarity index 100%
rename from tests/regressiontests/model_permalink/urls.py
rename to tests/model_permalink/urls.py
diff --git a/tests/regressiontests/generic_views/__init__.py b/tests/model_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/generic_views/__init__.py
rename to tests/model_regress/__init__.py
diff --git a/tests/regressiontests/model_regress/models.py b/tests/model_regress/models.py
similarity index 100%
rename from tests/regressiontests/model_regress/models.py
rename to tests/model_regress/models.py
diff --git a/tests/regressiontests/model_regress/tests.py b/tests/model_regress/tests.py
similarity index 100%
rename from tests/regressiontests/model_regress/tests.py
rename to tests/model_regress/tests.py
diff --git a/tests/regressiontests/get_or_create_regress/__init__.py b/tests/modeladmin/__init__.py
similarity index 100%
rename from tests/regressiontests/get_or_create_regress/__init__.py
rename to tests/modeladmin/__init__.py
diff --git a/tests/regressiontests/modeladmin/models.py b/tests/modeladmin/models.py
similarity index 100%
rename from tests/regressiontests/modeladmin/models.py
rename to tests/modeladmin/models.py
diff --git a/tests/regressiontests/modeladmin/tests.py b/tests/modeladmin/tests.py
similarity index 100%
rename from tests/regressiontests/modeladmin/tests.py
rename to tests/modeladmin/tests.py
diff --git a/tests/regressiontests/handlers/__init__.py b/tests/multiple_database/__init__.py
similarity index 100%
rename from tests/regressiontests/handlers/__init__.py
rename to tests/multiple_database/__init__.py
diff --git a/tests/regressiontests/multiple_database/fixtures/multidb-common.json b/tests/multiple_database/fixtures/multidb-common.json
similarity index 100%
rename from tests/regressiontests/multiple_database/fixtures/multidb-common.json
rename to tests/multiple_database/fixtures/multidb-common.json
diff --git a/tests/regressiontests/multiple_database/fixtures/multidb.default.json b/tests/multiple_database/fixtures/multidb.default.json
similarity index 100%
rename from tests/regressiontests/multiple_database/fixtures/multidb.default.json
rename to tests/multiple_database/fixtures/multidb.default.json
diff --git a/tests/regressiontests/multiple_database/fixtures/multidb.other.json b/tests/multiple_database/fixtures/multidb.other.json
similarity index 100%
rename from tests/regressiontests/multiple_database/fixtures/multidb.other.json
rename to tests/multiple_database/fixtures/multidb.other.json
diff --git a/tests/regressiontests/multiple_database/fixtures/pets.json b/tests/multiple_database/fixtures/pets.json
similarity index 100%
rename from tests/regressiontests/multiple_database/fixtures/pets.json
rename to tests/multiple_database/fixtures/pets.json
diff --git a/tests/regressiontests/multiple_database/models.py b/tests/multiple_database/models.py
similarity index 100%
rename from tests/regressiontests/multiple_database/models.py
rename to tests/multiple_database/models.py
diff --git a/tests/regressiontests/multiple_database/tests.py b/tests/multiple_database/tests.py
similarity index 100%
rename from tests/regressiontests/multiple_database/tests.py
rename to tests/multiple_database/tests.py
diff --git a/tests/regressiontests/http_utils/__init__.py b/tests/mutually_referential/__init__.py
similarity index 100%
rename from tests/regressiontests/http_utils/__init__.py
rename to tests/mutually_referential/__init__.py
diff --git a/tests/modeltests/mutually_referential/models.py b/tests/mutually_referential/models.py
similarity index 100%
rename from tests/modeltests/mutually_referential/models.py
rename to tests/mutually_referential/models.py
diff --git a/tests/modeltests/mutually_referential/tests.py b/tests/mutually_referential/tests.py
similarity index 100%
rename from tests/modeltests/mutually_referential/tests.py
rename to tests/mutually_referential/tests.py
diff --git a/tests/regressiontests/httpwrappers/__init__.py b/tests/nested_foreign_keys/__init__.py
similarity index 100%
rename from tests/regressiontests/httpwrappers/__init__.py
rename to tests/nested_foreign_keys/__init__.py
diff --git a/tests/regressiontests/nested_foreign_keys/models.py b/tests/nested_foreign_keys/models.py
similarity index 100%
rename from tests/regressiontests/nested_foreign_keys/models.py
rename to tests/nested_foreign_keys/models.py
diff --git a/tests/regressiontests/nested_foreign_keys/tests.py b/tests/nested_foreign_keys/tests.py
similarity index 100%
rename from tests/regressiontests/nested_foreign_keys/tests.py
rename to tests/nested_foreign_keys/tests.py
diff --git a/tests/regressiontests/i18n/__init__.py b/tests/null_fk/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/__init__.py
rename to tests/null_fk/__init__.py
diff --git a/tests/regressiontests/null_fk/models.py b/tests/null_fk/models.py
similarity index 100%
rename from tests/regressiontests/null_fk/models.py
rename to tests/null_fk/models.py
diff --git a/tests/regressiontests/null_fk/tests.py b/tests/null_fk/tests.py
similarity index 100%
rename from tests/regressiontests/null_fk/tests.py
rename to tests/null_fk/tests.py
diff --git a/tests/regressiontests/i18n/contenttypes/__init__.py b/tests/null_fk_ordering/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/__init__.py
rename to tests/null_fk_ordering/__init__.py
diff --git a/tests/regressiontests/null_fk_ordering/models.py b/tests/null_fk_ordering/models.py
similarity index 100%
rename from tests/regressiontests/null_fk_ordering/models.py
rename to tests/null_fk_ordering/models.py
diff --git a/tests/regressiontests/null_fk_ordering/tests.py b/tests/null_fk_ordering/tests.py
similarity index 100%
rename from tests/regressiontests/null_fk_ordering/tests.py
rename to tests/null_fk_ordering/tests.py
diff --git a/tests/regressiontests/i18n/other/__init__.py b/tests/null_queries/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/other/__init__.py
rename to tests/null_queries/__init__.py
diff --git a/tests/regressiontests/null_queries/models.py b/tests/null_queries/models.py
similarity index 100%
rename from tests/regressiontests/null_queries/models.py
rename to tests/null_queries/models.py
diff --git a/tests/regressiontests/null_queries/tests.py b/tests/null_queries/tests.py
similarity index 100%
rename from tests/regressiontests/null_queries/tests.py
rename to tests/null_queries/tests.py
diff --git a/tests/regressiontests/i18n/other/locale/__init__.py b/tests/one_to_one/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/__init__.py
rename to tests/one_to_one/__init__.py
diff --git a/tests/modeltests/one_to_one/models.py b/tests/one_to_one/models.py
similarity index 100%
rename from tests/modeltests/one_to_one/models.py
rename to tests/one_to_one/models.py
diff --git a/tests/modeltests/one_to_one/tests.py b/tests/one_to_one/tests.py
similarity index 100%
rename from tests/modeltests/one_to_one/tests.py
rename to tests/one_to_one/tests.py
diff --git a/tests/regressiontests/i18n/other/locale/de/__init__.py b/tests/one_to_one_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/de/__init__.py
rename to tests/one_to_one_regress/__init__.py
diff --git a/tests/regressiontests/one_to_one_regress/models.py b/tests/one_to_one_regress/models.py
similarity index 100%
rename from tests/regressiontests/one_to_one_regress/models.py
rename to tests/one_to_one_regress/models.py
diff --git a/tests/regressiontests/one_to_one_regress/tests.py b/tests/one_to_one_regress/tests.py
similarity index 100%
rename from tests/regressiontests/one_to_one_regress/tests.py
rename to tests/one_to_one_regress/tests.py
diff --git a/tests/regressiontests/i18n/patterns/__init__.py b/tests/or_lookups/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/__init__.py
rename to tests/or_lookups/__init__.py
diff --git a/tests/modeltests/or_lookups/models.py b/tests/or_lookups/models.py
similarity index 100%
rename from tests/modeltests/or_lookups/models.py
rename to tests/or_lookups/models.py
diff --git a/tests/modeltests/or_lookups/tests.py b/tests/or_lookups/tests.py
similarity index 100%
rename from tests/modeltests/or_lookups/tests.py
rename to tests/or_lookups/tests.py
diff --git a/tests/regressiontests/i18n/patterns/urls/__init__.py b/tests/order_with_respect_to/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/__init__.py
rename to tests/order_with_respect_to/__init__.py
diff --git a/tests/modeltests/order_with_respect_to/models.py b/tests/order_with_respect_to/models.py
similarity index 100%
rename from tests/modeltests/order_with_respect_to/models.py
rename to tests/order_with_respect_to/models.py
diff --git a/tests/modeltests/order_with_respect_to/tests.py b/tests/order_with_respect_to/tests.py
similarity index 100%
rename from tests/modeltests/order_with_respect_to/tests.py
rename to tests/order_with_respect_to/tests.py
diff --git a/tests/regressiontests/i18n/resolution/__init__.py b/tests/ordering/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/resolution/__init__.py
rename to tests/ordering/__init__.py
diff --git a/tests/modeltests/ordering/models.py b/tests/ordering/models.py
similarity index 100%
rename from tests/modeltests/ordering/models.py
rename to tests/ordering/models.py
diff --git a/tests/modeltests/ordering/tests.py b/tests/ordering/tests.py
similarity index 100%
rename from tests/modeltests/ordering/tests.py
rename to tests/ordering/tests.py
diff --git a/tests/regressiontests/indexes/__init__.py b/tests/pagination/__init__.py
similarity index 100%
rename from tests/regressiontests/indexes/__init__.py
rename to tests/pagination/__init__.py
diff --git a/tests/regressiontests/pagination/custom.py b/tests/pagination/custom.py
similarity index 100%
rename from tests/regressiontests/pagination/custom.py
rename to tests/pagination/custom.py
diff --git a/tests/regressiontests/pagination/models.py b/tests/pagination/models.py
similarity index 100%
rename from tests/regressiontests/pagination/models.py
rename to tests/pagination/models.py
diff --git a/tests/regressiontests/pagination/tests.py b/tests/pagination/tests.py
similarity index 100%
rename from tests/regressiontests/pagination/tests.py
rename to tests/pagination/tests.py
diff --git a/tests/regressiontests/initial_sql_regress/__init__.py b/tests/prefetch_related/__init__.py
similarity index 100%
rename from tests/regressiontests/initial_sql_regress/__init__.py
rename to tests/prefetch_related/__init__.py
diff --git a/tests/modeltests/prefetch_related/models.py b/tests/prefetch_related/models.py
similarity index 100%
rename from tests/modeltests/prefetch_related/models.py
rename to tests/prefetch_related/models.py
diff --git a/tests/modeltests/prefetch_related/tests.py b/tests/prefetch_related/tests.py
similarity index 100%
rename from tests/modeltests/prefetch_related/tests.py
rename to tests/prefetch_related/tests.py
diff --git a/tests/regressiontests/inline_formsets/__init__.py b/tests/properties/__init__.py
similarity index 100%
rename from tests/regressiontests/inline_formsets/__init__.py
rename to tests/properties/__init__.py
diff --git a/tests/modeltests/properties/models.py b/tests/properties/models.py
similarity index 100%
rename from tests/modeltests/properties/models.py
rename to tests/properties/models.py
diff --git a/tests/modeltests/properties/tests.py b/tests/properties/tests.py
similarity index 100%
rename from tests/modeltests/properties/tests.py
rename to tests/properties/tests.py
diff --git a/tests/regressiontests/introspection/__init__.py b/tests/proxy_model_inheritance/__init__.py
similarity index 100%
rename from tests/regressiontests/introspection/__init__.py
rename to tests/proxy_model_inheritance/__init__.py
diff --git a/tests/regressiontests/logging_tests/__init__.py b/tests/proxy_model_inheritance/app1/__init__.py
similarity index 100%
rename from tests/regressiontests/logging_tests/__init__.py
rename to tests/proxy_model_inheritance/app1/__init__.py
diff --git a/tests/modeltests/proxy_model_inheritance/app1/models.py b/tests/proxy_model_inheritance/app1/models.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/app1/models.py
rename to tests/proxy_model_inheritance/app1/models.py
diff --git a/tests/regressiontests/m2m_regress/__init__.py b/tests/proxy_model_inheritance/app2/__init__.py
similarity index 100%
rename from tests/regressiontests/m2m_regress/__init__.py
rename to tests/proxy_model_inheritance/app2/__init__.py
diff --git a/tests/modeltests/proxy_model_inheritance/app2/models.py b/tests/proxy_model_inheritance/app2/models.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/app2/models.py
rename to tests/proxy_model_inheritance/app2/models.py
diff --git a/tests/modeltests/proxy_model_inheritance/models.py b/tests/proxy_model_inheritance/models.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/models.py
rename to tests/proxy_model_inheritance/models.py
diff --git a/tests/modeltests/proxy_model_inheritance/tests.py b/tests/proxy_model_inheritance/tests.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/tests.py
rename to tests/proxy_model_inheritance/tests.py
diff --git a/tests/regressiontests/managers_regress/__init__.py b/tests/proxy_models/__init__.py
similarity index 100%
rename from tests/regressiontests/managers_regress/__init__.py
rename to tests/proxy_models/__init__.py
diff --git a/tests/modeltests/proxy_models/fixtures/myhorses.json b/tests/proxy_models/fixtures/myhorses.json
similarity index 100%
rename from tests/modeltests/proxy_models/fixtures/myhorses.json
rename to tests/proxy_models/fixtures/myhorses.json
diff --git a/tests/modeltests/proxy_models/fixtures/mypeople.json b/tests/proxy_models/fixtures/mypeople.json
similarity index 100%
rename from tests/modeltests/proxy_models/fixtures/mypeople.json
rename to tests/proxy_models/fixtures/mypeople.json
diff --git a/tests/modeltests/proxy_models/models.py b/tests/proxy_models/models.py
similarity index 100%
rename from tests/modeltests/proxy_models/models.py
rename to tests/proxy_models/models.py
diff --git a/tests/modeltests/proxy_models/tests.py b/tests/proxy_models/tests.py
similarity index 100%
rename from tests/modeltests/proxy_models/tests.py
rename to tests/proxy_models/tests.py
diff --git a/tests/regressiontests/many_to_one_regress/__init__.py b/tests/queries/__init__.py
similarity index 100%
rename from tests/regressiontests/many_to_one_regress/__init__.py
rename to tests/queries/__init__.py
diff --git a/tests/regressiontests/queries/models.py b/tests/queries/models.py
similarity index 100%
rename from tests/regressiontests/queries/models.py
rename to tests/queries/models.py
diff --git a/tests/regressiontests/queries/tests.py b/tests/queries/tests.py
similarity index 100%
rename from tests/regressiontests/queries/tests.py
rename to tests/queries/tests.py
diff --git a/tests/regressiontests/middleware/__init__.py b/tests/queryset_pickle/__init__.py
similarity index 100%
rename from tests/regressiontests/middleware/__init__.py
rename to tests/queryset_pickle/__init__.py
diff --git a/tests/regressiontests/queryset_pickle/models.py b/tests/queryset_pickle/models.py
similarity index 100%
rename from tests/regressiontests/queryset_pickle/models.py
rename to tests/queryset_pickle/models.py
diff --git a/tests/regressiontests/queryset_pickle/tests.py b/tests/queryset_pickle/tests.py
similarity index 100%
rename from tests/regressiontests/queryset_pickle/tests.py
rename to tests/queryset_pickle/tests.py
diff --git a/tests/regressiontests/middleware_exceptions/__init__.py b/tests/raw_query/__init__.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/__init__.py
rename to tests/raw_query/__init__.py
diff --git a/tests/modeltests/raw_query/fixtures/raw_query_books.json b/tests/raw_query/fixtures/raw_query_books.json
similarity index 100%
rename from tests/modeltests/raw_query/fixtures/raw_query_books.json
rename to tests/raw_query/fixtures/raw_query_books.json
diff --git a/tests/modeltests/raw_query/models.py b/tests/raw_query/models.py
similarity index 100%
rename from tests/modeltests/raw_query/models.py
rename to tests/raw_query/models.py
diff --git a/tests/modeltests/raw_query/tests.py b/tests/raw_query/tests.py
similarity index 100%
rename from tests/modeltests/raw_query/tests.py
rename to tests/raw_query/tests.py
diff --git a/tests/regressiontests/requests/__init__.py b/tests/requests/__init__.py
similarity index 100%
rename from tests/regressiontests/requests/__init__.py
rename to tests/requests/__init__.py
diff --git a/tests/regressiontests/requests/models.py b/tests/requests/models.py
similarity index 100%
rename from tests/regressiontests/requests/models.py
rename to tests/requests/models.py
diff --git a/tests/regressiontests/requests/tests.py b/tests/requests/tests.py
similarity index 100%
rename from tests/regressiontests/requests/tests.py
rename to tests/requests/tests.py
diff --git a/tests/regressiontests/model_fields/__init__.py b/tests/reserved_names/__init__.py
similarity index 100%
rename from tests/regressiontests/model_fields/__init__.py
rename to tests/reserved_names/__init__.py
diff --git a/tests/modeltests/reserved_names/models.py b/tests/reserved_names/models.py
similarity index 100%
rename from tests/modeltests/reserved_names/models.py
rename to tests/reserved_names/models.py
diff --git a/tests/modeltests/reserved_names/tests.py b/tests/reserved_names/tests.py
similarity index 100%
rename from tests/modeltests/reserved_names/tests.py
rename to tests/reserved_names/tests.py
diff --git a/tests/regressiontests/model_forms_regress/__init__.py b/tests/resolve_url/__init__.py
similarity index 100%
rename from tests/regressiontests/model_forms_regress/__init__.py
rename to tests/resolve_url/__init__.py
diff --git a/tests/regressiontests/resolve_url/models.py b/tests/resolve_url/models.py
similarity index 100%
rename from tests/regressiontests/resolve_url/models.py
rename to tests/resolve_url/models.py
diff --git a/tests/regressiontests/resolve_url/tests.py b/tests/resolve_url/tests.py
similarity index 100%
rename from tests/regressiontests/resolve_url/tests.py
rename to tests/resolve_url/tests.py
diff --git a/tests/regressiontests/model_formsets_regress/__init__.py b/tests/reverse_lookup/__init__.py
similarity index 100%
rename from tests/regressiontests/model_formsets_regress/__init__.py
rename to tests/reverse_lookup/__init__.py
diff --git a/tests/modeltests/reverse_lookup/models.py b/tests/reverse_lookup/models.py
similarity index 100%
rename from tests/modeltests/reverse_lookup/models.py
rename to tests/reverse_lookup/models.py
diff --git a/tests/modeltests/reverse_lookup/tests.py b/tests/reverse_lookup/tests.py
similarity index 100%
rename from tests/modeltests/reverse_lookup/tests.py
rename to tests/reverse_lookup/tests.py
diff --git a/tests/regressiontests/model_inheritance_regress/__init__.py b/tests/reverse_single_related/__init__.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_regress/__init__.py
rename to tests/reverse_single_related/__init__.py
diff --git a/tests/regressiontests/reverse_single_related/models.py b/tests/reverse_single_related/models.py
similarity index 100%
rename from tests/regressiontests/reverse_single_related/models.py
rename to tests/reverse_single_related/models.py
diff --git a/tests/regressiontests/reverse_single_related/tests.py b/tests/reverse_single_related/tests.py
similarity index 100%
rename from tests/regressiontests/reverse_single_related/tests.py
rename to tests/reverse_single_related/tests.py
diff --git a/tests/regressiontests/model_inheritance_select_related/__init__.py b/tests/save_delete_hooks/__init__.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_select_related/__init__.py
rename to tests/save_delete_hooks/__init__.py
diff --git a/tests/modeltests/save_delete_hooks/models.py b/tests/save_delete_hooks/models.py
similarity index 100%
rename from tests/modeltests/save_delete_hooks/models.py
rename to tests/save_delete_hooks/models.py
diff --git a/tests/modeltests/save_delete_hooks/tests.py b/tests/save_delete_hooks/tests.py
similarity index 100%
rename from tests/modeltests/save_delete_hooks/tests.py
rename to tests/save_delete_hooks/tests.py
diff --git a/tests/regressiontests/admin_custom_urls/__init__.py b/tests/select_for_update/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/__init__.py
rename to tests/select_for_update/__init__.py
diff --git a/tests/modeltests/select_for_update/models.py b/tests/select_for_update/models.py
similarity index 100%
rename from tests/modeltests/select_for_update/models.py
rename to tests/select_for_update/models.py
diff --git a/tests/modeltests/select_for_update/tests.py b/tests/select_for_update/tests.py
similarity index 100%
rename from tests/modeltests/select_for_update/tests.py
rename to tests/select_for_update/tests.py
diff --git a/tests/regressiontests/model_permalink/__init__.py b/tests/select_related/__init__.py
similarity index 100%
rename from tests/regressiontests/model_permalink/__init__.py
rename to tests/select_related/__init__.py
diff --git a/tests/modeltests/select_related/models.py b/tests/select_related/models.py
similarity index 100%
rename from tests/modeltests/select_related/models.py
rename to tests/select_related/models.py
diff --git a/tests/modeltests/select_related/tests.py b/tests/select_related/tests.py
similarity index 100%
rename from tests/modeltests/select_related/tests.py
rename to tests/select_related/tests.py
diff --git a/tests/regressiontests/model_regress/__init__.py b/tests/select_related_onetoone/__init__.py
similarity index 100%
rename from tests/regressiontests/model_regress/__init__.py
rename to tests/select_related_onetoone/__init__.py
diff --git a/tests/regressiontests/select_related_onetoone/models.py b/tests/select_related_onetoone/models.py
similarity index 100%
rename from tests/regressiontests/select_related_onetoone/models.py
rename to tests/select_related_onetoone/models.py
diff --git a/tests/regressiontests/select_related_onetoone/tests.py b/tests/select_related_onetoone/tests.py
similarity index 100%
rename from tests/regressiontests/select_related_onetoone/tests.py
rename to tests/select_related_onetoone/tests.py
diff --git a/tests/regressiontests/modeladmin/__init__.py b/tests/select_related_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/modeladmin/__init__.py
rename to tests/select_related_regress/__init__.py
diff --git a/tests/regressiontests/select_related_regress/models.py b/tests/select_related_regress/models.py
similarity index 100%
rename from tests/regressiontests/select_related_regress/models.py
rename to tests/select_related_regress/models.py
diff --git a/tests/regressiontests/select_related_regress/tests.py b/tests/select_related_regress/tests.py
similarity index 100%
rename from tests/regressiontests/select_related_regress/tests.py
rename to tests/select_related_regress/tests.py
diff --git a/tests/regressiontests/multiple_database/__init__.py b/tests/serializers/__init__.py
similarity index 100%
rename from tests/regressiontests/multiple_database/__init__.py
rename to tests/serializers/__init__.py
diff --git a/tests/modeltests/serializers/models.py b/tests/serializers/models.py
similarity index 100%
rename from tests/modeltests/serializers/models.py
rename to tests/serializers/models.py
diff --git a/tests/modeltests/serializers/tests.py b/tests/serializers/tests.py
similarity index 100%
rename from tests/modeltests/serializers/tests.py
rename to tests/serializers/tests.py
diff --git a/tests/regressiontests/nested_foreign_keys/__init__.py b/tests/serializers_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/nested_foreign_keys/__init__.py
rename to tests/serializers_regress/__init__.py
diff --git a/tests/regressiontests/serializers_regress/models.py b/tests/serializers_regress/models.py
similarity index 100%
rename from tests/regressiontests/serializers_regress/models.py
rename to tests/serializers_regress/models.py
diff --git a/tests/regressiontests/serializers_regress/tests.py b/tests/serializers_regress/tests.py
similarity index 100%
rename from tests/regressiontests/serializers_regress/tests.py
rename to tests/serializers_regress/tests.py
diff --git a/tests/regressiontests/null_fk/__init__.py b/tests/servers/__init__.py
similarity index 100%
rename from tests/regressiontests/null_fk/__init__.py
rename to tests/servers/__init__.py
diff --git a/tests/regressiontests/servers/fixtures/testdata.json b/tests/servers/fixtures/testdata.json
similarity index 100%
rename from tests/regressiontests/servers/fixtures/testdata.json
rename to tests/servers/fixtures/testdata.json
diff --git a/tests/regressiontests/servers/media/example_media_file.txt b/tests/servers/media/example_media_file.txt
similarity index 100%
rename from tests/regressiontests/servers/media/example_media_file.txt
rename to tests/servers/media/example_media_file.txt
diff --git a/tests/regressiontests/servers/models.py b/tests/servers/models.py
similarity index 100%
rename from tests/regressiontests/servers/models.py
rename to tests/servers/models.py
diff --git a/tests/regressiontests/servers/static/example_static_file.txt b/tests/servers/static/example_static_file.txt
similarity index 100%
rename from tests/regressiontests/servers/static/example_static_file.txt
rename to tests/servers/static/example_static_file.txt
diff --git a/tests/regressiontests/servers/tests.py b/tests/servers/tests.py
similarity index 100%
rename from tests/regressiontests/servers/tests.py
rename to tests/servers/tests.py
diff --git a/tests/regressiontests/servers/urls.py b/tests/servers/urls.py
similarity index 100%
rename from tests/regressiontests/servers/urls.py
rename to tests/servers/urls.py
diff --git a/tests/regressiontests/servers/views.py b/tests/servers/views.py
similarity index 100%
rename from tests/regressiontests/servers/views.py
rename to tests/servers/views.py
diff --git a/tests/regressiontests/null_fk_ordering/__init__.py b/tests/settings_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/null_fk_ordering/__init__.py
rename to tests/settings_tests/__init__.py
diff --git a/tests/regressiontests/middleware_exceptions/models.py b/tests/settings_tests/models.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/models.py
rename to tests/settings_tests/models.py
diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/settings_tests/tests.py
similarity index 100%
rename from tests/regressiontests/settings_tests/tests.py
rename to tests/settings_tests/tests.py
diff --git a/tests/regressiontests/null_queries/__init__.py b/tests/signals/__init__.py
similarity index 100%
rename from tests/regressiontests/null_queries/__init__.py
rename to tests/signals/__init__.py
diff --git a/tests/modeltests/signals/models.py b/tests/signals/models.py
similarity index 100%
rename from tests/modeltests/signals/models.py
rename to tests/signals/models.py
diff --git a/tests/modeltests/signals/tests.py b/tests/signals/tests.py
similarity index 100%
rename from tests/modeltests/signals/tests.py
rename to tests/signals/tests.py
diff --git a/tests/regressiontests/one_to_one_regress/__init__.py b/tests/signals_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/one_to_one_regress/__init__.py
rename to tests/signals_regress/__init__.py
diff --git a/tests/regressiontests/signals_regress/models.py b/tests/signals_regress/models.py
similarity index 100%
rename from tests/regressiontests/signals_regress/models.py
rename to tests/signals_regress/models.py
diff --git a/tests/regressiontests/signals_regress/tests.py b/tests/signals_regress/tests.py
similarity index 100%
rename from tests/regressiontests/signals_regress/tests.py
rename to tests/signals_regress/tests.py
diff --git a/tests/regressiontests/pagination/__init__.py b/tests/signed_cookies_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/pagination/__init__.py
rename to tests/signed_cookies_tests/__init__.py
diff --git a/tests/regressiontests/signed_cookies_tests/models.py b/tests/signed_cookies_tests/models.py
similarity index 100%
rename from tests/regressiontests/signed_cookies_tests/models.py
rename to tests/signed_cookies_tests/models.py
diff --git a/tests/regressiontests/signed_cookies_tests/tests.py b/tests/signed_cookies_tests/tests.py
similarity index 100%
rename from tests/regressiontests/signed_cookies_tests/tests.py
rename to tests/signed_cookies_tests/tests.py
diff --git a/tests/regressiontests/queries/__init__.py b/tests/signing/__init__.py
similarity index 100%
rename from tests/regressiontests/queries/__init__.py
rename to tests/signing/__init__.py
diff --git a/tests/regressiontests/signing/models.py b/tests/signing/models.py
similarity index 100%
rename from tests/regressiontests/signing/models.py
rename to tests/signing/models.py
diff --git a/tests/regressiontests/signing/tests.py b/tests/signing/tests.py
similarity index 100%
rename from tests/regressiontests/signing/tests.py
rename to tests/signing/tests.py
diff --git a/tests/regressiontests/queryset_pickle/__init__.py b/tests/sites_framework/__init__.py
similarity index 100%
rename from tests/regressiontests/queryset_pickle/__init__.py
rename to tests/sites_framework/__init__.py
diff --git a/tests/regressiontests/sites_framework/models.py b/tests/sites_framework/models.py
similarity index 100%
rename from tests/regressiontests/sites_framework/models.py
rename to tests/sites_framework/models.py
diff --git a/tests/regressiontests/sites_framework/tests.py b/tests/sites_framework/tests.py
similarity index 100%
rename from tests/regressiontests/sites_framework/tests.py
rename to tests/sites_framework/tests.py
diff --git a/tests/regressiontests/resolve_url/__init__.py b/tests/special_headers/__init__.py
similarity index 100%
rename from tests/regressiontests/resolve_url/__init__.py
rename to tests/special_headers/__init__.py
diff --git a/tests/regressiontests/special_headers/fixtures/data.xml b/tests/special_headers/fixtures/data.xml
similarity index 100%
rename from tests/regressiontests/special_headers/fixtures/data.xml
rename to tests/special_headers/fixtures/data.xml
diff --git a/tests/regressiontests/special_headers/models.py b/tests/special_headers/models.py
similarity index 100%
rename from tests/regressiontests/special_headers/models.py
rename to tests/special_headers/models.py
diff --git a/tests/regressiontests/special_headers/templates/special_headers/article_detail.html b/tests/special_headers/templates/special_headers/article_detail.html
similarity index 100%
rename from tests/regressiontests/special_headers/templates/special_headers/article_detail.html
rename to tests/special_headers/templates/special_headers/article_detail.html
diff --git a/tests/regressiontests/special_headers/tests.py b/tests/special_headers/tests.py
similarity index 100%
rename from tests/regressiontests/special_headers/tests.py
rename to tests/special_headers/tests.py
diff --git a/tests/regressiontests/special_headers/urls.py b/tests/special_headers/urls.py
similarity index 100%
rename from tests/regressiontests/special_headers/urls.py
rename to tests/special_headers/urls.py
diff --git a/tests/regressiontests/special_headers/views.py b/tests/special_headers/views.py
similarity index 100%
rename from tests/regressiontests/special_headers/views.py
rename to tests/special_headers/views.py
diff --git a/tests/regressiontests/reverse_single_related/__init__.py b/tests/staticfiles_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/reverse_single_related/__init__.py
rename to tests/staticfiles_tests/__init__.py
diff --git a/tests/regressiontests/select_related_onetoone/__init__.py b/tests/staticfiles_tests/apps/__init__.py
similarity index 100%
rename from tests/regressiontests/select_related_onetoone/__init__.py
rename to tests/staticfiles_tests/apps/__init__.py
diff --git a/tests/regressiontests/select_related_regress/__init__.py b/tests/staticfiles_tests/apps/no_label/__init__.py
similarity index 100%
rename from tests/regressiontests/select_related_regress/__init__.py
rename to tests/staticfiles_tests/apps/no_label/__init__.py
diff --git a/tests/regressiontests/settings_tests/models.py b/tests/staticfiles_tests/apps/no_label/models.py
similarity index 100%
rename from tests/regressiontests/settings_tests/models.py
rename to tests/staticfiles_tests/apps/no_label/models.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/static/file2.txt b/tests/staticfiles_tests/apps/no_label/static/file2.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/no_label/static/file2.txt
rename to tests/staticfiles_tests/apps/no_label/static/file2.txt
diff --git a/tests/regressiontests/serializers_regress/__init__.py b/tests/staticfiles_tests/apps/test/__init__.py
similarity index 100%
rename from tests/regressiontests/serializers_regress/__init__.py
rename to tests/staticfiles_tests/apps/test/__init__.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/models.py b/tests/staticfiles_tests/apps/test/models.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/no_label/models.py
rename to tests/staticfiles_tests/apps/test/models.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/otherdir/odfile.txt b/tests/staticfiles_tests/apps/test/otherdir/odfile.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/otherdir/odfile.txt
rename to tests/staticfiles_tests/apps/test/otherdir/odfile.txt
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/CVS b/tests/staticfiles_tests/apps/test/static/test/CVS
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/CVS
rename to tests/staticfiles_tests/apps/test/static/test/CVS
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/file.txt b/tests/staticfiles_tests/apps/test/static/test/file.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/file.txt
rename to tests/staticfiles_tests/apps/test/static/test/file.txt
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/file1.txt b/tests/staticfiles_tests/apps/test/static/test/file1.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/file1.txt
rename to tests/staticfiles_tests/apps/test/static/test/file1.txt
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/nonascii.css b/tests/staticfiles_tests/apps/test/static/test/nonascii.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/nonascii.css
rename to tests/staticfiles_tests/apps/test/static/test/nonascii.css
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/test.ignoreme b/tests/staticfiles_tests/apps/test/static/test/test.ignoreme
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/test.ignoreme
rename to tests/staticfiles_tests/apps/test/static/test/test.ignoreme
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/window.png b/tests/staticfiles_tests/apps/test/static/test/window.png
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/window.png
rename to tests/staticfiles_tests/apps/test/static/test/window.png
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/models.py b/tests/staticfiles_tests/models.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/models.py
rename to tests/staticfiles_tests/models.py
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/absolute.css b/tests/staticfiles_tests/project/documents/cached/absolute.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/absolute.css
rename to tests/staticfiles_tests/project/documents/cached/absolute.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/fonts/font.eot b/tests/staticfiles_tests/project/documents/cached/css/fonts/font.eot
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/fonts/font.eot
rename to tests/staticfiles_tests/project/documents/cached/css/fonts/font.eot
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/fonts/font.svg b/tests/staticfiles_tests/project/documents/cached/css/fonts/font.svg
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/fonts/font.svg
rename to tests/staticfiles_tests/project/documents/cached/css/fonts/font.svg
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/fragments.css b/tests/staticfiles_tests/project/documents/cached/css/fragments.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/fragments.css
rename to tests/staticfiles_tests/project/documents/cached/css/fragments.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/ignored.css b/tests/staticfiles_tests/project/documents/cached/css/ignored.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/ignored.css
rename to tests/staticfiles_tests/project/documents/cached/css/ignored.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/img/window.png b/tests/staticfiles_tests/project/documents/cached/css/img/window.png
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/img/window.png
rename to tests/staticfiles_tests/project/documents/cached/css/img/window.png
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/window.css b/tests/staticfiles_tests/project/documents/cached/css/window.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/window.css
rename to tests/staticfiles_tests/project/documents/cached/css/window.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/denorm.css b/tests/staticfiles_tests/project/documents/cached/denorm.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/denorm.css
rename to tests/staticfiles_tests/project/documents/cached/denorm.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/img/relative.png b/tests/staticfiles_tests/project/documents/cached/img/relative.png
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/img/relative.png
rename to tests/staticfiles_tests/project/documents/cached/img/relative.png
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/import.css b/tests/staticfiles_tests/project/documents/cached/import.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/import.css
rename to tests/staticfiles_tests/project/documents/cached/import.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/other.css b/tests/staticfiles_tests/project/documents/cached/other.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/other.css
rename to tests/staticfiles_tests/project/documents/cached/other.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/relative.css b/tests/staticfiles_tests/project/documents/cached/relative.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/relative.css
rename to tests/staticfiles_tests/project/documents/cached/relative.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/styles.css b/tests/staticfiles_tests/project/documents/cached/styles.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/styles.css
rename to tests/staticfiles_tests/project/documents/cached/styles.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/styles_insensitive.css b/tests/staticfiles_tests/project/documents/cached/styles_insensitive.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/styles_insensitive.css
rename to tests/staticfiles_tests/project/documents/cached/styles_insensitive.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/url.css b/tests/staticfiles_tests/project/documents/cached/url.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/url.css
rename to tests/staticfiles_tests/project/documents/cached/url.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/subdir/test.txt b/tests/staticfiles_tests/project/documents/subdir/test.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/subdir/test.txt
rename to tests/staticfiles_tests/project/documents/subdir/test.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/test.txt b/tests/staticfiles_tests/project/documents/test.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/test.txt
rename to tests/staticfiles_tests/project/documents/test.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/test/camelCase.txt b/tests/staticfiles_tests/project/documents/test/camelCase.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/test/camelCase.txt
rename to tests/staticfiles_tests/project/documents/test/camelCase.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/test/file.txt b/tests/staticfiles_tests/project/documents/test/file.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/test/file.txt
rename to tests/staticfiles_tests/project/documents/test/file.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/prefixed/test.txt b/tests/staticfiles_tests/project/prefixed/test.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/prefixed/test.txt
rename to tests/staticfiles_tests/project/prefixed/test.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/site_media/media/media-file.txt b/tests/staticfiles_tests/project/site_media/media/media-file.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/site_media/media/media-file.txt
rename to tests/staticfiles_tests/project/site_media/media/media-file.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/site_media/static/testfile.txt b/tests/staticfiles_tests/project/site_media/static/testfile.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/site_media/static/testfile.txt
rename to tests/staticfiles_tests/project/site_media/static/testfile.txt
diff --git a/tests/regressiontests/staticfiles_tests/storage.py b/tests/staticfiles_tests/storage.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/storage.py
rename to tests/staticfiles_tests/storage.py
diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/tests.py
rename to tests/staticfiles_tests/tests.py
diff --git a/tests/regressiontests/servers/__init__.py b/tests/staticfiles_tests/urls/__init__.py
similarity index 100%
rename from tests/regressiontests/servers/__init__.py
rename to tests/staticfiles_tests/urls/__init__.py
diff --git a/tests/regressiontests/staticfiles_tests/urls/default.py b/tests/staticfiles_tests/urls/default.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/urls/default.py
rename to tests/staticfiles_tests/urls/default.py
diff --git a/tests/regressiontests/staticfiles_tests/urls/helper.py b/tests/staticfiles_tests/urls/helper.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/urls/helper.py
rename to tests/staticfiles_tests/urls/helper.py
diff --git a/tests/regressiontests/settings_tests/__init__.py b/tests/str/__init__.py
similarity index 100%
rename from tests/regressiontests/settings_tests/__init__.py
rename to tests/str/__init__.py
diff --git a/tests/modeltests/str/models.py b/tests/str/models.py
similarity index 100%
rename from tests/modeltests/str/models.py
rename to tests/str/models.py
diff --git a/tests/modeltests/str/tests.py b/tests/str/tests.py
similarity index 100%
rename from tests/modeltests/str/tests.py
rename to tests/str/tests.py
diff --git a/tests/regressiontests/signals_regress/__init__.py b/tests/string_lookup/__init__.py
similarity index 100%
rename from tests/regressiontests/signals_regress/__init__.py
rename to tests/string_lookup/__init__.py
diff --git a/tests/regressiontests/string_lookup/models.py b/tests/string_lookup/models.py
similarity index 100%
rename from tests/regressiontests/string_lookup/models.py
rename to tests/string_lookup/models.py
diff --git a/tests/regressiontests/string_lookup/tests.py b/tests/string_lookup/tests.py
similarity index 100%
rename from tests/regressiontests/string_lookup/tests.py
rename to tests/string_lookup/tests.py
diff --git a/tests/regressiontests/signed_cookies_tests/__init__.py b/tests/swappable_models/__init__.py
similarity index 100%
rename from tests/regressiontests/signed_cookies_tests/__init__.py
rename to tests/swappable_models/__init__.py
diff --git a/tests/regressiontests/swappable_models/models.py b/tests/swappable_models/models.py
similarity index 100%
rename from tests/regressiontests/swappable_models/models.py
rename to tests/swappable_models/models.py
diff --git a/tests/regressiontests/swappable_models/tests.py b/tests/swappable_models/tests.py
similarity index 100%
rename from tests/regressiontests/swappable_models/tests.py
rename to tests/swappable_models/tests.py
diff --git a/tests/regressiontests/signing/__init__.py b/tests/syndication/__init__.py
similarity index 100%
rename from tests/regressiontests/signing/__init__.py
rename to tests/syndication/__init__.py
diff --git a/tests/regressiontests/syndication/feeds.py b/tests/syndication/feeds.py
similarity index 100%
rename from tests/regressiontests/syndication/feeds.py
rename to tests/syndication/feeds.py
diff --git a/tests/regressiontests/syndication/fixtures/feeddata.json b/tests/syndication/fixtures/feeddata.json
similarity index 100%
rename from tests/regressiontests/syndication/fixtures/feeddata.json
rename to tests/syndication/fixtures/feeddata.json
diff --git a/tests/regressiontests/syndication/models.py b/tests/syndication/models.py
similarity index 100%
rename from tests/regressiontests/syndication/models.py
rename to tests/syndication/models.py
diff --git a/tests/regressiontests/syndication/templates/syndication/description.html b/tests/syndication/templates/syndication/description.html
similarity index 100%
rename from tests/regressiontests/syndication/templates/syndication/description.html
rename to tests/syndication/templates/syndication/description.html
diff --git a/tests/regressiontests/syndication/templates/syndication/description_context.html b/tests/syndication/templates/syndication/description_context.html
similarity index 100%
rename from tests/regressiontests/syndication/templates/syndication/description_context.html
rename to tests/syndication/templates/syndication/description_context.html
diff --git a/tests/regressiontests/syndication/templates/syndication/title.html b/tests/syndication/templates/syndication/title.html
similarity index 100%
rename from tests/regressiontests/syndication/templates/syndication/title.html
rename to tests/syndication/templates/syndication/title.html
diff --git a/tests/regressiontests/syndication/templates/syndication/title_context.html b/tests/syndication/templates/syndication/title_context.html
similarity index 100%
rename from tests/regressiontests/syndication/templates/syndication/title_context.html
rename to tests/syndication/templates/syndication/title_context.html
diff --git a/tests/regressiontests/syndication/tests.py b/tests/syndication/tests.py
similarity index 100%
rename from tests/regressiontests/syndication/tests.py
rename to tests/syndication/tests.py
diff --git a/tests/regressiontests/syndication/urls.py b/tests/syndication/urls.py
similarity index 100%
rename from tests/regressiontests/syndication/urls.py
rename to tests/syndication/urls.py
diff --git a/tests/regressiontests/sites_framework/__init__.py b/tests/tablespaces/__init__.py
similarity index 100%
rename from tests/regressiontests/sites_framework/__init__.py
rename to tests/tablespaces/__init__.py
diff --git a/tests/modeltests/tablespaces/models.py b/tests/tablespaces/models.py
similarity index 100%
rename from tests/modeltests/tablespaces/models.py
rename to tests/tablespaces/models.py
diff --git a/tests/modeltests/tablespaces/tests.py b/tests/tablespaces/tests.py
similarity index 100%
rename from tests/modeltests/tablespaces/tests.py
rename to tests/tablespaces/tests.py
diff --git a/tests/regressiontests/special_headers/__init__.py b/tests/templates/__init__.py
similarity index 100%
rename from tests/regressiontests/special_headers/__init__.py
rename to tests/templates/__init__.py
diff --git a/tests/regressiontests/templates/alternate_urls.py b/tests/templates/alternate_urls.py
similarity index 100%
rename from tests/regressiontests/templates/alternate_urls.py
rename to tests/templates/alternate_urls.py
diff --git a/tests/regressiontests/templates/callables.py b/tests/templates/callables.py
similarity index 100%
rename from tests/regressiontests/templates/callables.py
rename to tests/templates/callables.py
diff --git a/tests/regressiontests/templates/context.py b/tests/templates/context.py
similarity index 100%
rename from tests/regressiontests/templates/context.py
rename to tests/templates/context.py
diff --git a/tests/regressiontests/templates/custom.py b/tests/templates/custom.py
similarity index 100%
rename from tests/regressiontests/templates/custom.py
rename to tests/templates/custom.py
diff --git a/tests/regressiontests/templates/eggs/tagsegg.egg b/tests/templates/eggs/tagsegg.egg
similarity index 100%
rename from tests/regressiontests/templates/eggs/tagsegg.egg
rename to tests/templates/eggs/tagsegg.egg
diff --git a/tests/regressiontests/templates/filters.py b/tests/templates/filters.py
similarity index 100%
rename from tests/regressiontests/templates/filters.py
rename to tests/templates/filters.py
diff --git a/tests/regressiontests/templates/loaders.py b/tests/templates/loaders.py
similarity index 100%
rename from tests/regressiontests/templates/loaders.py
rename to tests/templates/loaders.py
diff --git a/tests/regressiontests/staticfiles_tests/models.py b/tests/templates/models.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/models.py
rename to tests/templates/models.py
diff --git a/tests/regressiontests/templates/nodelist.py b/tests/templates/nodelist.py
similarity index 100%
rename from tests/regressiontests/templates/nodelist.py
rename to tests/templates/nodelist.py
diff --git a/tests/regressiontests/templates/parser.py b/tests/templates/parser.py
similarity index 100%
rename from tests/regressiontests/templates/parser.py
rename to tests/templates/parser.py
diff --git a/tests/regressiontests/templates/response.py b/tests/templates/response.py
similarity index 100%
rename from tests/regressiontests/templates/response.py
rename to tests/templates/response.py
diff --git a/tests/regressiontests/templates/smartif.py b/tests/templates/smartif.py
similarity index 100%
rename from tests/regressiontests/templates/smartif.py
rename to tests/templates/smartif.py
diff --git a/tests/regressiontests/templates/templates/broken_base.html b/tests/templates/templates/broken_base.html
similarity index 100%
rename from tests/regressiontests/templates/templates/broken_base.html
rename to tests/templates/templates/broken_base.html
diff --git a/tests/regressiontests/templates/templates/first/test.html b/tests/templates/templates/first/test.html
similarity index 100%
rename from tests/regressiontests/templates/templates/first/test.html
rename to tests/templates/templates/first/test.html
diff --git a/tests/regressiontests/templates/templates/inclusion.html b/tests/templates/templates/inclusion.html
similarity index 100%
rename from tests/regressiontests/templates/templates/inclusion.html
rename to tests/templates/templates/inclusion.html
diff --git a/tests/regressiontests/templates/templates/response.html b/tests/templates/templates/response.html
similarity index 100%
rename from tests/regressiontests/templates/templates/response.html
rename to tests/templates/templates/response.html
diff --git a/tests/regressiontests/templates/templates/second/test.html b/tests/templates/templates/second/test.html
similarity index 100%
rename from tests/regressiontests/templates/templates/second/test.html
rename to tests/templates/templates/second/test.html
diff --git a/tests/regressiontests/templates/templates/ssi include with spaces.html b/tests/templates/templates/ssi include with spaces.html
similarity index 100%
rename from tests/regressiontests/templates/templates/ssi include with spaces.html
rename to tests/templates/templates/ssi include with spaces.html
diff --git a/tests/regressiontests/templates/templates/ssi_include.html b/tests/templates/templates/ssi_include.html
similarity index 100%
rename from tests/regressiontests/templates/templates/ssi_include.html
rename to tests/templates/templates/ssi_include.html
diff --git a/tests/regressiontests/templates/templates/test_context.html b/tests/templates/templates/test_context.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_context.html
rename to tests/templates/templates/test_context.html
diff --git a/tests/regressiontests/templates/templates/test_extends_error.html b/tests/templates/templates/test_extends_error.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_extends_error.html
rename to tests/templates/templates/test_extends_error.html
diff --git a/tests/regressiontests/templates/templates/test_incl_tag_current_app.html b/tests/templates/templates/test_incl_tag_current_app.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_incl_tag_current_app.html
rename to tests/templates/templates/test_incl_tag_current_app.html
diff --git a/tests/regressiontests/templates/templates/test_incl_tag_use_l10n.html b/tests/templates/templates/test_incl_tag_use_l10n.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_incl_tag_use_l10n.html
rename to tests/templates/templates/test_incl_tag_use_l10n.html
diff --git a/tests/regressiontests/templates/templates/test_include_error.html b/tests/templates/templates/test_include_error.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_include_error.html
rename to tests/templates/templates/test_include_error.html
diff --git a/tests/regressiontests/staticfiles_tests/__init__.py b/tests/templates/templatetags/__init__.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/__init__.py
rename to tests/templates/templatetags/__init__.py
diff --git a/tests/regressiontests/templates/templatetags/bad_tag.py b/tests/templates/templatetags/bad_tag.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/bad_tag.py
rename to tests/templates/templatetags/bad_tag.py
diff --git a/tests/regressiontests/templates/templatetags/broken_tag.py b/tests/templates/templatetags/broken_tag.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/broken_tag.py
rename to tests/templates/templatetags/broken_tag.py
diff --git a/tests/regressiontests/templates/templatetags/custom.py b/tests/templates/templatetags/custom.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/custom.py
rename to tests/templates/templatetags/custom.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/__init__.py b/tests/templates/templatetags/subpackage/__init__.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/__init__.py
rename to tests/templates/templatetags/subpackage/__init__.py
diff --git a/tests/regressiontests/templates/templatetags/subpackage/echo.py b/tests/templates/templatetags/subpackage/echo.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/subpackage/echo.py
rename to tests/templates/templatetags/subpackage/echo.py
diff --git a/tests/regressiontests/templates/templatetags/subpackage/echo_invalid.py b/tests/templates/templatetags/subpackage/echo_invalid.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/subpackage/echo_invalid.py
rename to tests/templates/templatetags/subpackage/echo_invalid.py
diff --git a/tests/regressiontests/templates/tests.py b/tests/templates/tests.py
similarity index 100%
rename from tests/regressiontests/templates/tests.py
rename to tests/templates/tests.py
diff --git a/tests/regressiontests/templates/unicode.py b/tests/templates/unicode.py
similarity index 100%
rename from tests/regressiontests/templates/unicode.py
rename to tests/templates/unicode.py
diff --git a/tests/regressiontests/templates/urls.py b/tests/templates/urls.py
similarity index 100%
rename from tests/regressiontests/templates/urls.py
rename to tests/templates/urls.py
diff --git a/tests/regressiontests/templates/views.py b/tests/templates/views.py
similarity index 100%
rename from tests/regressiontests/templates/views.py
rename to tests/templates/views.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/__init__.py b/tests/test_client/__init__.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/no_label/__init__.py
rename to tests/test_client/__init__.py
diff --git a/tests/modeltests/test_client/fixtures/testdata.json b/tests/test_client/fixtures/testdata.json
similarity index 100%
rename from tests/modeltests/test_client/fixtures/testdata.json
rename to tests/test_client/fixtures/testdata.json
diff --git a/tests/modeltests/test_client/models.py b/tests/test_client/models.py
similarity index 100%
rename from tests/modeltests/test_client/models.py
rename to tests/test_client/models.py
diff --git a/tests/modeltests/test_client/tests.py b/tests/test_client/tests.py
similarity index 100%
rename from tests/modeltests/test_client/tests.py
rename to tests/test_client/tests.py
diff --git a/tests/modeltests/test_client/urls.py b/tests/test_client/urls.py
similarity index 100%
rename from tests/modeltests/test_client/urls.py
rename to tests/test_client/urls.py
diff --git a/tests/modeltests/test_client/views.py b/tests/test_client/views.py
similarity index 100%
rename from tests/modeltests/test_client/views.py
rename to tests/test_client/views.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/__init__.py b/tests/test_client_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/__init__.py
rename to tests/test_client_regress/__init__.py
diff --git a/tests/regressiontests/test_client_regress/bad_templates/404.html b/tests/test_client_regress/bad_templates/404.html
similarity index 100%
rename from tests/regressiontests/test_client_regress/bad_templates/404.html
rename to tests/test_client_regress/bad_templates/404.html
diff --git a/tests/regressiontests/test_client_regress/fixtures/testdata.json b/tests/test_client_regress/fixtures/testdata.json
similarity index 100%
rename from tests/regressiontests/test_client_regress/fixtures/testdata.json
rename to tests/test_client_regress/fixtures/testdata.json
diff --git a/tests/regressiontests/templates/models.py b/tests/test_client_regress/models.py
similarity index 100%
rename from tests/regressiontests/templates/models.py
rename to tests/test_client_regress/models.py
diff --git a/tests/regressiontests/test_client_regress/session.py b/tests/test_client_regress/session.py
similarity index 100%
rename from tests/regressiontests/test_client_regress/session.py
rename to tests/test_client_regress/session.py
diff --git a/tests/regressiontests/test_client_regress/templates/request_context.html b/tests/test_client_regress/templates/request_context.html
similarity index 100%
rename from tests/regressiontests/test_client_regress/templates/request_context.html
rename to tests/test_client_regress/templates/request_context.html
diff --git a/tests/regressiontests/test_client_regress/templates/unicode.html b/tests/test_client_regress/templates/unicode.html
similarity index 100%
rename from tests/regressiontests/test_client_regress/templates/unicode.html
rename to tests/test_client_regress/templates/unicode.html
diff --git a/tests/regressiontests/test_client_regress/tests.py b/tests/test_client_regress/tests.py
similarity index 100%
rename from tests/regressiontests/test_client_regress/tests.py
rename to tests/test_client_regress/tests.py
diff --git a/tests/regressiontests/test_client_regress/urls.py b/tests/test_client_regress/urls.py
similarity index 100%
rename from tests/regressiontests/test_client_regress/urls.py
rename to tests/test_client_regress/urls.py
diff --git a/tests/regressiontests/test_client_regress/views.py b/tests/test_client_regress/views.py
similarity index 100%
rename from tests/regressiontests/test_client_regress/views.py
rename to tests/test_client_regress/views.py
diff --git a/tests/regressiontests/staticfiles_tests/urls/__init__.py b/tests/test_runner/__init__.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/urls/__init__.py
rename to tests/test_runner/__init__.py
diff --git a/tests/regressiontests/string_lookup/__init__.py b/tests/test_runner/deprecation_app/__init__.py
similarity index 100%
rename from tests/regressiontests/string_lookup/__init__.py
rename to tests/test_runner/deprecation_app/__init__.py
diff --git a/tests/regressiontests/test_runner/deprecation_app/models.py b/tests/test_runner/deprecation_app/models.py
similarity index 100%
rename from tests/regressiontests/test_runner/deprecation_app/models.py
rename to tests/test_runner/deprecation_app/models.py
diff --git a/tests/regressiontests/test_runner/deprecation_app/tests.py b/tests/test_runner/deprecation_app/tests.py
similarity index 100%
rename from tests/regressiontests/test_runner/deprecation_app/tests.py
rename to tests/test_runner/deprecation_app/tests.py
diff --git a/tests/regressiontests/test_runner/invalid_app/__init__.py b/tests/test_runner/invalid_app/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/invalid_app/__init__.py
rename to tests/test_runner/invalid_app/__init__.py
diff --git a/tests/regressiontests/swappable_models/__init__.py b/tests/test_runner/invalid_app/models/__init__.py
similarity index 100%
rename from tests/regressiontests/swappable_models/__init__.py
rename to tests/test_runner/invalid_app/models/__init__.py
diff --git a/tests/regressiontests/test_runner/invalid_app/tests/__init__.py b/tests/test_runner/invalid_app/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/invalid_app/tests/__init__.py
rename to tests/test_runner/invalid_app/tests/__init__.py
diff --git a/tests/regressiontests/test_runner/models.py b/tests/test_runner/models.py
similarity index 100%
rename from tests/regressiontests/test_runner/models.py
rename to tests/test_runner/models.py
diff --git a/tests/regressiontests/test_runner/tests.py b/tests/test_runner/tests.py
similarity index 100%
rename from tests/regressiontests/test_runner/tests.py
rename to tests/test_runner/tests.py
diff --git a/tests/regressiontests/test_runner/valid_app/__init__.py b/tests/test_runner/valid_app/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/valid_app/__init__.py
rename to tests/test_runner/valid_app/__init__.py
diff --git a/tests/regressiontests/syndication/__init__.py b/tests/test_runner/valid_app/models/__init__.py
similarity index 100%
rename from tests/regressiontests/syndication/__init__.py
rename to tests/test_runner/valid_app/models/__init__.py
diff --git a/tests/regressiontests/templates/__init__.py b/tests/test_runner/valid_app/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/templates/__init__.py
rename to tests/test_runner/valid_app/tests/__init__.py
diff --git a/tests/regressiontests/templates/templatetags/__init__.py b/tests/test_utils/__init__.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/__init__.py
rename to tests/test_utils/__init__.py
diff --git a/tests/regressiontests/test_utils/fixtures/should_not_be_loaded.json b/tests/test_utils/fixtures/should_not_be_loaded.json
similarity index 100%
rename from tests/regressiontests/test_utils/fixtures/should_not_be_loaded.json
rename to tests/test_utils/fixtures/should_not_be_loaded.json
diff --git a/tests/regressiontests/test_utils/models.py b/tests/test_utils/models.py
similarity index 100%
rename from tests/regressiontests/test_utils/models.py
rename to tests/test_utils/models.py
diff --git a/tests/regressiontests/test_utils/templates/template_used/alternative.html b/tests/test_utils/templates/template_used/alternative.html
similarity index 100%
rename from tests/regressiontests/test_utils/templates/template_used/alternative.html
rename to tests/test_utils/templates/template_used/alternative.html
diff --git a/tests/regressiontests/test_utils/templates/template_used/base.html b/tests/test_utils/templates/template_used/base.html
similarity index 100%
rename from tests/regressiontests/test_utils/templates/template_used/base.html
rename to tests/test_utils/templates/template_used/base.html
diff --git a/tests/regressiontests/test_utils/templates/template_used/extends.html b/tests/test_utils/templates/template_used/extends.html
similarity index 100%
rename from tests/regressiontests/test_utils/templates/template_used/extends.html
rename to tests/test_utils/templates/template_used/extends.html
diff --git a/tests/regressiontests/test_utils/templates/template_used/include.html b/tests/test_utils/templates/template_used/include.html
similarity index 100%
rename from tests/regressiontests/test_utils/templates/template_used/include.html
rename to tests/test_utils/templates/template_used/include.html
diff --git a/tests/regressiontests/test_utils/tests.py b/tests/test_utils/tests.py
similarity index 100%
rename from tests/regressiontests/test_utils/tests.py
rename to tests/test_utils/tests.py
diff --git a/tests/regressiontests/test_utils/urls.py b/tests/test_utils/urls.py
similarity index 100%
rename from tests/regressiontests/test_utils/urls.py
rename to tests/test_utils/urls.py
diff --git a/tests/regressiontests/test_utils/views.py b/tests/test_utils/views.py
similarity index 100%
rename from tests/regressiontests/test_utils/views.py
rename to tests/test_utils/views.py
diff --git a/tests/regressiontests/templates/templatetags/subpackage/__init__.py b/tests/text/__init__.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/subpackage/__init__.py
rename to tests/text/__init__.py
diff --git a/tests/regressiontests/test_client_regress/models.py b/tests/text/models.py
similarity index 100%
rename from tests/regressiontests/test_client_regress/models.py
rename to tests/text/models.py
diff --git a/tests/regressiontests/text/tests.py b/tests/text/tests.py
similarity index 100%
rename from tests/regressiontests/text/tests.py
rename to tests/text/tests.py
diff --git a/tests/regressiontests/test_client_regress/__init__.py b/tests/timezones/__init__.py
similarity index 100%
rename from tests/regressiontests/test_client_regress/__init__.py
rename to tests/timezones/__init__.py
diff --git a/tests/modeltests/timezones/admin.py b/tests/timezones/admin.py
similarity index 100%
rename from tests/modeltests/timezones/admin.py
rename to tests/timezones/admin.py
diff --git a/tests/modeltests/timezones/fixtures/tz_users.xml b/tests/timezones/fixtures/tz_users.xml
similarity index 100%
rename from tests/modeltests/timezones/fixtures/tz_users.xml
rename to tests/timezones/fixtures/tz_users.xml
diff --git a/tests/modeltests/timezones/forms.py b/tests/timezones/forms.py
similarity index 100%
rename from tests/modeltests/timezones/forms.py
rename to tests/timezones/forms.py
diff --git a/tests/modeltests/timezones/models.py b/tests/timezones/models.py
similarity index 100%
rename from tests/modeltests/timezones/models.py
rename to tests/timezones/models.py
diff --git a/tests/modeltests/timezones/tests.py b/tests/timezones/tests.py
similarity index 100%
rename from tests/modeltests/timezones/tests.py
rename to tests/timezones/tests.py
diff --git a/tests/modeltests/timezones/urls.py b/tests/timezones/urls.py
similarity index 100%
rename from tests/modeltests/timezones/urls.py
rename to tests/timezones/urls.py
diff --git a/tests/regressiontests/test_runner/__init__.py b/tests/transactions/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/__init__.py
rename to tests/transactions/__init__.py
diff --git a/tests/modeltests/transactions/models.py b/tests/transactions/models.py
similarity index 100%
rename from tests/modeltests/transactions/models.py
rename to tests/transactions/models.py
diff --git a/tests/modeltests/transactions/tests.py b/tests/transactions/tests.py
similarity index 100%
rename from tests/modeltests/transactions/tests.py
rename to tests/transactions/tests.py
diff --git a/tests/regressiontests/test_runner/deprecation_app/__init__.py b/tests/transactions_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/deprecation_app/__init__.py
rename to tests/transactions_regress/__init__.py
diff --git a/tests/regressiontests/transactions_regress/models.py b/tests/transactions_regress/models.py
similarity index 100%
rename from tests/regressiontests/transactions_regress/models.py
rename to tests/transactions_regress/models.py
diff --git a/tests/regressiontests/transactions_regress/tests.py b/tests/transactions_regress/tests.py
similarity index 100%
rename from tests/regressiontests/transactions_regress/tests.py
rename to tests/transactions_regress/tests.py
diff --git a/tests/regressiontests/mail/__init__.py b/tests/unmanaged_models/__init__.py
similarity index 100%
rename from tests/regressiontests/mail/__init__.py
rename to tests/unmanaged_models/__init__.py
diff --git a/tests/modeltests/unmanaged_models/models.py b/tests/unmanaged_models/models.py
similarity index 100%
rename from tests/modeltests/unmanaged_models/models.py
rename to tests/unmanaged_models/models.py
diff --git a/tests/modeltests/unmanaged_models/tests.py b/tests/unmanaged_models/tests.py
similarity index 100%
rename from tests/modeltests/unmanaged_models/tests.py
rename to tests/unmanaged_models/tests.py
diff --git a/tests/regressiontests/test_runner/invalid_app/models/__init__.py b/tests/update/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/invalid_app/models/__init__.py
rename to tests/update/__init__.py
diff --git a/tests/modeltests/update/models.py b/tests/update/models.py
similarity index 100%
rename from tests/modeltests/update/models.py
rename to tests/update/models.py
diff --git a/tests/modeltests/update/tests.py b/tests/update/tests.py
similarity index 100%
rename from tests/modeltests/update/tests.py
rename to tests/update/tests.py
diff --git a/tests/regressiontests/test_runner/valid_app/models/__init__.py b/tests/update_only_fields/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/valid_app/models/__init__.py
rename to tests/update_only_fields/__init__.py
diff --git a/tests/modeltests/update_only_fields/models.py b/tests/update_only_fields/models.py
similarity index 100%
rename from tests/modeltests/update_only_fields/models.py
rename to tests/update_only_fields/models.py
diff --git a/tests/modeltests/update_only_fields/tests.py b/tests/update_only_fields/tests.py
similarity index 100%
rename from tests/modeltests/update_only_fields/tests.py
rename to tests/update_only_fields/tests.py
diff --git a/tests/regressiontests/test_runner/valid_app/tests/__init__.py b/tests/urlpatterns_reverse/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/valid_app/tests/__init__.py
rename to tests/urlpatterns_reverse/__init__.py
diff --git a/tests/regressiontests/urlpatterns_reverse/erroneous_urls.py b/tests/urlpatterns_reverse/erroneous_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/erroneous_urls.py
rename to tests/urlpatterns_reverse/erroneous_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/erroneous_views_module.py b/tests/urlpatterns_reverse/erroneous_views_module.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/erroneous_views_module.py
rename to tests/urlpatterns_reverse/erroneous_views_module.py
diff --git a/tests/regressiontests/urlpatterns_reverse/extra_urls.py b/tests/urlpatterns_reverse/extra_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/extra_urls.py
rename to tests/urlpatterns_reverse/extra_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py b/tests/urlpatterns_reverse/included_named_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/included_named_urls.py
rename to tests/urlpatterns_reverse/included_named_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py b/tests/urlpatterns_reverse/included_named_urls2.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
rename to tests/urlpatterns_reverse/included_named_urls2.py
diff --git a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
rename to tests/urlpatterns_reverse/included_namespace_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls.py b/tests/urlpatterns_reverse/included_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/included_urls.py
rename to tests/urlpatterns_reverse/included_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls2.py b/tests/urlpatterns_reverse/included_urls2.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/included_urls2.py
rename to tests/urlpatterns_reverse/included_urls2.py
diff --git a/tests/regressiontests/urlpatterns_reverse/middleware.py b/tests/urlpatterns_reverse/middleware.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/middleware.py
rename to tests/urlpatterns_reverse/middleware.py
diff --git a/tests/regressiontests/text/models.py b/tests/urlpatterns_reverse/models.py
similarity index 100%
rename from tests/regressiontests/text/models.py
rename to tests/urlpatterns_reverse/models.py
diff --git a/tests/regressiontests/urlpatterns_reverse/named_urls.py b/tests/urlpatterns_reverse/named_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/named_urls.py
rename to tests/urlpatterns_reverse/named_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/namespace_urls.py
rename to tests/urlpatterns_reverse/namespace_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/no_urls.py b/tests/urlpatterns_reverse/no_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/no_urls.py
rename to tests/urlpatterns_reverse/no_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py b/tests/urlpatterns_reverse/reverse_lazy_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py
rename to tests/urlpatterns_reverse/reverse_lazy_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/tests.py
rename to tests/urlpatterns_reverse/tests.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py b/tests/urlpatterns_reverse/urlconf_inner.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urlconf_inner.py
rename to tests/urlpatterns_reverse/urlconf_inner.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py b/tests/urlpatterns_reverse/urlconf_outer.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
rename to tests/urlpatterns_reverse/urlconf_outer.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urls.py
rename to tests/urlpatterns_reverse/urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py b/tests/urlpatterns_reverse/urls_error_handlers.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py
rename to tests/urlpatterns_reverse/urls_error_handlers.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py b/tests/urlpatterns_reverse/urls_error_handlers_callables.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py
rename to tests/urlpatterns_reverse/urls_error_handlers_callables.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py b/tests/urlpatterns_reverse/urls_without_full_import.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py
rename to tests/urlpatterns_reverse/urls_without_full_import.py
diff --git a/tests/regressiontests/urlpatterns_reverse/views.py b/tests/urlpatterns_reverse/views.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/views.py
rename to tests/urlpatterns_reverse/views.py
diff --git a/tests/regressiontests/urlpatterns_reverse/views_broken.py b/tests/urlpatterns_reverse/views_broken.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/views_broken.py
rename to tests/urlpatterns_reverse/views_broken.py
diff --git a/tests/regressiontests/test_utils/__init__.py b/tests/user_commands/__init__.py
similarity index 100%
rename from tests/regressiontests/test_utils/__init__.py
rename to tests/user_commands/__init__.py
diff --git a/tests/regressiontests/text/__init__.py b/tests/user_commands/management/__init__.py
similarity index 100%
rename from tests/regressiontests/text/__init__.py
rename to tests/user_commands/management/__init__.py
diff --git a/tests/regressiontests/transactions_regress/__init__.py b/tests/user_commands/management/commands/__init__.py
similarity index 100%
rename from tests/regressiontests/transactions_regress/__init__.py
rename to tests/user_commands/management/commands/__init__.py
diff --git a/tests/modeltests/user_commands/management/commands/dance.py b/tests/user_commands/management/commands/dance.py
similarity index 100%
rename from tests/modeltests/user_commands/management/commands/dance.py
rename to tests/user_commands/management/commands/dance.py
diff --git a/tests/modeltests/user_commands/management/commands/leave_locale_alone_false.py b/tests/user_commands/management/commands/leave_locale_alone_false.py
similarity index 100%
rename from tests/modeltests/user_commands/management/commands/leave_locale_alone_false.py
rename to tests/user_commands/management/commands/leave_locale_alone_false.py
diff --git a/tests/modeltests/user_commands/management/commands/leave_locale_alone_true.py b/tests/user_commands/management/commands/leave_locale_alone_true.py
similarity index 100%
rename from tests/modeltests/user_commands/management/commands/leave_locale_alone_true.py
rename to tests/user_commands/management/commands/leave_locale_alone_true.py
diff --git a/tests/modeltests/user_commands/models.py b/tests/user_commands/models.py
similarity index 100%
rename from tests/modeltests/user_commands/models.py
rename to tests/user_commands/models.py
diff --git a/tests/modeltests/user_commands/tests.py b/tests/user_commands/tests.py
similarity index 100%
rename from tests/modeltests/user_commands/tests.py
rename to tests/user_commands/tests.py
diff --git a/tests/regressiontests/urlpatterns_reverse/__init__.py b/tests/utils/__init__.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/__init__.py
rename to tests/utils/__init__.py
diff --git a/tests/regressiontests/utils/archive.py b/tests/utils/archive.py
similarity index 100%
rename from tests/regressiontests/utils/archive.py
rename to tests/utils/archive.py
diff --git a/tests/regressiontests/utils/archives/foobar.tar b/tests/utils/archives/foobar.tar
similarity index 100%
rename from tests/regressiontests/utils/archives/foobar.tar
rename to tests/utils/archives/foobar.tar
diff --git a/tests/regressiontests/utils/archives/foobar.tar.bz2 b/tests/utils/archives/foobar.tar.bz2
similarity index 100%
rename from tests/regressiontests/utils/archives/foobar.tar.bz2
rename to tests/utils/archives/foobar.tar.bz2
diff --git a/tests/regressiontests/utils/archives/foobar.tar.gz b/tests/utils/archives/foobar.tar.gz
similarity index 100%
rename from tests/regressiontests/utils/archives/foobar.tar.gz
rename to tests/utils/archives/foobar.tar.gz
diff --git a/tests/regressiontests/utils/archives/foobar.zip b/tests/utils/archives/foobar.zip
similarity index 100%
rename from tests/regressiontests/utils/archives/foobar.zip
rename to tests/utils/archives/foobar.zip
diff --git a/tests/regressiontests/utils/baseconv.py b/tests/utils/baseconv.py
similarity index 100%
rename from tests/regressiontests/utils/baseconv.py
rename to tests/utils/baseconv.py
diff --git a/tests/regressiontests/utils/checksums.py b/tests/utils/checksums.py
similarity index 100%
rename from tests/regressiontests/utils/checksums.py
rename to tests/utils/checksums.py
diff --git a/tests/regressiontests/utils/crypto.py b/tests/utils/crypto.py
similarity index 100%
rename from tests/regressiontests/utils/crypto.py
rename to tests/utils/crypto.py
diff --git a/tests/regressiontests/utils/datastructures.py b/tests/utils/datastructures.py
similarity index 100%
rename from tests/regressiontests/utils/datastructures.py
rename to tests/utils/datastructures.py
diff --git a/tests/regressiontests/utils/dateformat.py b/tests/utils/dateformat.py
similarity index 100%
rename from tests/regressiontests/utils/dateformat.py
rename to tests/utils/dateformat.py
diff --git a/tests/regressiontests/utils/dateparse.py b/tests/utils/dateparse.py
similarity index 100%
rename from tests/regressiontests/utils/dateparse.py
rename to tests/utils/dateparse.py
diff --git a/tests/regressiontests/utils/datetime_safe.py b/tests/utils/datetime_safe.py
similarity index 100%
rename from tests/regressiontests/utils/datetime_safe.py
rename to tests/utils/datetime_safe.py
diff --git a/tests/regressiontests/utils/decorators.py b/tests/utils/decorators.py
similarity index 100%
rename from tests/regressiontests/utils/decorators.py
rename to tests/utils/decorators.py
diff --git a/tests/regressiontests/utils/eggs/test_egg.egg b/tests/utils/eggs/test_egg.egg
similarity index 100%
rename from tests/regressiontests/utils/eggs/test_egg.egg
rename to tests/utils/eggs/test_egg.egg
diff --git a/tests/regressiontests/utils/encoding.py b/tests/utils/encoding.py
similarity index 100%
rename from tests/regressiontests/utils/encoding.py
rename to tests/utils/encoding.py
diff --git a/tests/regressiontests/utils/feedgenerator.py b/tests/utils/feedgenerator.py
similarity index 100%
rename from tests/regressiontests/utils/feedgenerator.py
rename to tests/utils/feedgenerator.py
diff --git a/tests/regressiontests/utils/functional.py b/tests/utils/functional.py
similarity index 100%
rename from tests/regressiontests/utils/functional.py
rename to tests/utils/functional.py
diff --git a/tests/regressiontests/utils/html.py b/tests/utils/html.py
similarity index 100%
rename from tests/regressiontests/utils/html.py
rename to tests/utils/html.py
diff --git a/tests/regressiontests/utils/http.py b/tests/utils/http.py
similarity index 100%
rename from tests/regressiontests/utils/http.py
rename to tests/utils/http.py
diff --git a/tests/regressiontests/utils/ipv6.py b/tests/utils/ipv6.py
similarity index 100%
rename from tests/regressiontests/utils/ipv6.py
rename to tests/utils/ipv6.py
diff --git a/tests/regressiontests/utils/jslex.py b/tests/utils/jslex.py
similarity index 100%
rename from tests/regressiontests/utils/jslex.py
rename to tests/utils/jslex.py
diff --git a/tests/regressiontests/utils/models.py b/tests/utils/models.py
similarity index 100%
rename from tests/regressiontests/utils/models.py
rename to tests/utils/models.py
diff --git a/tests/regressiontests/utils/module_loading.py b/tests/utils/module_loading.py
similarity index 100%
rename from tests/regressiontests/utils/module_loading.py
rename to tests/utils/module_loading.py
diff --git a/tests/regressiontests/utils/numberformat.py b/tests/utils/numberformat.py
similarity index 100%
rename from tests/regressiontests/utils/numberformat.py
rename to tests/utils/numberformat.py
diff --git a/tests/regressiontests/utils/os_utils.py b/tests/utils/os_utils.py
similarity index 100%
rename from tests/regressiontests/utils/os_utils.py
rename to tests/utils/os_utils.py
diff --git a/tests/regressiontests/utils/regex_helper.py b/tests/utils/regex_helper.py
similarity index 100%
rename from tests/regressiontests/utils/regex_helper.py
rename to tests/utils/regex_helper.py
diff --git a/tests/regressiontests/utils/simplelazyobject.py b/tests/utils/simplelazyobject.py
similarity index 100%
rename from tests/regressiontests/utils/simplelazyobject.py
rename to tests/utils/simplelazyobject.py
diff --git a/tests/regressiontests/utils/termcolors.py b/tests/utils/termcolors.py
similarity index 100%
rename from tests/regressiontests/utils/termcolors.py
rename to tests/utils/termcolors.py
diff --git a/tests/regressiontests/utils/__init__.py b/tests/utils/test_module/__init__.py
similarity index 100%
rename from tests/regressiontests/utils/__init__.py
rename to tests/utils/test_module/__init__.py
diff --git a/tests/regressiontests/utils/test_module/bad_module.py b/tests/utils/test_module/bad_module.py
similarity index 100%
rename from tests/regressiontests/utils/test_module/bad_module.py
rename to tests/utils/test_module/bad_module.py
diff --git a/tests/regressiontests/utils/test_module/good_module.py b/tests/utils/test_module/good_module.py
similarity index 100%
rename from tests/regressiontests/utils/test_module/good_module.py
rename to tests/utils/test_module/good_module.py
diff --git a/tests/regressiontests/utils/test_no_submodule.py b/tests/utils/test_no_submodule.py
similarity index 100%
rename from tests/regressiontests/utils/test_no_submodule.py
rename to tests/utils/test_no_submodule.py
diff --git a/tests/regressiontests/utils/tests.py b/tests/utils/tests.py
similarity index 100%
rename from tests/regressiontests/utils/tests.py
rename to tests/utils/tests.py
diff --git a/tests/regressiontests/utils/text.py b/tests/utils/text.py
similarity index 100%
rename from tests/regressiontests/utils/text.py
rename to tests/utils/text.py
diff --git a/tests/regressiontests/utils/timesince.py b/tests/utils/timesince.py
similarity index 100%
rename from tests/regressiontests/utils/timesince.py
rename to tests/utils/timesince.py
diff --git a/tests/regressiontests/utils/timezone.py b/tests/utils/timezone.py
similarity index 100%
rename from tests/regressiontests/utils/timezone.py
rename to tests/utils/timezone.py
diff --git a/tests/regressiontests/utils/tzinfo.py b/tests/utils/tzinfo.py
similarity index 100%
rename from tests/regressiontests/utils/tzinfo.py
rename to tests/utils/tzinfo.py
diff --git a/tests/modeltests/validation/__init__.py b/tests/validation/__init__.py
similarity index 100%
rename from tests/modeltests/validation/__init__.py
rename to tests/validation/__init__.py
diff --git a/tests/modeltests/validation/models.py b/tests/validation/models.py
similarity index 100%
rename from tests/modeltests/validation/models.py
rename to tests/validation/models.py
diff --git a/tests/modeltests/validation/test_custom_messages.py b/tests/validation/test_custom_messages.py
similarity index 100%
rename from tests/modeltests/validation/test_custom_messages.py
rename to tests/validation/test_custom_messages.py
diff --git a/tests/modeltests/validation/test_error_messages.py b/tests/validation/test_error_messages.py
similarity index 100%
rename from tests/modeltests/validation/test_error_messages.py
rename to tests/validation/test_error_messages.py
diff --git a/tests/modeltests/validation/test_unique.py b/tests/validation/test_unique.py
similarity index 100%
rename from tests/modeltests/validation/test_unique.py
rename to tests/validation/test_unique.py
diff --git a/tests/modeltests/validation/tests.py b/tests/validation/tests.py
similarity index 100%
rename from tests/modeltests/validation/tests.py
rename to tests/validation/tests.py
diff --git a/tests/modeltests/validation/validators.py b/tests/validation/validators.py
similarity index 100%
rename from tests/modeltests/validation/validators.py
rename to tests/validation/validators.py
diff --git a/tests/regressiontests/utils/test_module/__init__.py b/tests/validators/__init__.py
similarity index 100%
rename from tests/regressiontests/utils/test_module/__init__.py
rename to tests/validators/__init__.py
diff --git a/tests/regressiontests/urlpatterns_reverse/models.py b/tests/validators/models.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/models.py
rename to tests/validators/models.py
diff --git a/tests/modeltests/validators/tests.py b/tests/validators/tests.py
similarity index 100%
rename from tests/modeltests/validators/tests.py
rename to tests/validators/tests.py
diff --git a/tests/regressiontests/version/__init__.py b/tests/version/__init__.py
similarity index 100%
rename from tests/regressiontests/version/__init__.py
rename to tests/version/__init__.py
diff --git a/tests/regressiontests/version/models.py b/tests/version/models.py
similarity index 100%
rename from tests/regressiontests/version/models.py
rename to tests/version/models.py
diff --git a/tests/regressiontests/version/tests.py b/tests/version/tests.py
similarity index 100%
rename from tests/regressiontests/version/tests.py
rename to tests/version/tests.py
diff --git a/tests/regressiontests/views/__init__.py b/tests/views/__init__.py
similarity index 100%
rename from tests/regressiontests/views/__init__.py
rename to tests/views/__init__.py
diff --git a/tests/regressiontests/views/app0/__init__.py b/tests/views/app0/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app0/__init__.py
rename to tests/views/app0/__init__.py
diff --git a/tests/regressiontests/views/app0/locale/en/LC_MESSAGES/djangojs.mo b/tests/views/app0/locale/en/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app0/locale/en/LC_MESSAGES/djangojs.mo
rename to tests/views/app0/locale/en/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app0/locale/en/LC_MESSAGES/djangojs.po b/tests/views/app0/locale/en/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app0/locale/en/LC_MESSAGES/djangojs.po
rename to tests/views/app0/locale/en/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/app1/__init__.py b/tests/views/app1/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app1/__init__.py
rename to tests/views/app1/__init__.py
diff --git a/tests/regressiontests/views/app1/locale/fr/LC_MESSAGES/djangojs.mo b/tests/views/app1/locale/fr/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app1/locale/fr/LC_MESSAGES/djangojs.mo
rename to tests/views/app1/locale/fr/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app1/locale/fr/LC_MESSAGES/djangojs.po b/tests/views/app1/locale/fr/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app1/locale/fr/LC_MESSAGES/djangojs.po
rename to tests/views/app1/locale/fr/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/app2/__init__.py b/tests/views/app2/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app2/__init__.py
rename to tests/views/app2/__init__.py
diff --git a/tests/regressiontests/views/app2/locale/fr/LC_MESSAGES/djangojs.mo b/tests/views/app2/locale/fr/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app2/locale/fr/LC_MESSAGES/djangojs.mo
rename to tests/views/app2/locale/fr/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app2/locale/fr/LC_MESSAGES/djangojs.po b/tests/views/app2/locale/fr/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app2/locale/fr/LC_MESSAGES/djangojs.po
rename to tests/views/app2/locale/fr/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/app3/__init__.py b/tests/views/app3/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app3/__init__.py
rename to tests/views/app3/__init__.py
diff --git a/tests/regressiontests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.mo b/tests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.mo
rename to tests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.po b/tests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.po
rename to tests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/app4/__init__.py b/tests/views/app4/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app4/__init__.py
rename to tests/views/app4/__init__.py
diff --git a/tests/regressiontests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.mo b/tests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.mo
rename to tests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.po b/tests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.po
rename to tests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/fixtures/testdata.json b/tests/views/fixtures/testdata.json
similarity index 100%
rename from tests/regressiontests/views/fixtures/testdata.json
rename to tests/views/fixtures/testdata.json
diff --git a/tests/regressiontests/views/generic_urls.py b/tests/views/generic_urls.py
similarity index 100%
rename from tests/regressiontests/views/generic_urls.py
rename to tests/views/generic_urls.py
diff --git a/tests/regressiontests/views/locale/de/LC_MESSAGES/djangojs.mo b/tests/views/locale/de/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/locale/de/LC_MESSAGES/djangojs.mo
rename to tests/views/locale/de/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/locale/de/LC_MESSAGES/djangojs.po b/tests/views/locale/de/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/locale/de/LC_MESSAGES/djangojs.po
rename to tests/views/locale/de/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/locale/es/LC_MESSAGES/djangojs.mo b/tests/views/locale/es/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/locale/es/LC_MESSAGES/djangojs.mo
rename to tests/views/locale/es/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/locale/es/LC_MESSAGES/djangojs.po b/tests/views/locale/es/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/locale/es/LC_MESSAGES/djangojs.po
rename to tests/views/locale/es/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/locale/fr/LC_MESSAGES/djangojs.mo b/tests/views/locale/fr/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/locale/fr/LC_MESSAGES/djangojs.mo
rename to tests/views/locale/fr/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/locale/fr/LC_MESSAGES/djangojs.po b/tests/views/locale/fr/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/locale/fr/LC_MESSAGES/djangojs.po
rename to tests/views/locale/fr/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/locale/ru/LC_MESSAGES/djangojs.mo b/tests/views/locale/ru/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/locale/ru/LC_MESSAGES/djangojs.mo
rename to tests/views/locale/ru/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/locale/ru/LC_MESSAGES/djangojs.po b/tests/views/locale/ru/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/locale/ru/LC_MESSAGES/djangojs.po
rename to tests/views/locale/ru/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/media/file.txt b/tests/views/media/file.txt
similarity index 100%
rename from tests/regressiontests/views/media/file.txt
rename to tests/views/media/file.txt
diff --git a/tests/regressiontests/views/media/file.txt.gz b/tests/views/media/file.txt.gz
similarity index 100%
rename from tests/regressiontests/views/media/file.txt.gz
rename to tests/views/media/file.txt.gz
diff --git a/tests/regressiontests/views/media/file.unknown b/tests/views/media/file.unknown
similarity index 100%
rename from tests/regressiontests/views/media/file.unknown
rename to tests/views/media/file.unknown
diff --git a/tests/regressiontests/views/models.py b/tests/views/models.py
similarity index 100%
rename from tests/regressiontests/views/models.py
rename to tests/views/models.py
diff --git a/tests/regressiontests/views/templates/debug/render_test.html b/tests/views/templates/debug/render_test.html
similarity index 100%
rename from tests/regressiontests/views/templates/debug/render_test.html
rename to tests/views/templates/debug/render_test.html
diff --git a/tests/regressiontests/views/templates/debug/template_exception.html b/tests/views/templates/debug/template_exception.html
similarity index 100%
rename from tests/regressiontests/views/templates/debug/template_exception.html
rename to tests/views/templates/debug/template_exception.html
diff --git a/tests/regressiontests/views/templates/jsi18n.html b/tests/views/templates/jsi18n.html
similarity index 100%
rename from tests/regressiontests/views/templates/jsi18n.html
rename to tests/views/templates/jsi18n.html
diff --git a/tests/regressiontests/views/templatetags/__init__.py b/tests/views/templatetags/__init__.py
similarity index 100%
rename from tests/regressiontests/views/templatetags/__init__.py
rename to tests/views/templatetags/__init__.py
diff --git a/tests/regressiontests/views/templatetags/debugtags.py b/tests/views/templatetags/debugtags.py
similarity index 100%
rename from tests/regressiontests/views/templatetags/debugtags.py
rename to tests/views/templatetags/debugtags.py
diff --git a/tests/regressiontests/views/tests/__init__.py b/tests/views/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/views/tests/__init__.py
rename to tests/views/tests/__init__.py
diff --git a/tests/regressiontests/views/tests/debug.py b/tests/views/tests/debug.py
similarity index 100%
rename from tests/regressiontests/views/tests/debug.py
rename to tests/views/tests/debug.py
diff --git a/tests/regressiontests/views/tests/defaults.py b/tests/views/tests/defaults.py
similarity index 100%
rename from tests/regressiontests/views/tests/defaults.py
rename to tests/views/tests/defaults.py
diff --git a/tests/regressiontests/views/tests/i18n.py b/tests/views/tests/i18n.py
similarity index 100%
rename from tests/regressiontests/views/tests/i18n.py
rename to tests/views/tests/i18n.py
diff --git a/tests/regressiontests/views/tests/shortcuts.py b/tests/views/tests/shortcuts.py
similarity index 100%
rename from tests/regressiontests/views/tests/shortcuts.py
rename to tests/views/tests/shortcuts.py
diff --git a/tests/regressiontests/views/tests/specials.py b/tests/views/tests/specials.py
similarity index 100%
rename from tests/regressiontests/views/tests/specials.py
rename to tests/views/tests/specials.py
diff --git a/tests/regressiontests/views/tests/static.py b/tests/views/tests/static.py
similarity index 100%
rename from tests/regressiontests/views/tests/static.py
rename to tests/views/tests/static.py
diff --git a/tests/regressiontests/views/urls.py b/tests/views/urls.py
similarity index 100%
rename from tests/regressiontests/views/urls.py
rename to tests/views/urls.py
diff --git a/tests/regressiontests/views/views.py b/tests/views/views.py
similarity index 100%
rename from tests/regressiontests/views/views.py
rename to tests/views/views.py
diff --git a/tests/regressiontests/wsgi/__init__.py b/tests/wsgi/__init__.py
similarity index 100%
rename from tests/regressiontests/wsgi/__init__.py
rename to tests/wsgi/__init__.py
diff --git a/tests/regressiontests/wsgi/models.py b/tests/wsgi/models.py
similarity index 100%
rename from tests/regressiontests/wsgi/models.py
rename to tests/wsgi/models.py
diff --git a/tests/regressiontests/wsgi/tests.py b/tests/wsgi/tests.py
similarity index 100%
rename from tests/regressiontests/wsgi/tests.py
rename to tests/wsgi/tests.py
diff --git a/tests/regressiontests/wsgi/urls.py b/tests/wsgi/urls.py
similarity index 100%
rename from tests/regressiontests/wsgi/urls.py
rename to tests/wsgi/urls.py
diff --git a/tests/regressiontests/wsgi/wsgi.py b/tests/wsgi/wsgi.py
similarity index 100%
rename from tests/regressiontests/wsgi/wsgi.py
rename to tests/wsgi/wsgi.py