13 files changed, 12 insertions, 12 deletions
diff --git a/tests/forms_tests/tests/__init__.py b/tests/forms_tests/tests/__init__.py
index 6b4771912f..3fb537ef41 100644
--- a/tests/forms_tests/tests/__init__.py
+++ b/tests/forms_tests/tests/__init__.py
@@ -1,21 +1,21 @@
 from __future__ import absolute_import
 
-from .error_messages import (FormsErrorMessagesTestCase,
+from .test_error_messages import (FormsErrorMessagesTestCase,
     ModelChoiceFieldErrorMessagesTestCase)
-from .extra import FormsExtraTestCase, FormsExtraL10NTestCase
-from .fields import FieldsTests
-from .forms import FormsTestCase
-from .formsets import (FormsFormsetTestCase, FormsetAsFooTests,
+from .test_extra import FormsExtraTestCase, FormsExtraL10NTestCase
+from .test_fields import FieldsTests
+from .test_forms import FormsTestCase
+from .test_formsets import (FormsFormsetTestCase, FormsetAsFooTests,
     TestIsBoundBehavior, TestEmptyFormSet)
-from .input_formats import (LocalizedTimeTests, CustomTimeInputFormatsTests,
+from .test_input_formats import (LocalizedTimeTests, CustomTimeInputFormatsTests,
     SimpleTimeFormatTests, LocalizedDateTests, CustomDateInputFormatsTests,
     SimpleDateFormatTests, LocalizedDateTimeTests,
     CustomDateTimeInputFormatsTests, SimpleDateTimeFormatTests)
-from .media import FormsMediaTestCase, StaticFormsMediaTestCase
+from .test_media import FormsMediaTestCase, StaticFormsMediaTestCase
 from .tests import (TestTicket12510, ModelFormCallableModelDefault,
     FormsModelTestCase, RelatedModelFormTests)
-from .regressions import FormsRegressionsTestCase
-from .util import FormsUtilTestCase
-from .validators import TestFieldWithValidators
-from .widgets import (FormsWidgetTestCase, FormsI18NWidgetsTestCase,
+from .test_regressions import FormsRegressionsTestCase
+from .test_util import FormsUtilTestCase
+from .test_validators import TestFieldWithValidators
+from .test_widgets import (FormsWidgetTestCase, FormsI18NWidgetsTestCase,
     WidgetTests, LiveWidgetTests, ClearableFileInputTests)
diff --git a/tests/forms_tests/tests/models.py b/tests/forms_tests/tests/models.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/forms_tests/tests/models.py
+++ /dev/null
diff --git a/tests/forms_tests/tests/error_messages.py b/tests/forms_tests/tests/test_error_messages.py
index af047daf64..af047daf64 100644
--- a/tests/forms_tests/tests/error_messages.py
+++ b/tests/forms_tests/tests/test_error_messages.py
diff --git a/tests/forms_tests/tests/extra.py b/tests/forms_tests/tests/test_extra.py
index 427d099bb2..a83cdfc05f 100644
--- a/tests/forms_tests/tests/extra.py
+++ b/tests/forms_tests/tests/test_extra.py
@@ -12,7 +12,7 @@ from django.utils import six
 from django.utils import translation
 from django.utils.encoding import force_text, smart_text, python_2_unicode_compatible
 
-from .error_messages import AssertFormErrorsMixin
+from .test_error_messages import AssertFormErrorsMixin
 
 
 class GetDate(Form):
diff --git a/tests/forms_tests/tests/fields.py b/tests/forms_tests/tests/test_fields.py
index 7516de29b4..7516de29b4 100644
--- a/tests/forms_tests/tests/fields.py
+++ b/tests/forms_tests/tests/test_fields.py
diff --git a/tests/forms_tests/tests/forms.py b/tests/forms_tests/tests/test_forms.py
index cf63acb57c..cf63acb57c 100644
--- a/tests/forms_tests/tests/forms.py
+++ b/tests/forms_tests/tests/test_forms.py
diff --git a/tests/forms_tests/tests/formsets.py b/tests/forms_tests/tests/test_formsets.py
index 4ac3c5ecf1..4ac3c5ecf1 100644
--- a/tests/forms_tests/tests/formsets.py
+++ b/tests/forms_tests/tests/test_formsets.py
diff --git a/tests/forms_tests/tests/input_formats.py b/tests/forms_tests/tests/test_input_formats.py
index eb0e8dcad8..eb0e8dcad8 100644
--- a/tests/forms_tests/tests/input_formats.py
+++ b/tests/forms_tests/tests/test_input_formats.py
diff --git a/tests/forms_tests/tests/media.py b/tests/forms_tests/tests/test_media.py
index c492a1e539..c492a1e539 100644
--- a/tests/forms_tests/tests/media.py
+++ b/tests/forms_tests/tests/test_media.py
diff --git a/tests/forms_tests/tests/regressions.py b/tests/forms_tests/tests/test_regressions.py
index ba741bc16b..ba741bc16b 100644
--- a/tests/forms_tests/tests/regressions.py
+++ b/tests/forms_tests/tests/test_regressions.py
diff --git a/tests/forms_tests/tests/util.py b/tests/forms_tests/tests/test_util.py
index c2d213ae23..c2d213ae23 100644
--- a/tests/forms_tests/tests/util.py
+++ b/tests/forms_tests/tests/test_util.py
diff --git a/tests/forms_tests/tests/validators.py b/tests/forms_tests/tests/test_validators.py
index 0598835cff..0598835cff 100644
--- a/tests/forms_tests/tests/validators.py
+++ b/tests/forms_tests/tests/test_validators.py
diff --git a/tests/forms_tests/tests/widgets.py b/tests/forms_tests/tests/test_widgets.py
index 00e45b6b02..00e45b6b02 100644
--- a/tests/forms_tests/tests/widgets.py
+++ b/tests/forms_tests/tests/test_widgets.py