diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 19461e2a0..bf9883123 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -170,26 +170,6 @@ class BasicModelSerializer(serializers.ModelSerializer):
         model = BasicModel
 
 
-# Models to test the serializers
-class AMOAFModel(RESTFrameworkModel):
-    char_field = models.CharField(max_length=1024, blank=True)
-    comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=1024, blank=True)
-    decimal_field = models.DecimalField(max_digits=64, decimal_places=32, blank=True)
-    email_field = models.EmailField(max_length=1024, blank=True)
-    file_field = models.FileField(upload_to='test', max_length=1024, blank=True)
-    image_field = models.ImageField(upload_to='test', max_length=1024, blank=True)
-    slug_field = models.SlugField(max_length=1024, blank=True)
-    url_field = models.URLField(max_length=1024, blank=True)
-
-class DVOAFModel(RESTFrameworkModel):
-    positive_integer_field = models.PositiveIntegerField(blank=True)
-    positive_small_integer_field = models.PositiveSmallIntegerField(blank=True)
-    email_field = models.EmailField(blank=True)
-    file_field = models.FileField(upload_to='test', blank=True)
-    image_field = models.ImageField(upload_to='test', blank=True)
-    slug_field = models.SlugField(blank=True)
-    url_field = models.URLField(blank=True)
-
 # Models to test filters
 class FilterableItem(models.Model):
     text = models.CharField(max_length=100)
diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index af9fa68e0..dbbb9a8f5 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -8,12 +8,32 @@ from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers, fields, relations
 from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
-    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, RESTFrameworkModel, AMOAFModel, DVOAFModel)
+    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, RESTFrameworkModel)
 from rest_framework.tests.models import BasicModelSerializer
 import datetime
 import pickle
 
 
+class AMOAFModel(RESTFrameworkModel):
+    char_field = models.CharField(max_length=1024, blank=True)
+    comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=1024, blank=True)
+    decimal_field = models.DecimalField(max_digits=64, decimal_places=32, blank=True)
+    email_field = models.EmailField(max_length=1024, blank=True)
+    file_field = models.FileField(upload_to='test', max_length=1024, blank=True)
+    image_field = models.ImageField(upload_to='test', max_length=1024, blank=True)
+    slug_field = models.SlugField(max_length=1024, blank=True)
+    url_field = models.URLField(max_length=1024, blank=True)
+
+class DVOAFModel(RESTFrameworkModel):
+    positive_integer_field = models.PositiveIntegerField(blank=True)
+    positive_small_integer_field = models.PositiveSmallIntegerField(blank=True)
+    email_field = models.EmailField(blank=True)
+    file_field = models.FileField(upload_to='test', blank=True)
+    image_field = models.ImageField(upload_to='test', blank=True)
+    slug_field = models.SlugField(blank=True)
+    url_field = models.URLField(blank=True)
+
+
 class SubComment(object):
     def __init__(self, sub_comment):
         self.sub_comment = sub_comment