diff --git a/tests/regressiontests/inspectdb/models.py b/tests/regressiontests/inspectdb/models.py
index 057ff69efe..ff9f6f01b0 100644
--- a/tests/regressiontests/inspectdb/models.py
+++ b/tests/regressiontests/inspectdb/models.py
@@ -32,25 +32,25 @@ class SpecialColumnName(models.Model):
 
 class ColumnTypes(models.Model):
     id = models.AutoField(primary_key=True)
-    field1 = models.BigIntegerField()
-    field2 = models.BooleanField()
-    field2b = models.NullBooleanField()
-    field3 = models.CharField(max_length=10)
-    field4 = models.CommaSeparatedIntegerField(max_length=99)
-    field5 = models.DateField()
-    field6 = models.DateTimeField()
-    field7 = models.DecimalField(max_digits=6, decimal_places=1)
-    field8 = models.EmailField()
-    field9 = models.FileField(upload_to="unused")
-    field10 = models.FilePathField()
-    field11 = models.FloatField()
-    field12 = models.IntegerField()
-    field13 = models.IPAddressField()
-    field14 = models.GenericIPAddressField(protocol="ipv4")
-    field16 = models.PositiveIntegerField()
-    field17 = models.PositiveSmallIntegerField()
-    field18 = models.SlugField()
-    field19 = models.SmallIntegerField()
-    field20 = models.TextField()
-    field21 = models.TimeField()
-    field22 = models.URLField()
+    big_int_field = models.BigIntegerField()
+    bool_field = models.BooleanField()
+    null_bool_field = models.NullBooleanField()
+    char_field = models.CharField(max_length=10)
+    comma_separated_int_field = models.CommaSeparatedIntegerField(max_length=99)
+    date_field = models.DateField()
+    date_time_field = models.DateTimeField()
+    decimal_field = models.DecimalField(max_digits=6, decimal_places=1)
+    email_field = models.EmailField()
+    file_field = models.FileField(upload_to="unused")
+    file_path_field = models.FilePathField()
+    float_field = models.FloatField()
+    int_field = models.IntegerField()
+    ip_address_field = models.IPAddressField()
+    gen_ip_adress_field = models.GenericIPAddressField(protocol="ipv4")
+    pos_int_field = models.PositiveIntegerField()
+    pos_small_int_field = models.PositiveSmallIntegerField()
+    slug_field = models.SlugField()
+    small_int_field = models.SmallIntegerField()
+    text_field = models.TextField()
+    time_field = models.TimeField()
+    url_field = models.URLField()
diff --git a/tests/regressiontests/inspectdb/tests.py b/tests/regressiontests/inspectdb/tests.py
index 56c7275558..33fd567546 100644
--- a/tests/regressiontests/inspectdb/tests.py
+++ b/tests/regressiontests/inspectdb/tests.py
@@ -35,61 +35,55 @@ class InspectDBTestCase(TestCase):
             self.assertEqual(definition, out_def)
 
         assertFieldType('id', "models.IntegerField(primary_key=True)")
-        assertFieldType('field1', "models.BigIntegerField()")
+        assertFieldType('big_int_field', "models.BigIntegerField()")
         if connection.vendor == 'mysql':
             # No native boolean type on MySQL
-            assertFieldType('field2', "models.IntegerField()")
-            assertFieldType('field2b', "models.IntegerField(null=True, blank=True)")
+            assertFieldType('bool_field', "models.IntegerField()")
+            assertFieldType('null_bool_field', "models.IntegerField(blank=True, null=True)")
         else:
-            assertFieldType('field2', "models.BooleanField()")
-            assertFieldType('field2b', "models.NullBooleanField()")
-        assertFieldType('field3', "models.CharField(max_length=10)")
-        # CommaSeparatedIntegerField
-        assertFieldType('field4', "models.CharField(max_length=99)")
-        assertFieldType('field5', "models.DateField()")
-        assertFieldType('field6', "models.DateTimeField()")
+            assertFieldType('bool_field', "models.BooleanField()")
+            assertFieldType('null_bool_field', "models.NullBooleanField()")
+        assertFieldType('char_field', "models.CharField(max_length=10)")
+        assertFieldType('comma_separated_int_field', "models.CharField(max_length=99)")
+        assertFieldType('date_field', "models.DateField()")
+        assertFieldType('date_time_field', "models.DateTimeField()")
         if connection.vendor == 'sqlite':
             # Ticket #5014
