diff --git a/WordPress/UITests/Tests/MainNavigationTests.swift b/WordPress/UITests/Tests/MainNavigationTests.swift
index d977c5008fe3..19599719b70f 100644
--- a/WordPress/UITests/Tests/MainNavigationTests.swift
+++ b/WordPress/UITests/Tests/MainNavigationTests.swift
@@ -10,8 +10,6 @@ class MainNavigationTests: XCTestCase {
             email: WPUITestCredentials.testWPcomUserEmail,
             password: WPUITestCredentials.testWPcomPassword
         )
-        try TabNavComponent()
-            .goToMySiteScreen()
             .goToMenu()
     }
 
diff --git a/WordPress/UITests/Tests/ReaderTests.swift b/WordPress/UITests/Tests/ReaderTests.swift
index 90c3f49ebc62..ec473b968b27 100644
--- a/WordPress/UITests/Tests/ReaderTests.swift
+++ b/WordPress/UITests/Tests/ReaderTests.swift
@@ -10,9 +10,8 @@ class ReaderTests: XCTestCase {
             email: WPUITestCredentials.testWPcomUserEmail,
             password: WPUITestCredentials.testWPcomPassword
         )
-        try EditorFlow
-            .goToMySiteScreen()
-            .tabBar.goToReaderScreen()
+        try TabNavComponent()
+            .goToReaderScreen()
     }
 
     override func tearDownWithError() throws {
diff --git a/WordPress/UITests/Tests/StatsTests.swift b/WordPress/UITests/Tests/StatsTests.swift
index a32400f56f31..f8ad000ca70c 100644
--- a/WordPress/UITests/Tests/StatsTests.swift
+++ b/WordPress/UITests/Tests/StatsTests.swift
@@ -9,7 +9,6 @@ class StatsTests: XCTestCase {
             email: WPUITestCredentials.testWPcomUserEmail,
             password: WPUITestCredentials.testWPcomPassword
         )
-        try MySiteScreen()
             .goToMenu()
             .goToStatsScreen()
             .switchTo(mode: .insights)
diff --git a/WordPress/UITestsFoundation/Screens/Login/LoginEpilogueScreen.swift b/WordPress/UITestsFoundation/Screens/Login/LoginEpilogueScreen.swift
index 92d52d0f4d38..22d968df281b 100644
--- a/WordPress/UITestsFoundation/Screens/Login/LoginEpilogueScreen.swift
+++ b/WordPress/UITestsFoundation/Screens/Login/LoginEpilogueScreen.swift
@@ -65,29 +65,35 @@ public class LoginEpilogueScreen: ScreenObject {
     }
 
     private func dismissQuickStartPromptIfNeeded() throws {
-        try XCTContext.runActivity(named: "Dismiss quick start prompt if needed.") { _ in
-            guard QuickStartPromptScreen.isLoaded() else { return }
-
+        XCTContext.runActivity(named: "Dismiss quick start prompt if needed.") { _ in
             Logger.log(message: "Dismising quick start prompt...", event: .i)
-            _ = try QuickStartPromptScreen().selectNoThanks()
+            do {
+                _ = try QuickStartPromptScreen().selectNoThanks()
+            } catch {
+                return
+            }
         }
     }
 
     private func dismissOnboardingQuestionsPromptIfNeeded() throws {
-        try XCTContext.runActivity(named: "Dismiss onboarding questions prompt if needed.") { _ in
-            guard OnboardingQuestionsPromptScreen.isLoaded() else { return }
-
+        XCTContext.runActivity(named: "Dismiss onboarding questions prompt if needed.") { _ in
             Logger.log(message: "Dismissing onboarding questions prompt...", event: .i)
-            _ = try OnboardingQuestionsPromptScreen().selectSkip()
+            do {
+                _ = try OnboardingQuestionsPromptScreen().selectSkip()
+            } catch {
+                return
+            }
         }
     }
 
     private func dismissFeatureIntroductionIfNeeded() throws {
-        try XCTContext.runActivity(named: "Dismiss feature introduction screen if needed.") { _ in
-            guard FeatureIntroductionScreen.isLoaded() else { return }
-
+        XCTContext.runActivity(named: "Dismiss feature introduction screen if needed.") { _ in
             Logger.log(message: "Dismissing feature introduction screen...", event: .i)
-            _ = try FeatureIntroductionScreen().dismiss()
+            do {
+                _ = try FeatureIntroductionScreen().dismiss()
+            } catch {
+                return
+            }
         }
     }
 }
diff --git a/WordPress/UITestsFoundation/Screens/Login/Unified/PasswordScreen.swift b/WordPress/UITestsFoundation/Screens/Login/Unified/PasswordScreen.swift
index acfb9af7c8d1..e844e70bdb9e 100644
--- a/WordPress/UITestsFoundation/Screens/Login/Unified/PasswordScreen.swift
+++ b/WordPress/UITestsFoundation/Screens/Login/Unified/PasswordScreen.swift
@@ -29,8 +29,6 @@ public class PasswordScreen: ScreenObject {
     public func proceedWithValidPassword() throws -> LoginEpilogueScreen {
         try tryProceed(password: "pw")
 
-        app.dismissSavePasswordPrompt()
-
         return try LoginEpilogueScreen()
     }