diff --git a/tests/modeltests/m2m_and_m2o/models.py b/tests/modeltests/m2m_and_m2o/models.py
index 0ab7a72d57..0fea1a2e7b 100644
--- a/tests/modeltests/m2m_and_m2o/models.py
+++ b/tests/modeltests/m2m_and_m2o/models.py
@@ -19,47 +19,3 @@ class Issue(models.Model):
 
     class Meta:
         ordering = ('num',)
-
-
-__test__ = {'API_TESTS':"""
->>> Issue.objects.all()
-[]
->>> r = User(username='russell')
->>> r.save()
->>> g = User(username='gustav')
->>> g.save()
-
->>> i = Issue(num=1)
->>> i.client = r
->>> i.save()
-
->>> i2 = Issue(num=2)
->>> i2.client = r
->>> i2.save()
->>> i2.cc.add(r)
-
->>> i3 = Issue(num=3)
->>> i3.client = g
->>> i3.save()
->>> i3.cc.add(r)
-
->>> from django.db.models.query import Q
-
->>> Issue.objects.filter(client=r.id)
-[<Issue: 1>, <Issue: 2>]
->>> Issue.objects.filter(client=g.id)
-[<Issue: 3>]
->>> Issue.objects.filter(cc__id__exact=g.id)
-[]
->>> Issue.objects.filter(cc__id__exact=r.id)
-[<Issue: 2>, <Issue: 3>]
-
-# These queries combine results from the m2m and the m2o relationships.
-# They're three ways of saying the same thing.
->>> Issue.objects.filter(Q(cc__id__exact=r.id) | Q(client=r.id))
-[<Issue: 1>, <Issue: 2>, <Issue: 3>]
->>> Issue.objects.filter(cc__id__exact=r.id) | Issue.objects.filter(client=r.id)
-[<Issue: 1>, <Issue: 2>, <Issue: 3>]
->>> Issue.objects.filter(Q(client=r.id) | Q(cc__id__exact=r.id))
-[<Issue: 1>, <Issue: 2>, <Issue: 3>]
-"""}
diff --git a/tests/modeltests/m2m_and_m2o/tests.py b/tests/modeltests/m2m_and_m2o/tests.py
new file mode 100644
index 0000000000..113f2a2a48
--- /dev/null
+++ b/tests/modeltests/m2m_and_m2o/tests.py
@@ -0,0 +1,75 @@
+from django.db.models import Q
+from django.test import TestCase
+
+from models import Issue, User
+
+
+class RelatedObjectTests(TestCase):
+    def test_m2m_and_m2o(self):
+        r = User.objects.create(username="russell")
+        g = User.objects.create(username="gustav")
+        
+        i1 = Issue(num=1)
+        i1.client = r
+        i1.save()
+        
+        i2 = Issue(num=2)
+        i2.client = r
+        i2.save()
+        i2.cc.add(r)
+        
+        i3 = Issue(num=3)
+        i3.client = g
+        i3.save()
+        i3.cc.add(r)
+        
+        self.assertQuerysetEqual(
+            Issue.objects.filter(client=r.id), [
+                1,
+                2,
+            ],
+            lambda i: i.num
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(client=g.id), [
+                3,
+            ],
+            lambda i: i.num
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(cc__id__exact=g.id), []
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(cc__id__exact=r.id), [
+                2,
+                3,
+            ],
+            lambda i: i.num
+        )
+        
+        # These queries combine results from the m2m and the m2o relationships.
+        # They're three ways of saying the same thing.
+        self.assertQuerysetEqual(
+            Issue.objects.filter(Q(cc__id__exact = r.id) | Q(client=r.id)), [
+                1,
+                2,
+                3,
+            ],
+            lambda i: i.num
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(cc__id__exact=r.id) | Issue.objects.filter(client=r.id), [
+                1,
+                2,
+                3,
+            ],
+            lambda i: i.num
+        )
+        self.assertQuerysetEqual(
+            Issue.objects.filter(Q(client=r.id) | Q(cc__id__exact=r.id)), [
+                1,
+                2,
+                3,
+            ],
+            lambda i: i.num
+        )