-            assertFieldType('field7', "models.DecimalField(max_digits=None, decimal_places=None)")
+            assertFieldType('decimal_field', "models.DecimalField(max_digits=None, decimal_places=None)")
         elif connection.vendor == 'mysql':
             pass # Ticket #5014
         else:
-            assertFieldType('field7', "models.DecimalField(max_digits=6, decimal_places=1)")
-        # EmailField
-        assertFieldType('field8', "models.CharField(max_length=75)")
-        # FileField
-        assertFieldType('field9', "models.CharField(max_length=100)")
-        # FilePathField
-        assertFieldType('field10', "models.CharField(max_length=100)")
-        assertFieldType('field11', "models.FloatField()")
-        assertFieldType('field12', "models.IntegerField()")
+            assertFieldType('decimal_field', "models.DecimalField(max_digits=6, decimal_places=1)")
+        assertFieldType('email_field', "models.CharField(max_length=75)")
+        assertFieldType('file_field', "models.CharField(max_length=100)")
+        assertFieldType('file_path_field', "models.CharField(max_length=100)")
+        assertFieldType('float_field', "models.FloatField()")
+        assertFieldType('int_field', "models.IntegerField()")
         if connection.vendor == 'postgresql':
             # Only PostgreSQL has a specific type
-            assertFieldType('field13', "models.GenericIPAddressField()")
-            assertFieldType('field14', "models.GenericIPAddressField()")
+            assertFieldType('ip_address_field', "models.GenericIPAddressField()")
+            assertFieldType('gen_ip_adress_field', "models.GenericIPAddressField()")
         else:
-            assertFieldType('field13', "models.CharField(max_length=15)")
-            assertFieldType('field14', "models.CharField(max_length=39)")
+            assertFieldType('ip_address_field', "models.CharField(max_length=15)")
+            assertFieldType('gen_ip_adress_field', "models.CharField(max_length=39)")
         if connection.vendor == 'sqlite':
-            assertFieldType('field16', "models.PositiveIntegerField()")
-            assertFieldType('field17', "models.PositiveSmallIntegerField()")
+            assertFieldType('pos_int_field', "models.PositiveIntegerField()")
+            assertFieldType('pos_small_int_field', "models.PositiveSmallIntegerField()")
         else:
             # 'unsigned' property undetected on other backends
-            assertFieldType('field16', "models.IntegerField()")
+            assertFieldType('pos_int_field', "models.IntegerField()")
             if connection.vendor == 'postgresql':
-                assertFieldType('field17', "models.SmallIntegerField()")
+                assertFieldType('pos_small_int_field', "models.SmallIntegerField()")
             else:
-                assertFieldType('field17', "models.IntegerField()")
-        # SlugField
-        assertFieldType('field18', "models.CharField(max_length=50)")
+                assertFieldType('pos_small_int_field', "models.IntegerField()")
+        assertFieldType('slug_field', "models.CharField(max_length=50)")
         if connection.vendor in ('sqlite', 'postgresql'):
-            assertFieldType('field19', "models.SmallIntegerField()")
+            assertFieldType('small_int_field', "models.SmallIntegerField()")
         else:
-            assertFieldType('field19', "models.IntegerField()")
-        assertFieldType('field20', "models.TextField()")
-        assertFieldType('field21', "models.TimeField()")
-        # URLField
-        assertFieldType('field22', "models.CharField(max_length=200)")
+            assertFieldType('small_int_field', "models.IntegerField()")
+        assertFieldType('text_field', "models.TextField()")
+        assertFieldType('time_field', "models.TimeField()")
+        assertFieldType('url_field', "models.CharField(max_length=200)")
 
     @skipUnlessDBFeature('can_introspect_foreign_keys')
     def test_attribute_name_not_python_keyword(self):