diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
index a44424385..a7de248f9 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
@@ -78,6 +78,7 @@ public class BaseUserInterfaceTest
     @After
     public void tearDown() throws Exception
     {
+        for (int i = 0; i < 10; i++) device.pressBack();
         TestButler.teardown(getTargetContext());
     }
 
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
index 7135af495..fc0a729d1 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
@@ -53,12 +53,14 @@ public class LinksTest extends BaseUserInterfaceTest
 //    }
 
     @Test
-    public void shouldLinkToHelp() throws Exception
-    {
+    public void shouldLinkToHelp() throws Exception {
         launchApp();
         clickMenu(HELP);
         verifyOpensWebsite("loophabits.org/faq.html");
+    }
 
+    @Test
+    public void shouldLinkToHelpFromSettings() throws Exception {
         launchApp();
         clickMenu(SETTINGS);
         clickText("Help & FAQ");
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
index 9c6325ba1..ab28be55b 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
@@ -139,13 +139,13 @@ public class CommonSteps extends BaseUserInterfaceTest
 
     public static void verifyOpensWebsite(String url) throws Exception
     {
+        String browser_pkg = "org.chromium.webview_shell";
         if(SDK_INT <= 23) {
-            assertTrue(device.wait(Until.hasObject(By.pkg("com.android.browser")), 5000));
-        } else {
-            assertTrue(device.wait(Until.hasObject(By.pkg("com.android.chrome")), 5000));
+            browser_pkg = "com.android.browser";
         }
+        assertTrue(device.wait(Until.hasObject(By.pkg(browser_pkg)), 5000));
         device.waitForIdle();
-        assertTrue(device.findObject(new UiSelector().text(url)).exists());
+        assertTrue(device.findObject(new UiSelector().textContains(url)).exists());
     }
 
     public enum Screen
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
index 9b44ac83a..3f3e4a107 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
@@ -32,7 +32,11 @@ public class WidgetSteps {
     }
 
     public static void clickText(String s) throws Exception {
-        device.findObject(new UiSelector().text(s)).click();
+        UiObject object = device.findObject(new UiSelector().text(s));
+        if (!object.waitForExists(1000)) {
+            object = device.findObject(new UiSelector().text(s.toUpperCase()));
+        }
+        object.click();
     }
 
     public static void dragCheckmarkWidgetToHomeScreen() throws Exception {
@@ -61,7 +65,11 @@ public class WidgetSteps {
             device.pressHome();
             device.waitForIdle();
             device.drag(w / 2, h / 2, w / 2, h / 2, 8);
-            device.findObject(new UiSelector().text("Widgets")).click();
+            UiObject button = device.findObject(new UiSelector().text("WIDGETS"));
+            if(!button.waitForExists(1000)) {
+                button = device.findObject(new UiSelector().text("Widgets"));
+            }
+            button.click();
             new UiScrollable(new UiSelector().resourceId(list_id))
                     .scrollIntoView(new UiSelector().text("Checkmark"));
         }