diff --git a/tests/generic_views/test_forms.py b/tests/generic_views/forms.py
similarity index 100%
rename from tests/generic_views/test_forms.py
rename to tests/generic_views/forms.py
diff --git a/tests/generic_views/test_edit.py b/tests/generic_views/test_edit.py
index a6ad397a48..df5dab3f79 100644
--- a/tests/generic_views/test_edit.py
+++ b/tests/generic_views/test_edit.py
@@ -9,8 +9,8 @@ from django.views.generic.base import View
 from django.views.generic.edit import CreateView, FormMixin, ModelFormMixin
 
 from . import views
+from .forms import AuthorForm
 from .models import Artist, Author
-from .test_forms import AuthorForm
 
 
 class FormMixinTests(SimpleTestCase):
diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py
index b40bbe92f0..be8a769b7b 100644
--- a/tests/generic_views/views.py
+++ b/tests/generic_views/views.py
@@ -6,8 +6,8 @@ from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.decorators import method_decorator
 from django.views import generic
 
+from .forms import AuthorForm, ContactForm
 from .models import Artist, Author, Book, BookSigning, Page
-from .test_forms import AuthorForm, ContactForm
 
 
 class CustomTemplateView(generic.TemplateView):