diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
index 81f62b6e3da..f2409ed919b 100644
--- a/tests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -202,7 +202,7 @@ class ForeignKeyTests(test.TestCase):
         self.assertIsInstance(rel_name, six.text_type)
 
 
-class DateTimeFieldTests(unittest.TestCase):
+class DateTimeFieldTests(test.TestCase):
     def test_datetimefield_to_python_usecs(self):
         """DateTimeField.to_python should support usecs"""
         f = models.DateTimeField()
@@ -232,7 +232,7 @@ class DateTimeFieldTests(unittest.TestCase):
         self.assertEqual(obj.t, tim)
 
 
-class BooleanFieldTests(unittest.TestCase):
+class BooleanFieldTests(test.TestCase):
     def _test_get_db_prep_lookup(self, f):
         self.assertEqual(f.get_db_prep_lookup('exact', True, connection=connection), [True])
         self.assertEqual(f.get_db_prep_lookup('exact', '1', connection=connection), [True])
@@ -371,8 +371,9 @@ class BooleanFieldTests(unittest.TestCase):
             self.assertFalse(boolean_field.has_default())
             b = BooleanModel()
             self.assertIsNone(b.bfield)
-            with self.assertRaises(IntegrityError):
-                b.save()
+            with transaction.atomic():
+                with self.assertRaises(IntegrityError):
+                    b.save()
         finally:
             boolean_field.default = old_default