diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/MultiAccountsSyncTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/MultiAccountsSyncTest.java
index a7ce28187..e99b1a1fa 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/MultiAccountsSyncTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/MultiAccountsSyncTest.java
@@ -46,7 +46,10 @@ public class MultiAccountsSyncTest extends ActivityInstrumentationTestCase2<Trac
     super.setUp();
     instrumentation = getInstrumentation();
     trackListActivity = getActivity();
-    drive = SyncTestUtils.setUpForSyncTest(instrumentation, trackListActivity);
+    SyncTestUtils.setUpForSyncTest(instrumentation, trackListActivity);
+    SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_1);
+    drive = SyncTestUtils
+        .getGoogleDrive(EndToEndTestUtils.activityMytracks.getApplicationContext());
   }
 
   /**
@@ -116,8 +119,8 @@ public class MultiAccountsSyncTest extends ActivityInstrumentationTestCase2<Trac
     EndToEndTestUtils.createSimpleTrack(0, true);
 
     // Delete one track.
-    EndToEndTestUtils.SOLO.clickOnView(EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0)
-        .getChildAt(0));
+    EndToEndTestUtils.SOLO.clickOnView(EndToEndTestUtils.SOLO.getCurrentViews(ListView.class)
+        .get(0).getChildAt(0));
     EndToEndTestUtils.instrumentation.waitForIdleSync();
     EndToEndTestUtils.SOLO.clickOnMenuItem(EndToEndTestUtils.activityMytracks
         .getString(R.string.menu_delete));
@@ -126,8 +129,8 @@ public class MultiAccountsSyncTest extends ActivityInstrumentationTestCase2<Trac
 
     // Switch account and delete another track.
     SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_2);
-    EndToEndTestUtils.SOLO.clickOnView(EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0)
-        .getChildAt(0));
+    EndToEndTestUtils.SOLO.clickOnView(EndToEndTestUtils.SOLO.getCurrentViews(ListView.class)
+        .get(0).getChildAt(0));
     EndToEndTestUtils.SOLO.clickOnMenuItem(EndToEndTestUtils.activityMytracks
         .getString(R.string.menu_delete));
     EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.activityMytracks
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncDriveWithMyTracksTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncDriveWithMyTracksTest.java
index 65a741525..e8f26588a 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncDriveWithMyTracksTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncDriveWithMyTracksTest.java
@@ -17,6 +17,7 @@ package com.google.android.apps.mytracks.endtoendtest.sync;
 
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.apps.mytracks.endtoendtest.EndToEndTestUtils;
+import com.google.android.apps.mytracks.endtoendtest.GoogleUtils;
 import com.google.android.apps.mytracks.endtoendtest.RunConfiguration;
 import com.google.android.maps.mytracks.R;
 import com.google.api.services.drive.Drive;
@@ -48,7 +49,10 @@ public class SyncDriveWithMyTracksTest extends ActivityInstrumentationTestCase2<
     super.setUp();
     instrumentation = getInstrumentation();
     trackListActivity = getActivity();
-    drive = SyncTestUtils.setUpForSyncTest(instrumentation, trackListActivity);
+    SyncTestUtils.setUpForSyncTest(instrumentation, trackListActivity);
+    SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_1);
+    drive = SyncTestUtils
+        .getGoogleDrive(EndToEndTestUtils.activityMytracks.getApplicationContext());
   }
 
   /**
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncMyTracksWithDriveTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncMyTracksWithDriveTest.java
index e32499d48..2cddc495d 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncMyTracksWithDriveTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncMyTracksWithDriveTest.java
@@ -17,6 +17,7 @@ package com.google.android.apps.mytracks.endtoendtest.sync;
 
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.apps.mytracks.endtoendtest.EndToEndTestUtils;
+import com.google.android.apps.mytracks.endtoendtest.GoogleUtils;
 import com.google.android.apps.mytracks.endtoendtest.RunConfiguration;
 import com.google.android.apps.mytracks.io.sync.SyncUtils;
 import com.google.android.maps.mytracks.R;
@@ -48,7 +49,10 @@ public class SyncMyTracksWithDriveTest extends ActivityInstrumentationTestCase2<
     super.setUp();
     instrumentation = getInstrumentation();
     trackListActivity = getActivity();
-    drive = SyncTestUtils.setUpForSyncTest(instrumentation, trackListActivity);
+    SyncTestUtils.setUpForSyncTest(instrumentation, trackListActivity);
+    SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_1);
+    drive = SyncTestUtils
+        .getGoogleDrive(EndToEndTestUtils.activityMytracks.getApplicationContext());
   }
 
   /**
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncTestUtils.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncTestUtils.java
index ab9847bfc..d03c31f87 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncTestUtils.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncTestUtils.java
@@ -55,7 +55,7 @@ public class SyncTestUtils {
 
   public static boolean isCheckedRunSyncTest = false;
   public static final String KML_FILE_POSTFIX = ".kml";
-  public static final long MAX_TIME_TO_WAIT_SYNC = 1000000;
+  public static final long MAX_TIME_TO_WAIT_SYNC = 100000;
 
   /**
    * Sets up sync tests.
@@ -73,15 +73,16 @@ public class SyncTestUtils {
       isCheckedRunSyncTest = true;
     }
     if (RunConfiguration.getInstance().runSyncTest) {
-      EndToEndTestUtils.deleteAllTracks();
       SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_1);
       Drive drive1 = SyncTestUtils.getGoogleDrive(EndToEndTestUtils.activityMytracks
           .getApplicationContext());
       removeKMLFiles(drive1);
+      EndToEndTestUtils.deleteAllTracks();
       SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_2);
       Drive drive2 = SyncTestUtils.getGoogleDrive(EndToEndTestUtils.activityMytracks
           .getApplicationContext());
       removeKMLFiles(drive2);
+      EndToEndTestUtils.deleteAllTracks();
       return drive2;
     }
     return null;
@@ -187,8 +188,7 @@ public class SyncTestUtils {
       EndToEndTestUtils.SOLO.clickOnText(accountName);
       EndToEndTestUtils.instrumentation.waitForIdleSync();
       if (EndToEndTestUtils.SOLO.waitForText(
-          EndToEndTestUtils.activityMytracks.getString(
-              R.string.generic_confirm_title), 1,
+          EndToEndTestUtils.activityMytracks.getString(R.string.generic_confirm_title), 1,
           EndToEndTestUtils.SHORT_WAIT_TIME)) {
         EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.activityMytracks
             .getString(R.string.generic_yes));
@@ -205,12 +205,16 @@ public class SyncTestUtils {
       EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.activityMytracks
           .getString(R.string.menu_sync_drive));
 
-      EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.activityMytracks.getString(
-          R.string.sync_drive_confirm_message).split("%")[0], 1, EndToEndTestUtils.SHORT_WAIT_TIME);
+      EndToEndTestUtils.SOLO.waitForText(
+          EndToEndTestUtils.activityMytracks.getString(R.string.sync_drive_confirm_message).split(
+              "%")[0], 1, EndToEndTestUtils.SHORT_WAIT_TIME);
       Assert.assertTrue(EndToEndTestUtils.SOLO.searchText(accountName, true));
       EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.activityMytracks
           .getString(R.string.generic_yes));
     }
+
+    // Add this sleep to work around a exception after switch account.
+    EndToEndTestUtils.sleep(15000);
     EndToEndTestUtils.SOLO.goBack();
     EndToEndTestUtils.SOLO.goBack();
     EndToEndTestUtils.instrumentation.waitForIdleSync();
@@ -223,23 +227,26 @@ public class SyncTestUtils {
    * @throws IOException
    */
   public static void checkFilesNumber(Drive drive) throws IOException {
+    EndToEndTestUtils.instrumentation.waitForIdleSync();
     long startTime = System.currentTimeMillis();
+    int trackNumber = EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0).getCount();
+    List<File> files = getDriveFiles(EndToEndTestUtils.activityMytracks.getApplicationContext(),
+        drive);
     while (System.currentTimeMillis() - startTime < MAX_TIME_TO_WAIT_SYNC) {
       try {
-        EndToEndTestUtils.sleep(EndToEndTestUtils.SHORT_WAIT_TIME);
-        EndToEndTestUtils.findMenuItem(
-            EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
-        int trackNumber = EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0).getCount();
-        List<File> files = getDriveFiles(
-            EndToEndTestUtils.activityMytracks.getApplicationContext(), drive);
         if (files.size() == trackNumber) {
           return;
         }
+        trackNumber = EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0).getCount();
+        files = getDriveFiles(EndToEndTestUtils.activityMytracks.getApplicationContext(), drive);
+        EndToEndTestUtils.sleep(EndToEndTestUtils.SHORT_WAIT_TIME);
+        EndToEndTestUtils.findMenuItem(
+            EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
       } catch (GoogleJsonResponseException e) {
         Log.i(EndToEndTestUtils.LOG_TAG, e.getMessage());
       }
     }
-    Assert.fail();
+    Assert.assertEquals(files.size(), trackNumber);
   }
 
   /**
@@ -249,13 +256,15 @@ public class SyncTestUtils {
    */
   public static void checkTracksNumber(int number) {
     long startTime = System.currentTimeMillis();
+    int trackNumber = EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0).getCount();
     while (System.currentTimeMillis() - startTime < MAX_TIME_TO_WAIT_SYNC) {
-      int trackNumber = EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0).getCount();
       if (trackNumber == number) {
         return;
       }
+      trackNumber = EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0).getCount();
+      Log.i(EndToEndTestUtils.LOG_TAG, trackNumber + ":" + number);
     }
-    Assert.fail();
+    Assert.assertEquals(trackNumber, number);
   }
 
   /**