6 files changed, 40 insertions, 6 deletions
diff --git a/tests/forms_tests/tests/test_error_messages.py b/tests/forms_tests/tests/test_error_messages.py
index 5863b457f4..2d532c7cf9 100644
--- a/tests/forms_tests/tests/test_error_messages.py
+++ b/tests/forms_tests/tests/test_error_messages.py
@@ -4,7 +4,13 @@ from __future__ import unicode_literals
 import warnings
 
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.forms import *
+from django.forms import (
+    BooleanField, CharField, ChoiceField, DateField, DateTimeField,
+    DecimalField, EmailField, FileField, FloatField, Form,
+    GenericIPAddressField, IntegerField, IPAddressField, ModelChoiceField,
+    ModelMultipleChoiceField, MultipleChoiceField, RegexField,
+    SplitDateTimeField, TimeField, URLField, utils, ValidationError,
+)
 from django.test import TestCase
 from django.utils.safestring import mark_safe
 from django.utils.encoding import python_2_unicode_compatible
diff --git a/tests/forms_tests/tests/test_extra.py b/tests/forms_tests/tests/test_extra.py
index f32c764a1e..8833903d33 100644
--- a/tests/forms_tests/tests/test_extra.py
+++ b/tests/forms_tests/tests/test_extra.py
@@ -4,7 +4,12 @@ from __future__ import unicode_literals
 import datetime
 import warnings
 
-from django.forms import *
+from django.forms import (
+    CharField, DateField, EmailField, FileField, Form, GenericIPAddressField,
+    HiddenInput, ImageField, IPAddressField, MultipleChoiceField,
+    MultiValueField, MultiWidget, PasswordInput, SelectMultiple, SlugField,
+    SplitDateTimeField, SplitDateTimeWidget, TextInput, URLField,
+)
 from django.forms.extras import SelectDateWidget
 from django.forms.utils import ErrorList
 from django.test import TestCase
diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py
index 4c787b1f2f..1ed07a0d88 100644
--- a/tests/forms_tests/tests/test_fields.py
+++ b/tests/forms_tests/tests/test_fields.py
@@ -33,7 +33,14 @@ import os
 from decimal import Decimal
 
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.forms import *
+from django.forms import (
+    BooleanField, CharField, ChoiceField, ComboField, DateField, DateTimeField,
+    DecimalField, EmailField, Field, FileField, FilePathField, FloatField,
+    Form, forms, HiddenInput, IntegerField, MultipleChoiceField,
+    NullBooleanField, NumberInput, PasswordInput, RadioSelect, RegexField,
+    SplitDateTimeField, TextInput, TimeField, TypedChoiceField,
+    TypedMultipleChoiceField, URLField, ValidationError, Widget,
+)
 from django.test import SimpleTestCase
 from django.utils import formats
 from django.utils import six
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index 5dcde4e017..4feb47dfce 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -7,7 +7,13 @@ import warnings
 
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.validators import RegexValidator
-from django.forms import *
+from django.forms import (
+    BooleanField, CharField, CheckboxSelectMultiple, ChoiceField, DateField,
+    EmailField, FileField, FloatField, Form, forms, HiddenInput, IntegerField,
+    MultipleChoiceField, MultipleHiddenInput, MultiValueField,
+    NullBooleanField, PasswordInput, RadioSelect, Select, SplitDateTimeField,
+    Textarea, TextInput, ValidationError, widgets,
+)
 from django.http import QueryDict
 from django.template import Template, Context
 from django.test import TestCase
diff --git a/tests/forms_tests/tests/test_regressions.py b/tests/forms_tests/tests/test_regressions.py
index d230d68f75..e41e929fab 100644
--- a/tests/forms_tests/tests/test_regressions.py
+++ b/tests/forms_tests/tests/test_regressions.py
@@ -3,7 +3,11 @@ from __future__ import unicode_literals
 
 import warnings
 
-from django.forms import *
+from django.forms import (
+    CharField, ChoiceField, Form, HiddenInput, IntegerField, ModelForm,
+    ModelMultipleChoiceField, MultipleChoiceField, RadioSelect, Select,
+    TextInput,
+)
 from django.test import TestCase
 from django.utils.translation import ugettext_lazy, override
 
diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py
index 22c2d4258b..e6509e8699 100644
--- a/tests/forms_tests/tests/test_widgets.py
+++ b/tests/forms_tests/tests/test_widgets.py
@@ -7,7 +7,13 @@ import datetime
 from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.urlresolvers import reverse
-from django.forms import *
+from django.forms import (
+    BooleanField, CheckboxInput, CheckboxSelectMultiple, ChoiceField,
+    ClearableFileInput, DateInput, DateTimeField, DateTimeInput, FileInput,
+    Form, HiddenInput, MultipleHiddenInput, MultiWidget, NullBooleanSelect,
+    PasswordInput, RadioSelect, Select, SelectMultiple, SplitDateTimeWidget,
+    Textarea, TextInput, TimeInput,
+)
 from django.forms.widgets import RadioFieldRenderer
 from django.utils import formats
 from django.utils.safestring import mark_safe