diff --git a/authentik/enterprise/providers/google_workspace/tests/test_groups.py b/authentik/enterprise/providers/google_workspace/tests/test_groups.py
index f828324205..badc10f9b8 100644
--- a/authentik/enterprise/providers/google_workspace/tests/test_groups.py
+++ b/authentik/enterprise/providers/google_workspace/tests/test_groups.py
@@ -4,6 +4,7 @@ from unittest.mock import MagicMock, patch
 
 from django.test import TestCase
 
+from authentik.admin.utils import get_system_settings
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import Application, Group, User
 from authentik.core.tests.utils import create_test_user
@@ -18,7 +19,6 @@ from authentik.events.models import Event, EventAction
 from authentik.lib.generators import generate_id
 from authentik.lib.sync.outgoing.models import OutgoingSyncDeleteAction
 from authentik.lib.tests.utils import load_fixture
-from authentik.tenants.models import Tenant
 
 domains_list_v1_mock = load_fixture("fixtures/domains_list_v1.json")
 
@@ -30,7 +30,9 @@ class GoogleWorkspaceGroupTests(TestCase):
     def setUp(self) -> None:
         # Delete all groups and groups as the mocked HTTP responses only return one ID
         # which will cause errors with multiple groups
-        Tenant.objects.update(avatars="none")
+        settings = get_system_settings()
+        settings.avatars = "none"
+        settings.save()
         User.objects.all().exclude_anonymous().delete()
         Group.objects.all().delete()
         self.provider: GoogleWorkspaceProvider = GoogleWorkspaceProvider.objects.create(
diff --git a/authentik/enterprise/providers/google_workspace/tests/test_users.py b/authentik/enterprise/providers/google_workspace/tests/test_users.py
index db6824b6e4..517987267a 100644
--- a/authentik/enterprise/providers/google_workspace/tests/test_users.py
+++ b/authentik/enterprise/providers/google_workspace/tests/test_users.py
@@ -5,6 +5,7 @@ from unittest.mock import MagicMock, patch
 
 from django.test import TestCase
 
+from authentik.admin.utils import get_system_settings
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import Application, Group, User
 from authentik.enterprise.providers.google_workspace.clients.test_http import MockHTTP
@@ -18,7 +19,6 @@ from authentik.events.models import Event, EventAction
 from authentik.lib.generators import generate_id
 from authentik.lib.sync.outgoing.models import OutgoingSyncDeleteAction
 from authentik.lib.tests.utils import load_fixture
-from authentik.tenants.models import Tenant
 
 domains_list_v1_mock = load_fixture("fixtures/domains_list_v1.json")
 
@@ -30,7 +30,9 @@ class GoogleWorkspaceUserTests(TestCase):
     def setUp(self) -> None:
         # Delete all users and groups as the mocked HTTP responses only return one ID
         # which will cause errors with multiple users
-        Tenant.objects.update(avatars="none")
+        settings = get_system_settings()
+        settings.avatars = "none"
+        settings.save()
         User.objects.all().exclude_anonymous().delete()
         Group.objects.all().delete()
         self.provider: GoogleWorkspaceProvider = GoogleWorkspaceProvider.objects.create(
diff --git a/authentik/enterprise/providers/scim/tests/test_auth.py b/authentik/enterprise/providers/scim/tests/test_auth.py
index 1ea0687fb2..d90821b7e2 100644
--- a/authentik/enterprise/providers/scim/tests/test_auth.py
+++ b/authentik/enterprise/providers/scim/tests/test_auth.py
@@ -3,12 +3,12 @@
 from requests_mock import Mocker
 from rest_framework.test import APITestCase
 
+from authentik.admin.utils import get_system_settings
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import Application, Group, User
 from authentik.lib.generators import generate_id
 from authentik.providers.scim.models import SCIMAuthenticationMode, SCIMMapping, SCIMProvider
 from authentik.sources.oauth.models import OAuthSource
-from authentik.tenants.models import Tenant
 
 
 class TestSCIMOAuthAuth(APITestCase):
@@ -18,7 +18,9 @@ class TestSCIMOAuthAuth(APITestCase):
     def setUp(self) -> None:
         # Delete all users and groups as the mocked HTTP responses only return one ID
         # which will cause errors with multiple users
-        Tenant.objects.update(avatars="none")
+        settings = get_system_settings()
+        settings.avatars = "none"
+        settings.save()
         User.objects.all().exclude_anonymous().delete()
         Group.objects.all().delete()
         self.source = OAuthSource.objects.create(
diff --git a/authentik/enterprise/providers/scim/tests/test_token.py b/authentik/enterprise/providers/scim/tests/test_token.py
index 190b60dc69..b9b3253f32 100644
--- a/authentik/enterprise/providers/scim/tests/test_token.py
+++ b/authentik/enterprise/providers/scim/tests/test_token.py
@@ -9,12 +9,12 @@ from django.utils.timezone import now
 from requests_mock import Mocker
 from rest_framework.test import APITestCase
 
+from authentik.admin.utils import get_system_settings
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import Application, Group, User
 from authentik.lib.generators import generate_id
 from authentik.providers.scim.models import SCIMAuthenticationMode, SCIMMapping, SCIMProvider
 from authentik.sources.oauth.models import OAuthSource, UserOAuthSourceConnection
-from authentik.tenants.models import Tenant
 from tests.live import create_test_admin_user
 
 
@@ -25,7 +25,9 @@ class TestSCIMOAuthToken(APITestCase):
     def setUp(self) -> None:
         # Delete all users and groups as the mocked HTTP responses only return one ID
         # which will cause errors with multiple users
-        Tenant.objects.update(avatars="none")
+        settings = get_system_settings()
+        settings.avatars = "none"
+        settings.save()
         User.objects.all().exclude_anonymous().delete()
         Group.objects.all().delete()
         self.source = OAuthSource.objects.create(
diff --git a/authentik/root/tests/test_ws_client.py b/authentik/root/tests/test_ws_client.py
index 04b49e46b1..7043ec33e3 100644
--- a/authentik/root/tests/test_ws_client.py
+++ b/authentik/root/tests/test_ws_client.py
@@ -6,6 +6,7 @@ from channels.testing import WebsocketCommunicator
 from django.http import HttpRequest
 from django.test import TransactionTestCase
 
+from authentik.admin.utils import get_system_settings
 from authentik.core.tests.utils import create_test_user
 from authentik.events.models import (
     Event,
@@ -19,15 +20,13 @@ from authentik.lib.generators import generate_id
 from authentik.root import websocket
 from authentik.stages.password import BACKEND_INBUILT
 from authentik.stages.user_login.stage import COOKIE_NAME_KNOWN_DEVICE
-from authentik.tenants.utils import get_current_tenant
 
 
 class TestClientWS(TransactionTestCase):
-
     def setUp(self):
-        tenant = get_current_tenant()
-        tenant.flags[RefreshOtherFlowsAfterAuthentication().key] = True
-        tenant.save()
+        settings = get_system_settings()
+        settings.flags[RefreshOtherFlowsAfterAuthentication().key] = True
+        settings.save()
         self.user = create_test_user()
 
     async def _alogin_cookie(self, user, **kwargs):