diff --git a/test_driver/utils/common_actions.dart b/test_driver/utils/common_actions.dart
index d716440c4..45d47c59b 100644
--- a/test_driver/utils/common_actions.dart
+++ b/test_driver/utils/common_actions.dart
@@ -65,8 +65,9 @@ Future<void> logout(FlutterDriver driver, TestLocalization localization) async {
     await driver.tap(find.byTooltip(Keys.openAppDrawer));
   }
 
-  //await driver.scrollUntilVisible(find.byType('Drawer'), find.byValueKey(SettingsKeys.drawer));
+  //await driver.scrollUntilVisible(find.byType('Drawer'), find.text(localization.settings));
   await driver.tap(find.text(localization.settings));
+  await driver.tap(find.text(localization.deviceSettings));
 
   // Tap on Log Out
   await driver.tap(find.text(localization.logout));
@@ -76,7 +77,7 @@ Future<void> logout(FlutterDriver driver, TestLocalization localization) async {
   await driver.tap(find.text(localization.ok.toUpperCase()));
 
   // Should be in the login screen now
-  await driver.waitFor(find.text(localization.emailLogin.toUpperCase()));
+  await driver.waitFor(find.text(localization.login.toUpperCase()));
 }
 
 Future<void> viewSection({FlutterDriver driver, String name}) async {