diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 3465268b6..486ec7613 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from rest_framework import serializers
 
 
 def foobar():
@@ -160,3 +161,9 @@ class NullableOneToOneSource(RESTFrameworkModel):
     name = models.CharField(max_length=100)
     target = models.OneToOneField(OneToOneTarget, null=True, blank=True,
                                   related_name='nullable_source')
+
+# Serializer used to test BasicModel
+class BasicModelSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = BasicModel
+
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index fc433a8f2..343b958a8 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -5,6 +5,7 @@ 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)
+from rest_framework.tests.models import BasicModelSerializer
 import datetime
 import pickle
 
@@ -1148,11 +1149,7 @@ class DeserializeListTestCase(TestCase):
 # Test for issue #467
 class FieldLabelTest(TestCase):
     def setUp(self):
-        class LabelModelSerializer(serializers.ModelSerializer):
-            class Meta:
-                model = BasicModel
-
-        self.serializer_class = LabelModelSerializer
+        self.serializer_class = BasicModelSerializer
 
     def test_label_from_model(self):
         """