diff --git a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan
index a9279832..a82f9d01 100644
--- a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan
+++ b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan
@@ -29,37 +29,16 @@
         "GeofenceUITests\/testDeleteGeofence()",
         "GeofenceUITests\/testEditGeofence()",
         "LocationServicesUITests",
-        "MapUITests",
-        "MapUITests\/testLocateMeButton()",
         "MapUITests\/testMapAppearance()",
         "MapUITests\/testMapMaxZoomIn()",
         "MapUITests\/testMapMaxZoomOut()",
-        "MapUITests\/testMapStyleChanges()",
-        "MapUITests\/testMapZoomIn()",
         "MapUITests\/testMapZoomInByTap()",
-        "MapUITests\/testMapZoomOut()",
-        "NavigationUITests",
-        "NavigationUITests\/testMapAdjustedForRoute()",
-        "NavigationUITests\/testMapInteractionAndStyleAndNavigation()",
-        "NavigationUITests\/testMyLocationOption()",
-        "NavigationUITests\/testNavigation()",
         "NavigationUITests\/testRouteFerriesOption()",
         "NavigationUITests\/testRouteTollsOption()",
-        "NavigationUITests\/testRouteTypes()",
-        "NavigationUITests\/testSwapRoute()",
-        "SearchUITests",
-        "SearchUITests\/testSearch()",
-        "SearchUITests\/testSearchBoxPosition()",
-        "SearchUITests\/testSearchByCategory()",
-        "SearchUITests\/testSearchByGeocodeLocation()",
-        "SettingsUITests\/testDataSourceChanges()",
-        "SettingsUITests\/testMapStyleChanges()",
-        "SettingsUITests\/testRouteOptions()",
         "SettingsUITests\/testTrackerOptions()",
         "TrackingUITests\/testStartTracking()",
         "TrackingUITests\/testStartTrackingHistoryStarted()",
         "TrackingUITests\/testStopTracking()",
-        "TrackingUITests\/testTrackingGeofenceE2E()",
         "TrackingUITests\/testTrackingNotifyEnteredGeofence()"
       ],
       "target" : {
diff --git a/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift b/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
index aa6f3620..462af335 100644
--- a/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
+++ b/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
@@ -73,7 +73,7 @@ struct UITestSettingsScreen: UITestScreen {
     private func getRouteOptionCell() -> XCUIElement {
         app.activate()
         let cell = app.cells[Identifiers.routeOptionCell]
-        XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
+        XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.regular.time))
         return cell
     }
     
diff --git a/LocationServices/LocationServicesUITests/SettingsUITests.swift b/LocationServices/LocationServicesUITests/SettingsUITests.swift
index 89ad0b20..f6d5db19 100644
--- a/LocationServices/LocationServicesUITests/SettingsUITests.swift
+++ b/LocationServices/LocationServicesUITests/SettingsUITests.swift
@@ -32,14 +32,7 @@ final class SettingsUITests: LocationServicesUITests {
             .waitRouteOptionsRow()
             .waittDataProviderRow()
     }
-    
-    func testTrackerOptions() throws {
-        let app = startApp(allowPermissions: true)
-        let _ = UITestTabBarScreen(app: app)
-            .tapGeofenceButton()
-            .waitForAWSConnectionScreen()
-    }
-    
+
     func testRouteOptions() throws {
         let app = startApp(allowPermissions: true)
         var routeOptionsScreen = UITestTabBarScreen(app: app)