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 5993db73d..563140fbb 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
@@ -93,6 +93,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     int trackNumberOld = trackListView.get(0).getCount();
 
     EndToEndTestUtils.SOLO.clickOnView(trackListView.get(0).getChildAt(0));
+    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);
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 2798b4225..d458c9119 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
@@ -310,12 +310,12 @@ public class EndToEndTestUtils {
         activityMytracks.getString(R.string.welcome_title), 0, SHORT_WAIT_TIME)) {
       resetPreferredUnits();
     }
-    
+
     int trackNumber = SOLO.getCurrentListViews().get(0).getCount();
     if (trackNumber > 3) {
       deleteAllTracks();
     }
-    
+
     resetAllSettings(activityMyTracks, false);
     instrumentation.waitForIdleSync();
 
@@ -419,6 +419,8 @@ public class EndToEndTestUtils {
     if (isClick) {
       SOLO.scrollUp();
       SOLO.clickOnView(oneTrack);
+      EndToEndTestUtils.SOLO.waitForText(activityMytracks
+          .getString(R.string.track_detail_chart_tab));
     }
     return false;
   }
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
index ae0a6150a..ee994062d 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
@@ -111,6 +111,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     // Check the track name, activity and description.
     assertTrue(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.trackName));
     EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.trackName);
+    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.track_detail_chart_tab));
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_edit), true);
     instrumentation.waitForIdleSync();
     assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.trackName));
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
index 918dafa79..4c3067d6f 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -278,7 +278,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     // Now there should be 2 backups.
     instrumentation.waitForIdleSync();
     assertEquals(2, EndToEndTestUtils.SOLO.getCurrentListViews().get(0).getCount());
-    
+
     // Click the first one.
     EndToEndTestUtils.SOLO.clickOnView(EndToEndTestUtils.SOLO.getCurrentListViews().get(0)
         .getChildAt(0));
@@ -296,14 +296,14 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     instrumentation.waitForIdleSync();
-    
+
     // Click the second one.
     EndToEndTestUtils.SOLO.clickOnView(EndToEndTestUtils.SOLO.getCurrentListViews().get(0)
         .getChildAt(1));
     assertTrue(EndToEndTestUtils.SOLO.waitForText(
         activityMyTracks.getString(R.string.settings_backup_restore_success), 0,
         EndToEndTestUtils.SUPER_LONG_WAIT_TIME));
-    
+
     // For the older backup contains tracks and the newer backup is empty. The
     // search result of twice must be different.
     instrumentation.waitForIdleSync();
@@ -421,6 +421,8 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     } else {
       EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.value_none));
       instrumentation.waitForIdleSync();
+      EndToEndTestUtils.SOLO.waitForText(activityMyTracks
+          .getString(R.string.settings_google_drive_sync_title));
       assertFalse(EndToEndTestUtils.findTextView(
           activityMyTracks.getString(R.string.settings_google_drive_sync_title)).isEnabled());
       return;
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
index 90574f981..4883de905 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
@@ -87,12 +87,15 @@ public class ViewsTest extends ActivityInstrumentationTestCase2<TrackListActivit
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.createTrackIfEmpty(1, false);
     instrumentation.waitForIdleSync();
+    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.track_detail_chart_tab));
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_map_layer), true);
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.menu_terrain));
     instrumentation.waitForIdleSync();
+    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.track_detail_chart_tab));
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_map_layer), true);
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.menu_satellite));
     instrumentation.waitForIdleSync();
+    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.track_detail_chart_tab));
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_map_layer), true);
     // But in some languages only has one match(Such as French).
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.menu_map));