diff --git a/tests/modeltests/str/models.py b/tests/modeltests/str/models.py
index 644c6025ab..84b8d67d12 100644
--- a/tests/modeltests/str/models.py
+++ b/tests/modeltests/str/models.py
@@ -30,23 +30,4 @@ class InternationalArticle(models.Model):
     pub_date = models.DateTimeField()
 
     def __unicode__(self):
-        return self.headline
-
-__test__ = {'API_TESTS':ur"""
-# Create an Article.
->>> from datetime import datetime
->>> a = Article(headline='Area man programs in Python', pub_date=datetime(2005, 7, 28))
->>> a.save()
-
->>> str(a)
-'Area man programs in Python'
-
->>> a
-<Article: Area man programs in Python>
-
->>> a1 = InternationalArticle(headline=u'Girl wins €12.500 in lottery', pub_date=datetime(2005, 7, 28))
-
-# The default str() output will be the UTF-8 encoded output of __unicode__().
->>> str(a1)
-'Girl wins \xe2\x82\xac12.500 in lottery'
-"""}
+        return self.headline
\ No newline at end of file
diff --git a/tests/modeltests/str/tests.py b/tests/modeltests/str/tests.py
new file mode 100644
index 0000000000..4e4c76501f
--- /dev/null
+++ b/tests/modeltests/str/tests.py
@@ -0,0 +1,23 @@
+ # -*- coding: utf-8 -*-
+import datetime
+
+from django.test import TestCase
+
+from models import Article, InternationalArticle
+
+class SimpleTests(TestCase):
+    def test_basic(self):
+        a = Article.objects.create(
+            headline='Area man programs in Python',
+            pub_date=datetime.datetime(2005, 7, 28)
+        )
+        self.assertEqual(str(a), 'Area man programs in Python')
+        self.assertEqual(repr(a), '<Article: Area man programs in Python>')
+
+    def test_international(self):
+        a = InternationalArticle.objects.create(
+            headline=u'Girl wins €12.500 in lottery',
+            pub_date=datetime.datetime(2005, 7, 28)
+        )
+        # The default str() output will be the UTF-8 encoded output of __unicode__().
+        self.assertEqual(str(a), 'Girl wins \xe2\x82\xac12.500 in lottery')
\ No newline at end of file