diff --git a/UnitTests/Sources/AnalyticsSettingsScreenViewModelTests.swift b/UnitTests/Sources/AnalyticsSettingsScreenViewModelTests.swift
index 64174b8a3..283f4deac 100644
--- a/UnitTests/Sources/AnalyticsSettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/AnalyticsSettingsScreenViewModelTests.swift
@@ -25,7 +25,7 @@ class AnalyticsSettingsScreenViewModelTests: XCTestCase {
     private var context: AnalyticsSettingsScreenViewModelType.Context!
     
     override func tearDown() {
-        appSettings.analyticsConsentState = .unknown
+        AppSettings.reset()
     }
     
     @MainActor override func setUpWithError() throws {
diff --git a/UnitTests/Sources/AnalyticsTests.swift b/UnitTests/Sources/AnalyticsTests.swift
index f9cfbdb0d..94044e9d0 100644
--- a/UnitTests/Sources/AnalyticsTests.swift
+++ b/UnitTests/Sources/AnalyticsTests.swift
@@ -37,6 +37,10 @@ class AnalyticsTests: XCTestCase {
                                                                    bugReportService: ServiceLocator.shared.bugReportService))
     }
     
+    override func tearDown() {
+        AppSettings.reset()
+    }
+    
     func testAnalyticsPromptNewUser() {
         // Given a fresh install of the app (without PostHog analytics having been set).
         // When the user is prompted for analytics.
diff --git a/UnitTests/Sources/ComposerToolbarViewModelTests.swift b/UnitTests/Sources/ComposerToolbarViewModelTests.swift
index bd6c98260..d20005031 100644
--- a/UnitTests/Sources/ComposerToolbarViewModelTests.swift
+++ b/UnitTests/Sources/ComposerToolbarViewModelTests.swift
@@ -41,6 +41,10 @@ class ComposerToolbarViewModelTests: XCTestCase {
                                              appSettings: appSettings,
                                              mentionDisplayHelper: ComposerMentionDisplayHelper.mock)
     }
+    
+    override func tearDown() {
+        AppSettings.reset()
+    }
 
     func testComposerFocus() {
         viewModel.process(roomAction: .setMode(mode: .edit(originalItemId: TimelineItemIdentifier(timelineID: "mock"))))