Used enterClassContext() where appropriate.

2 files changed, 15 insertions, 11 deletions

diff --git a/tests/auth_tests/test_auth_backends.py b/tests/auth_tests/test_auth_backends.py
index a7005de8a4..3b4f40e6e0 100644
--- a/tests/auth_tests/test_auth_backends.py
+++ b/tests/auth_tests/test_auth_backends.py
@@ -94,15 +94,17 @@ class BaseModelBackendTest:
 
     backend = "django.contrib.auth.backends.ModelBackend"
 
+    @classmethod
+    def setUpClass(cls):
+        cls.enterClassContext(
+            modify_settings(AUTHENTICATION_BACKENDS={"append": cls.backend})
+        )
+        super().setUpClass()
+
     def setUp(self):
         # The custom_perms test messes with ContentTypes, which will be cached.
         # Flush the cache to ensure there are no side effects.
         self.addCleanup(ContentType.objects.clear_cache)
-        patched_settings = modify_settings(
-            AUTHENTICATION_BACKENDS={"append": self.backend},
-        )
-        patched_settings.enable()
-        self.addCleanup(patched_settings.disable)
         self.create_users()
 
     def test_has_perm(self):
diff --git a/tests/auth_tests/test_remote_user.py b/tests/auth_tests/test_remote_user.py
index 6066ab96e9..d3cf4b9da5 100644
--- a/tests/auth_tests/test_remote_user.py
+++ b/tests/auth_tests/test_remote_user.py
@@ -20,13 +20,15 @@ class RemoteUserTest(TestCase):
     known_user = "knownuser"
     known_user2 = "knownuser2"
 
-    def setUp(self):
-        patched_settings = modify_settings(
-            AUTHENTICATION_BACKENDS={"append": self.backend},
-            MIDDLEWARE={"append": self.middleware},
+    @classmethod
+    def setUpClass(cls):
+        cls.enterClassContext(
+            modify_settings(
+                AUTHENTICATION_BACKENDS={"append": cls.backend},
+                MIDDLEWARE={"append": cls.middleware},
+            )
         )
-        patched_settings.enable()
-        self.addCleanup(patched_settings.disable)
+        super().setUpClass()
 
     def test_no_remote_user(self):
         """Users are not created when remote user is not specified."""