diff --git a/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift b/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift
index 947abcf5..75c1066e 100644
--- a/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift
+++ b/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift
@@ -89,7 +89,7 @@ final class SettingsVC: UIViewController {
         self.view.addSubview(disconnectButton)
         self.view.addSubview(logoutButton)
         self.view.addSubview(tableView)
-        
+        tableView.accessibilityIdentifier = "settingsTableView"
         headerTitle.snp.makeConstraints {
             $0.top.equalTo(self.view.safeAreaLayoutGuide)
             $0.leading.equalToSuperview().offset(Constants.horizontalOffset)
diff --git a/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift b/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
index 2570f664..dff7195c 100644
--- a/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
+++ b/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
@@ -72,28 +72,28 @@ struct UITestSettingsScreen: UITestScreen {
     // MARK: - Private functions
     private func getRouteOptionCell() -> XCUIElement {
         app.activate()
-        let cell = app.cells[Identifiers.routeOptionCell]
+        let cell = app.tables["settingsTableView"].cells[Identifiers.routeOptionCell]
         XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
         return cell
     }
     
     private func getAWSCloudCell() -> XCUIElement {
         app.activate()
-        let cell = app.cells[Identifiers.awsCloudCell]
+        let cell = app.tables["settingsTableView"].cells[Identifiers.awsCloudCell]
         XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
         return cell
     }
     
     private func getDataProviderCell() -> XCUIElement {
         app.activate()
-        let cell = app.cells[Identifiers.dataProviderCell]
+        let cell = app.tables["settingsTableView"].cells[Identifiers.dataProviderCell]
         XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
         return cell
     }
     
     private func getMapStyleCell() -> XCUIElement {
         app.activate()
-        let cell = app.cells[Identifiers.mapStyleCell]
+        let cell = app.tables["settingsTableView"].cells[Identifiers.mapStyleCell]
         XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
         return cell
     }