diff --git a/WooCommerce/UITestsFoundation/Screens/MyStore/MyStoreScreen.swift b/WooCommerce/UITestsFoundation/Screens/MyStore/MyStoreScreen.swift
index be567891f02..416dc7f4bd0 100644
--- a/WooCommerce/UITestsFoundation/Screens/MyStore/MyStoreScreen.swift
+++ b/WooCommerce/UITestsFoundation/Screens/MyStore/MyStoreScreen.swift
@@ -10,7 +10,8 @@ public final class MyStoreScreen: ScreenObject {
     public init(app: XCUIApplication = XCUIApplication()) throws {
         try super.init(
             expectedElementGetters: [ { $0.staticTexts["Your WooCommerce Store"] }],
-            app: app
+            app: app,
+            waitTimeout: 35
         )
     }
 
diff --git a/WooCommerce/UITestsFoundation/Screens/TabNavComponent.swift b/WooCommerce/UITestsFoundation/Screens/TabNavComponent.swift
index 833c156a0a3..bd7a175b731 100644
--- a/WooCommerce/UITestsFoundation/Screens/TabNavComponent.swift
+++ b/WooCommerce/UITestsFoundation/Screens/TabNavComponent.swift
@@ -31,7 +31,8 @@ public final class TabNavComponent: ScreenObject {
                 ordersTabButtonGetter,
                 productsTabButtonGetter
             ],
-            app: app
+            app: app,
+            waitTimeout: 35
         )
     }
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index cbc721ef70a..49d8347c2a7 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1275,7 +1275,8 @@ lane :test_without_building do |options|
     workspace: WORKSPACE_PATH,
     scheme: TEST_SCHEME,
     device: options[:device],
-    reset_simulator: true,
+    ensure_devices_found: true,
+    force_quit_simulator: true,
     parallel_testing: parallel_testing_value,
     concurrent_workers: CONCURRENT_SIMULATORS,
     max_concurrent_simulators: CONCURRENT_SIMULATORS,