diff --git a/tests/modeltests/validation/models.py b/tests/modeltests/validation/models.py
index f92fc1f4ec..da9e42a7fe 100644
--- a/tests/modeltests/validation/models.py
+++ b/tests/modeltests/validation/models.py
@@ -88,5 +88,5 @@ class GenericIPAddressTestModel(models.Model):
     v4_ip = models.GenericIPAddressField(blank=True, protocol="ipv4")
     v6_ip = models.GenericIPAddressField(blank=True, protocol="ipv6")
 
-class GenericIPAddressWithUnpackUniqueTestModel(models.Model):
+class GenericIPAddrUnpackUniqueTest(models.Model):
     generic_v4unpack_ip = models.GenericIPAddressField(blank=True, unique=True, unpack_ipv4=True)
diff --git a/tests/modeltests/validation/tests.py b/tests/modeltests/validation/tests.py
index bb60267ff0..1dc9917915 100644
--- a/tests/modeltests/validation/tests.py
+++ b/tests/modeltests/validation/tests.py
@@ -3,7 +3,7 @@ from django.test import TestCase
 from django.core.exceptions import NON_FIELD_ERRORS
 from modeltests.validation import ValidationTestCase
 from modeltests.validation.models import (Author, Article, ModelToValidate,
-    GenericIPAddressTestModel, GenericIPAddressWithUnpackUniqueTestModel)
+    GenericIPAddressTestModel, GenericIPAddrUnpackUniqueTest)
 
 # Import other tests for this package.
 from modeltests.validation.validators import TestModelsWithValidators
@@ -177,7 +177,7 @@ class GenericIPAddressFieldTests(ValidationTestCase):
         self.assertEqual(None, giptm.full_clean())
 
         # These two are the same, because we are doing IPv4 unpacking
-        giptm = GenericIPAddressWithUnpackUniqueTestModel(generic_v4unpack_ip="::ffff:18.52.18.52")
+        giptm = GenericIPAddrUnpackUniqueTest(generic_v4unpack_ip="::ffff:18.52.18.52")
         giptm.save()
-        giptm = GenericIPAddressWithUnpackUniqueTestModel(generic_v4unpack_ip="18.52.18.52")
+        giptm = GenericIPAddrUnpackUniqueTest(generic_v4unpack_ip="18.52.18.52")
         self.assertFailsValidation(giptm.full_clean, ['generic_v4unpack_ip',])