diff --git a/tests/modeltests/field_subclassing/fields.py b/tests/modeltests/field_subclassing/fields.py
index d545b1968d..a43714dcf5 100644
--- a/tests/modeltests/field_subclassing/fields.py
+++ b/tests/modeltests/field_subclassing/fields.py
@@ -41,14 +41,14 @@ class SmallField(models.Field):
     def get_db_prep_save(self, value):
         return unicode(value)
 
-    def get_db_prep_lookup(self, lookup_type, value):
+    def get_prep_lookup(self, lookup_type, value):
         if lookup_type == 'exact':
             return force_unicode(value)
         if lookup_type == 'in':
             return [force_unicode(v) for v in value]
         if lookup_type == 'isnull':
             return []
-        raise FieldError('Invalid lookup type: %r' % lookup_type)
+        raise TypeError('Invalid lookup type: %r' % lookup_type)
 
 
 class JSONField(models.TextField):
diff --git a/tests/modeltests/field_subclassing/models.py b/tests/modeltests/field_subclassing/models.py
index 93b30c2ec2..a9fe88fe77 100644
--- a/tests/modeltests/field_subclassing/models.py
+++ b/tests/modeltests/field_subclassing/models.py
@@ -51,7 +51,7 @@ True
 >>> MyModel.objects.filter(data__lt=s)
 Traceback (most recent call last):
 ...
-FieldError: Invalid lookup type: 'lt'
+TypeError: Invalid lookup type: 'lt'
 
 # Serialization works, too.
 >>> stream = serializers.serialize("json", MyModel.objects.all())