diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index b3962cca5..68c2c0521 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -206,7 +206,7 @@ public class EndToEndTestUtils {
    * Accepts terms and configures units.
    */
   static void verifyFirstLaunch() {
-    SOLO.clickOnText(activityMytracks.getString(R.string.eula_accept));
+    getButtonOnScreen(activityMytracks.getString(R.string.eula_accept), true, true);
     if (SOLO.waitForText(activityMytracks.getString(R.string.generic_ok))) {
       // Click for welcome.
       getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);