diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/others/SensorTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/others/SensorTest.java
index 3a9952450..edf6188ab 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/others/SensorTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/others/SensorTest.java
@@ -130,6 +130,9 @@ public class SensorTest extends ActivityInstrumentationTestCase2<TrackListActivi
   
   @Override
   protected void tearDown() throws Exception {
+    if (!testSensor) {
+      return;
+    }
     EndToEndTestUtils.SOLO.finishOpenedActivities();
     super.tearDown();
   }