diff --git a/tests/modeltests/model_forms/tests.py b/tests/modeltests/model_forms/tests.py
index b67c160052..0831035a55 100644
--- a/tests/modeltests/model_forms/tests.py
+++ b/tests/modeltests/model_forms/tests.py
@@ -14,11 +14,19 @@ from django.utils.unittest import skipUnless
 from modeltests.model_forms.models import (Article, ArticleStatus,
     BetterWriter, BigInt, Book, Category, CommaSeparatedInteger,
     CustomFieldForExclusionModel, DerivedBook, DerivedPost, ExplicitPK,
-    FlexibleDatePost, ImageFile, ImprovedArticle,
-    ImprovedArticleWithParentLink, Inventory, OptionalImageFile, PhoneNumber,
-    Post, Price, Product, TextFile, Writer, WriterProfile,
-    test_images)
+    FlexibleDatePost, ImprovedArticle, ImprovedArticleWithParentLink,
+    Inventory, PhoneNumber, Post, Price, Product, TextFile, Writer,
+    WriterProfile, test_images)
 
+if test_images:
+    from modeltests.model_forms.models import ImageFile, OptionalImageFile
+    class ImageFileForm(forms.ModelForm):
+        class Meta:
+            model = ImageFile
+
+    class OptionalImageFileForm(forms.ModelForm):
+        class Meta:
+            model = OptionalImageFile
 
 class ProductForm(forms.ModelForm):
     class Meta:
@@ -149,14 +157,6 @@ class BigIntForm(forms.ModelForm):
     class Meta:
         model = BigInt
 
-class ImageFileForm(forms.ModelForm):
-    class Meta:
-        model = ImageFile
-
-class OptionalImageFileForm(forms.ModelForm):
-    class Meta:
-        model = OptionalImageFile
-
 class ModelFormWithMedia(forms.ModelForm):
     class Media:
         js = ('/some/form/javascript',)