diff --git a/django/forms/models.py b/django/forms/models.py
index a0b217860d2..8e9c0de0e7d 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -584,7 +584,7 @@ class BaseModelFormSet(BaseFormSet):
         else:
             return ugettext("Please correct the duplicate data for %(field)s, "
                 "which must be unique.") % {
-                    "field": get_text_list(unique_check, _("and")),
+                    "field": get_text_list(unique_check, unicode(_("and"))),
                 }
 
     def get_date_error_message(self, date_check):
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py
index 0e28a9749fc..e67126e9a74 100644
--- a/tests/regressiontests/admin_scripts/tests.py
+++ b/tests/regressiontests/admin_scripts/tests.py
@@ -536,7 +536,7 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase):
         args = ['startapp','settings_test']
         out, err = self.run_django_admin(args,'settings')
         self.assertNoOutput(err)
-        self.assertTrue(os.path.exists(os.path.join(test_dir, 'settings_test')))
+        self.assert_(os.path.exists(os.path.join(test_dir, 'settings_test')))
         shutil.rmtree(os.path.join(test_dir, 'settings_test'))
 
     def test_builtin_command(self):
diff --git a/tests/regressiontests/file_storage/tests.py b/tests/regressiontests/file_storage/tests.py
index 6e2b7be8e76..c228764e066 100644
--- a/tests/regressiontests/file_storage/tests.py
+++ b/tests/regressiontests/file_storage/tests.py
@@ -161,9 +161,9 @@ class FileStoragePathParsing(TestCase):
         self.storage.save('dotted.path/test', ContentFile("1"))
         self.storage.save('dotted.path/test', ContentFile("2"))
 
-        self.assertFalse(os.path.exists(os.path.join(self.storage_dir, 'dotted_.path')))
-        self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test')))
-        self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test_')))
+        self.failIf(os.path.exists(os.path.join(self.storage_dir, 'dotted_.path')))
+        self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test')))
+        self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test_')))
 
     def test_first_character_dot(self):
         """
@@ -173,13 +173,13 @@ class FileStoragePathParsing(TestCase):
         self.storage.save('dotted.path/.test', ContentFile("1"))
         self.storage.save('dotted.path/.test', ContentFile("2"))
 
-        self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test')))
+        self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test')))
         # Before 2.6, a leading dot was treated as an extension, and so
         # underscore gets added to beginning instead of end.
         if sys.version_info < (2, 6):
-            self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/_.test')))
+            self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/_.test')))
         else:
-            self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test_')))
+            self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test_')))
 
 if Image is not None:
     class DimensionClosingBug(TestCase):