diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/BigTestUtils.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/BigTestUtils.java
index 15a57c970..c614b418a 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/BigTestUtils.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/BigTestUtils.java
@@ -136,15 +136,21 @@ public class BigTestUtils {
   }
 
   /**
-   * Unlocks the device screen.
+   * Unlocks and wake up the device.
    */
-  public static void unlockDevice() {
+  public static void unlockAndWakeupDevice() {
     // The menu item of setting should be found if the screen is not locked.
     try {
-      Window wind = EndToEndTestUtils.SOLO.getCurrentActivity().getWindow();
-      wind.addFlags(LayoutParams.FLAG_DISMISS_KEYGUARD);
-      wind.addFlags(LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-      wind.addFlags(LayoutParams.FLAG_TURN_SCREEN_ON);
+      EndToEndTestUtils.SOLO.getCurrentActivity().runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          Window wind = EndToEndTestUtils.SOLO.getCurrentActivity().getWindow();
+          wind.addFlags(LayoutParams.FLAG_DISMISS_KEYGUARD);
+          wind.addFlags(LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+          wind.addFlags(LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+      });
+
     } catch (Exception e) {
       Log.i(EndToEndTestUtils.LOG_TAG,
           "Meet error when unlock device screen, may the device is not locked.");
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/ResourceUsageTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/ResourceUsageTest.java
index 5506112f3..763357506 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/ResourceUsageTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/others/ResourceUsageTest.java
@@ -63,7 +63,7 @@ public class ResourceUsageTest extends ActivityInstrumentationTestCase2<TrackLis
     context = trackListActivity.getApplicationContext();
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.setupForDebug(instrumentation, trackListActivity);
-    BigTestUtils.unlockDevice();
+    BigTestUtils.unlockAndWakeupDevice();
     if (!isUserConfirmed) {
       confirmTest();
     }
@@ -158,7 +158,7 @@ public class ResourceUsageTest extends ActivityInstrumentationTestCase2<TrackLis
       EndToEndTestUtils.SOLO.clickOnText(trackListActivity.getString(tabNameId));
     }
     BigTestUtils.moniterTest(context, INTERVALE_TO_CHECK, TEST_DURATION_IN_MILLISECONDS);
-    BigTestUtils.unlockDevice();
+    BigTestUtils.unlockAndWakeupDevice();
     EndToEndTestUtils.stopRecording(true);
   }