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 f12db3fd1..4efe388f7 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -626,7 +626,7 @@ public class EndToEndTestUtils {
     } else {
       // Non-ICS phone.
       SOLO.sendKey(KeyEvent.KEYCODE_MENU);
-      if (SOLO.getText(menuName) != null) {
+      if (SOLO.searchText(menuName, 1, true)) {
         findResult = true;
       } else if (SOLO.searchText(MENU_MORE, 1, true)) {
         SOLO.clickOnText(MENU_MORE);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
index 2af6d5041..ad13ba386 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
@@ -184,6 +184,27 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
     assertTrue(EndToEndTestUtils.SOLO.searchText(activityMyTracks.getString(R.string.menu_voice_frequency), 1, true, true));
     assertTrue(EndToEndTestUtils.SOLO.searchText(activityMyTracks.getString(R.string.menu_split_frequency), 1, true, true));
   }
+  
+  /**
+   * Tests starting and stopping GPS.
+   */
+  public void testGPSMenu() {
+    boolean GPSStatus = EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_stop_gps), false);
+    
+    // Following starting/stopping or stopping/starting GPS.
+    EndToEndTestUtils.findMenuItem(GPSStatus ? activityMyTracks.getString(R.string.menu_stop_gps)
+        : activityMyTracks.getString(R.string.menu_start_gps), true);
+    GPSStatus = !GPSStatus;
+    assertEquals(GPSStatus, EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_stop_gps), false));
+    
+    EndToEndTestUtils.findMenuItem(GPSStatus ? activityMyTracks.getString(R.string.menu_stop_gps)
+        : activityMyTracks.getString(R.string.menu_start_gps), true);
+    GPSStatus = !GPSStatus;
+    assertEquals(GPSStatus, EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_stop_gps), false));
+  }
 
   @Override
   protected void tearDown() throws Exception {