diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index bb8d026..4f18743 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -23,7 +23,7 @@ class Article(models.Model):
     """
     A simple article to test admin views. Test backwards compatibility.
     """
-    title = models.CharField(max_length=100)
+    title = models.CharField(max_length=255)
     content = models.TextField()
     date = models.DateTimeField()
     section = models.ForeignKey(Section, null=True, blank=True)
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index b6e7b9e..07b569c 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -1064,6 +1064,31 @@ class AdminViewPermissionsTest(TestCase):
         self.assertContains(response, 'id="login-form"')
 
 
+    def testLongUnicodeLogEntry(self):
+        # Add an article
+        add_dict = {'title' : ''.join([u'ä' for x in range(255)]),
+                    'content': '<p>great article</p>',
+                    'date_0': '2008-03-18', 'date_1': '10:54:39',
+                    'section': 1}
+        self.client.post('/test_admin/admin/', self.adduser_login)
+        post = self.client.post('/test_admin/admin/admin_views/article/add/', add_dict)
+        self.assertRedirects(post, '/test_admin/admin/')
+        article = Article.objects.order_by('-id')[0]
+        self.assertEqual(LogEntry.objects.all().count(), 1)
+        logentry = LogEntry.objects.order_by('-id')[0]
+        self.assertEqual(logentry.object_repr, ''.join([u'ä' for x in range(200)]))
+        self.client.get('/test_admin/admin/logout/')
+
+        # Delete the article
+        delete_dict = {'post': 'yes'}
+        self.client.post('/test_admin/admin/', self.deleteuser_login)
+        post = self.client.post('/test_admin/admin/admin_views/article/%s/delete/' % article.id, delete_dict)
+        self.assertRedirects(post, '/test_admin/admin/')
+        self.assertEqual(LogEntry.objects.all().count(), 2)
+        logentry = LogEntry.objects.order_by('-id')[0]
+        self.assertEqual(logentry.object_repr, ''.join([u'ä' for x in range(200)]))
+        self.client.get('/test_admin/admin/logout/')
+
 class AdminViewDeletedObjectsTest(TestCase):
     urls = "regressiontests.admin_views.urls"
     fixtures = ['admin-views-users.xml', 'deleted-objects.xml']