diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py
index a202185..e39f618 100644
--- a/tests/modeltests/model_forms/models.py
+++ b/tests/modeltests/model_forms/models.py
@@ -110,7 +110,9 @@ class ImageFile(models.Model):
         # for PyPy, you need to check for the underlying modules
         # If PIL is not available, this test is equivalent to TextFile above.
         from PIL import Image, _imaging
-        image = models.ImageField(storage=temp_storage, upload_to=custom_upload_path)
+        image = models.ImageField(storage=temp_storage, upload_to=custom_upload_path, width_field="width", height_field="height")
+        width = models.IntegerField(editable=False)
+        height = models.IntegerField(editable=False)
     except ImportError:
         image = models.FileField(storage=temp_storage, upload_to=custom_upload_path)
     path = models.CharField(max_length=16, blank=True, default='')
@@ -1062,10 +1064,24 @@ True
 True
 >>> type(f.cleaned_data['image'])
 <class 'django.core.files.uploadedfile.SimpleUploadedFile'>
+
+# FAIL:
+# Will fail because ImageFile.width is null=False. Works
+# if ImageFile.width is null=True
 >>> instance = f.save()
 >>> instance.image
 <...FieldFile: tests/test.png>
 
+# Verify that the width_field was set properly
+>>> instance.width
+16
+
+# Verify that the width was committed to the database
+# (Works if ImageFile.width is null=True)
+>>> im = ImageFile.objects.get(pk=instance.pk)
+>>> im.width
+16
+
 # Delete the current file since this is not done by Django.
 >>> instance.image.delete()