3 files changed, 9 insertions, 7 deletions
diff --git a/tests/generic_inline_admin/admin.py b/tests/generic_inline_admin/admin.py
index 46f6cf3e7f..3f13b394f3 100644
--- a/tests/generic_inline_admin/admin.py
+++ b/tests/generic_inline_admin/admin.py
@@ -1,9 +1,9 @@
 from django.contrib import admin
 from django.contrib.contenttypes.admin import GenericTabularInline
 
-from .models import (Media, PhoneNumber, Episode, Contact,
-    Category, EpisodePermanent)
-
+from .models import (
+    Category, Contact, Episode, EpisodePermanent, Media, PhoneNumber,
+)
 
 site = admin.AdminSite(name="admin")
 
diff --git a/tests/generic_inline_admin/models.py b/tests/generic_inline_admin/models.py
index 059aadc5ba..d15f2b9f17 100644
--- a/tests/generic_inline_admin/models.py
+++ b/tests/generic_inline_admin/models.py
@@ -1,5 +1,5 @@
 from django.contrib.contenttypes.fields import (
-    GenericForeignKey, GenericRelation
+    GenericForeignKey, GenericRelation,
 )
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py
index ebc54e082b..58b1f930f1 100644
--- a/tests/generic_inline_admin/tests.py
+++ b/tests/generic_inline_admin/tests.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import warnings
 
 from django.contrib import admin
@@ -9,12 +10,13 @@ from django.contrib.contenttypes.admin import GenericTabularInline
 from django.contrib.contenttypes.forms import generic_inlineformset_factory
 from django.forms.formsets import DEFAULT_MAX_NUM
 from django.forms.models import ModelForm
-from django.test import RequestFactory, TestCase, ignore_warnings, override_settings
+from django.test import (
+    RequestFactory, TestCase, ignore_warnings, override_settings,
+)
 from django.utils.deprecation import RemovedInDjango19Warning
 
-# local test models
 from .admin import MediaInline, MediaPermanentInline, site as admin_site
-from .models import Episode, Media, EpisodePermanent, Category
+from .models import Category, Episode, EpisodePermanent, Media
 
 
 # Set TEMPLATE_DEBUG to True to ensure {% include %} will raise exceptions.