3 files changed, 24 insertions, 33 deletions
diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
index cd0f53c4f2..019301d5e2 100644
--- a/tests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -163,28 +163,27 @@ class VerboseNameField(models.Model):
     field1 = models.BigIntegerField("verbose field1")
     field2 = models.BooleanField("verbose field2", default=False)
     field3 = models.CharField("verbose field3", max_length=10)
-    field4 = models.CommaSeparatedIntegerField("verbose field4", max_length=99)
-    field5 = models.DateField("verbose field5")
-    field6 = models.DateTimeField("verbose field6")
-    field7 = models.DecimalField("verbose field7", max_digits=6, decimal_places=1)
-    field8 = models.EmailField("verbose field8")
-    field9 = models.FileField("verbose field9", upload_to="unused")
-    field10 = models.FilePathField("verbose field10")
-    field11 = models.FloatField("verbose field11")
+    field4 = models.DateField("verbose field4")
+    field5 = models.DateTimeField("verbose field5")
+    field6 = models.DecimalField("verbose field6", max_digits=6, decimal_places=1)
+    field7 = models.EmailField("verbose field7")
+    field8 = models.FileField("verbose field8", upload_to="unused")
+    field9 = models.FilePathField("verbose field9")
+    field10 = models.FloatField("verbose field10")
     # Don't want to depend on Pillow in this test
     # field_image = models.ImageField("verbose field")
-    field12 = models.IntegerField("verbose field12")
-    field13 = models.GenericIPAddressField("verbose field13", protocol="ipv4")
-    field14 = models.NullBooleanField("verbose field14")
-    field15 = models.PositiveIntegerField("verbose field15")
-    field16 = models.PositiveSmallIntegerField("verbose field16")
-    field17 = models.SlugField("verbose field17")
-    field18 = models.SmallIntegerField("verbose field18")
-    field19 = models.TextField("verbose field19")
-    field20 = models.TimeField("verbose field20")
-    field21 = models.URLField("verbose field21")
-    field22 = models.UUIDField("verbose field22")
-    field23 = models.DurationField("verbose field23")
+    field11 = models.IntegerField("verbose field11")
+    field12 = models.GenericIPAddressField("verbose field12", protocol="ipv4")
+    field13 = models.NullBooleanField("verbose field13")
+    field14 = models.PositiveIntegerField("verbose field14")
+    field15 = models.PositiveSmallIntegerField("verbose field15")
+    field16 = models.SlugField("verbose field16")
+    field17 = models.SmallIntegerField("verbose field17")
+    field18 = models.TextField("verbose field18")
+    field19 = models.TimeField("verbose field19")
+    field20 = models.URLField("verbose field20")
+    field21 = models.UUIDField("verbose field21")
+    field22 = models.DurationField("verbose field22")
 
 
 class GenericIPAddress(models.Model):
@@ -322,7 +321,6 @@ class AllFieldsModel(models.Model):
     binary = models.BinaryField()
     boolean = models.BooleanField(default=False)
     char = models.CharField(max_length=10)
-    csv = models.CommaSeparatedIntegerField(max_length=10)
     date = models.DateField()
     datetime = models.DateTimeField()
     decimal = models.DecimalField(decimal_places=2, max_digits=2)
diff --git a/tests/model_fields/test_promises.py b/tests/model_fields/test_promises.py
index c1b476e75e..65d1b7ec99 100644
--- a/tests/model_fields/test_promises.py
+++ b/tests/model_fields/test_promises.py
@@ -6,11 +6,10 @@ from decimal import Decimal
 
 from django.db.models.fields import (
     AutoField, BigIntegerField, BinaryField, BooleanField, CharField,
-    CommaSeparatedIntegerField, DateField, DateTimeField, DecimalField,
-    EmailField, FilePathField, FloatField, GenericIPAddressField, IntegerField,
-    IPAddressField, NullBooleanField, PositiveIntegerField,
-    PositiveSmallIntegerField, SlugField, SmallIntegerField, TextField,
-    TimeField, URLField,
+    DateField, DateTimeField, DecimalField, EmailField, FilePathField,
+    FloatField, GenericIPAddressField, IntegerField, IPAddressField,
+    NullBooleanField, PositiveIntegerField, PositiveSmallIntegerField,
+    SlugField, SmallIntegerField, TextField, TimeField, URLField,
 )
 from django.db.models.fields.files import FileField, ImageField
 from django.test import SimpleTestCase
@@ -43,12 +42,6 @@ class PromiseTest(SimpleTestCase):
         lazy_func = lazy(lambda: 0, int)
         self.assertIsInstance(CharField().get_prep_value(lazy_func()), six.text_type)
 
-    def test_CommaSeparatedIntegerField(self):
-        lazy_func = lazy(lambda: '1,2', six.text_type)
-        self.assertIsInstance(CommaSeparatedIntegerField().get_prep_value(lazy_func()), six.text_type)
-        lazy_func = lazy(lambda: 0, int)
-        self.assertIsInstance(CommaSeparatedIntegerField().get_prep_value(lazy_func()), six.text_type)
-
     def test_DateField(self):
         lazy_func = lazy(lambda: datetime.date.today(), datetime.date)
         self.assertIsInstance(DateField().get_prep_value(lazy_func()), datetime.date)
diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
index 5869196335..76b3e5596a 100644
--- a/tests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -42,7 +42,7 @@ class BasicFieldTests(TestCase):
 
     def test_field_verbose_name(self):
         m = VerboseNameField
-        for i in range(1, 24):
+        for i in range(1, 23):
             self.assertEqual(m._meta.get_field('field%d' % i).verbose_name, 'verbose field%d' % i)
 
         self.assertEqual(m._meta.get_field('id').verbose_name, 'verbose pk')