diff --git a/tests/generic_views/base.py b/tests/generic_views/test_base.py
similarity index 100%
rename from tests/generic_views/base.py
rename to tests/generic_views/test_base.py
diff --git a/tests/generic_views/dates.py b/tests/generic_views/test_dates.py
similarity index 100%
rename from tests/generic_views/dates.py
rename to tests/generic_views/test_dates.py
diff --git a/tests/generic_views/detail.py b/tests/generic_views/test_detail.py
similarity index 100%
rename from tests/generic_views/detail.py
rename to tests/generic_views/test_detail.py
diff --git a/tests/generic_views/edit.py b/tests/generic_views/test_edit.py
similarity index 100%
rename from tests/generic_views/edit.py
rename to tests/generic_views/test_edit.py
diff --git a/tests/generic_views/forms.py b/tests/generic_views/test_forms.py
similarity index 100%
rename from tests/generic_views/forms.py
rename to tests/generic_views/test_forms.py
diff --git a/tests/generic_views/list.py b/tests/generic_views/test_list.py
similarity index 100%
rename from tests/generic_views/list.py
rename to tests/generic_views/test_list.py
diff --git a/tests/generic_views/tests.py b/tests/generic_views/tests.py
index 3f80600efe..244aa3c701 100644
--- a/tests/generic_views/tests.py
+++ b/tests/generic_views/tests.py
@@ -1,11 +1,11 @@
 from __future__ import absolute_import
 
-from .base import (ViewTest, TemplateViewTest, RedirectViewTest,
+from .test_base import (ViewTest, TemplateViewTest, RedirectViewTest,
     GetContextDataTest)
-from .dates import (ArchiveIndexViewTests, YearArchiveViewTests,
+from .test_dates import (ArchiveIndexViewTests, YearArchiveViewTests,
     MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests,
     DateDetailViewTests)
-from .detail import DetailViewTest
-from .edit import (FormMixinTests, BasicFormTests, ModelFormMixinTests,
+from .test_detail import DetailViewTest
+from .test_edit import (FormMixinTests, BasicFormTests, ModelFormMixinTests,
     CreateViewTests, UpdateViewTests, DeleteViewTests)
-from .list import ListViewTests
+from .test_list import ListViewTests
diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py
index 856565a953..69bfcb32dd 100644
--- a/tests/generic_views/views.py
+++ b/tests/generic_views/views.py
@@ -7,7 +7,7 @@ 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 .test_forms import AuthorForm, ContactForm
 from .models import Artist, Author, Book, Page, BookSigning