diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
index cf5a0de76..8ac41b14c 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
@@ -62,7 +62,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.rotateAllActivities();
     EndToEndTestUtils
-        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
+        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
     instrumentation.waitForIdleSync();
     assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
         .getString(R.string.track_list_empty_message)));
@@ -101,7 +101,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.track_detail_chart_tab));
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete), true);
     EndToEndTestUtils
-        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
+        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
     instrumentation.waitForIdleSync();
     trackListView = EndToEndTestUtils.SOLO.getCurrentListViews();
     int trackNumberNew = trackListView.get(0).getCount();
@@ -118,7 +118,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete), true);
     EndToEndTestUtils
-        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
+        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.checkNotRecording();
   }
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index acef283c4..6ee5eb373 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -322,16 +322,6 @@ public class EndToEndTestUtils {
     }
   }
 
-  /**
-   * Checks if need reset preferred units.
-   */
-  private static void resetPreferredUnits() {
-    getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
-    SOLO.waitForText(activityMytracks.getString(R.string.settings_stats_units_title));
-    getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
-    instrumentation.waitForIdleSync();
-  }
-
   /**
    * Rotates the given activity.
    * 
@@ -524,7 +514,7 @@ public class EndToEndTestUtils {
   public static void deleteAllTracks() {
     if (!isTrackListEmpty(false)) {
       findMenuItem(activityMytracks.getString(R.string.menu_delete_all), true);
-      getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
+      getButtonOnScreen(activityMytracks.getString(R.string.generic_yes), true, true);
     }
   }