diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
index 743723cf6..f460ff2b0 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.endtoendtest;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
@@ -38,6 +39,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
+  @TargetApi(8)
   public CreateAndSendTrackTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
index f7e95256e..c35f6bb42 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.endtoendtest;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.widget.ListView;
@@ -34,6 +35,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
+  @TargetApi(8)
   public DeleteTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
index 2ec1e6833..69edd2640 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
@@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ -34,6 +35,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
+  @TargetApi(8)
   public ExportAndImportTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java
index c711afc7a..4429daefe 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.endtoendtest;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
@@ -32,6 +33,7 @@ public class GoToMyLocationTest extends ActivityInstrumentationTestCase2<TrackLi
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
+  @TargetApi(8)
   public GoToMyLocationTest() {
     super(TrackListActivity.class);
   }
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 4aa21ab35..fafb3b19b 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.endtoendtest;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ -31,6 +32,7 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
+  @TargetApi(8)
   public MenuItemsTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java
index 8fd79c71d..c65ee6a61 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java
@@ -17,6 +17,7 @@ package com.google.android.apps.mytracks.endtoendtest;
 
 import com.google.android.apps.mytracks.TrackListActivity;
 
+import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ -30,6 +31,7 @@ public class SaveToSdCardTest extends ActivityInstrumentationTestCase2<TrackList
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
+  @TargetApi(8)
   public SaveToSdCardTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
index a420ba78c..088b2aca8 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.ChartView;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.widget.CheckBox;
@@ -37,6 +38,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
+  @TargetApi(8)
   public SettingTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
index 8f6bd6425..b1f9711c3 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
@@ -20,6 +20,7 @@ import com.google.android.apps.mytracks.fragments.MapFragment;
 import com.google.android.maps.MapView;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
@@ -37,6 +38,7 @@ public class ViewsTest extends ActivityInstrumentationTestCase2<TrackListActivit
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
+  @TargetApi(8)
   public ViewsTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java
index 4a3af7f5a..66dc55b4d 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.backup;
 
+import android.annotation.TargetApi;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 
@@ -175,6 +176,7 @@ public class PreferenceBackupHelperTest extends TestCase {
     preferenceBackupHelper = new PreferenceBackupHelper();
   }
 
+  @TargetApi(9)
   public void testExportImportPreferences() throws Exception {
     // Populate with some initial values
     Editor editor = preferences.edit();
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java
index 9ebefcdbb..fd5c319dc 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java
@@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.content.DescriptionGenerator;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 
+import android.annotation.TargetApi;
 import android.location.Location;
 
 import java.util.List;
@@ -112,6 +113,7 @@ public class KmlTrackWriterTest extends TrackFormatWriterTest {
    * @param tag the parent tag
    * @param locations list of expected locations
    */
+  @TargetApi(8)
   private void assertTagHasPoints(Element tag, Location... locations) {
     List<Element> coordTags = getChildElements(tag, "gx:coord", locations.length);
     for (int i = 0; i < locations.length; i++) {
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java
index 8c6ba5d13..86be38e32 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.io.maps;
 import com.google.android.apps.mytracks.io.gdata.maps.MapsMapMetadata;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
 import android.test.AndroidTestCase;
 import android.widget.ArrayAdapter;
@@ -46,6 +47,7 @@ public class ChooseMapActivityTest extends AndroidTestCase {
    * 
    * @author youtaol
    */
+  @TargetApi(11)
   public class ChooseMapActivityMock extends ChooseMapActivity {
     /**
      * By overriding this method, avoids to start next activity.
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java
index 7ea9fb3d9..d06b1b23b 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.io.sendtogoogle;
 
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
@@ -49,6 +50,7 @@ public class UploadResultActivityTest extends
   /**
    * This method is necessary for ActivityInstrumentationTestCase2.
    */
+  @TargetApi(8)
   public UploadResultActivityTest() {
     super(UploadResultActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
index f185d1b67..d64cd82bd 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
@@ -27,6 +27,7 @@ import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -124,6 +125,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     super.shutdownService();
   }
 
+  @TargetApi(9)
   @Override
   protected void setUp() throws Exception {
     super.setUp();
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
index 26ce13bef..4614a8520 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
@@ -1,9 +1,11 @@
 package com.google.android.apps.mytracks.services.sensors;
 
-import java.util.Arrays;
-
 import com.google.android.apps.mytracks.content.Sensor;
 
+import android.annotation.TargetApi;
+
+import java.util.Arrays;
+
 import junit.framework.TestCase;
 
 public class PolarMessageParserTest extends TestCase {
@@ -16,6 +18,7 @@ public class PolarMessageParserTest extends TestCase {
      (byte) 0xF7, 0x02, (byte) 0xD1, 0x00, 0x11, 0x04};
   private byte[] buf;
   
+  @TargetApi(9)
   public void setUp() {
     buf = Arrays.copyOf(originalBuf, originalBuf.length);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java
index e1da6a22c..8fbe8b657 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java
@@ -4,6 +4,7 @@ import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.maps.mytracks.R;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.test.AndroidTestCase;
@@ -11,6 +12,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 public class SensorManagerFactoryTest extends AndroidTestCase {
 
+  @TargetApi(9)
   @Override
   protected void setUp() throws Exception {
     super.setUp();