diff --git a/tinycontent/models.py b/tinycontent/models.py
index <HASH>..<HASH> 100644
--- a/tinycontent/models.py
+++ b/tinycontent/models.py
@@ -1,11 +1,13 @@
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 
+@python_2_unicode_compatible
 class TinyContent(models.Model):
     name = models.CharField(max_length=100, unique=True)
     content = models.TextField()
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
diff --git a/tinycontent/tests.py b/tinycontent/tests.py
index <HASH>..<HASH> 100644
--- a/tinycontent/tests.py
+++ b/tinycontent/tests.py
@@ -32,9 +32,9 @@ class TinyContentTestCase(unittest.TestCase):
         TinyContent.objects.get_or_create(name='html',
                                           content='<strong>&amp;</strong>')
 
-    def test_unicode(self):
+    def test_str(self):
         self.assertEqual("foobar",
-                         unicode(TinyContent.objects.get(name='foobar')))
+                         str(TinyContent.objects.get(name='foobar')))
 
     def test_non_existent(self):
         self.assertEqual("",
Hopefully make tinycontent work with Python 3

Tests still don't run with Python 3 - waiting on a fix to
django-setuptest:

<URL>