diff --git a/firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java b/firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java
index 6fa54fd6366..7ef3b3bcf29 100644
--- a/firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java
+++ b/firebase-common/src/test/java/com/google/firebase/DataCollectionPreNDefaultEnabledTest.java
@@ -27,7 +27,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(AndroidJUnit4.class)
-@Config(sdk = 21)
+@Config(sdk = Config.OLDEST_SDK)
 public class DataCollectionPreNDefaultEnabledTest {
 
   @Test
diff --git a/firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java b/firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java
index 86172a107ce..46c301927de 100644
--- a/firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java
+++ b/firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java
@@ -87,7 +87,7 @@ public void test_auto_atHighEnoughApiLevel() {
   }
 
   @Test
-  @Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+  @Config(sdk = Config.OLDEST_SDK)
   public void test_auto_atNotHighEnoughApiLevel() {
     ShadowPackageManager shadowPackageManager =
         shadowOf(ApplicationProvider.getApplicationContext().getPackageManager());
@@ -98,7 +98,7 @@ public void test_auto_atNotHighEnoughApiLevel() {
         app -> {
           UserAgentPublisher ua = app.get(UserAgentPublisher.class);
 
-          assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-platform/($|\\s)"));
+          assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-installer/($|\\s)"));
         });
   }