diff --git a/tests/modeltests/choices/models.py b/tests/modeltests/choices/models.py
index e37826059879e..27316f5deae79 100644
--- a/tests/modeltests/choices/models.py
+++ b/tests/modeltests/choices/models.py
@@ -22,29 +22,3 @@ class Person(models.Model):
 
     def __unicode__(self):
         return self.name
-
-__test__ = {'API_TESTS':"""
->>> a = Person(name='Adrian', gender='M')
->>> a.save()
->>> s = Person(name='Sara', gender='F')
->>> s.save()
->>> a.gender
-'M'
->>> s.gender
-'F'
->>> a.get_gender_display()
-u'Male'
->>> s.get_gender_display()
-u'Female'
-
-# If the value for the field doesn't correspond to a valid choice,
-# the value itself is provided as a display value.
->>> a.gender = ''
->>> a.get_gender_display()
-u''
-
->>> a.gender = 'U'
->>> a.get_gender_display()
-u'U'
-
-"""}
diff --git a/tests/modeltests/choices/tests.py b/tests/modeltests/choices/tests.py
new file mode 100644
index 0000000000000..09023d81133c6
--- /dev/null
+++ b/tests/modeltests/choices/tests.py
@@ -0,0 +1,23 @@
+from django.test import TestCase
+
+from models import Person
+
+
+class ChoicesTests(TestCase):
+    def test_display(self):
+        a = Person.objects.create(name='Adrian', gender='M')
+        s = Person.objects.create(name='Sara', gender='F')
+        self.assertEqual(a.gender, 'M')
+        self.assertEqual(s.gender, 'F')
+        
+        self.assertEqual(a.get_gender_display(), 'Male')
+        self.assertEqual(s.get_gender_display(), 'Female')
+        
+        # If the value for the field doesn't correspond to a valid choice,
+        # the value itself is provided as a display value.
+        a.gender = ''
+        self.assertEqual(a.get_gender_display(), '')
+
+        a.gender = 'U'
+        self.assertEqual(a.get_gender_display(), 'U')
+