diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationChannelRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationChannelRoboTest.java
index 9d921d24210..d5089505954 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationChannelRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationChannelRoboTest.java
@@ -72,7 +72,7 @@ public void setup() throws Exception {
   }
 
   @Test
-  @Config(minSdk = 23, maxSdk = 25) // getActiveNotifications() not available <23
+  @Config(minSdk = Config.OLDEST_SDK, maxSdk = 25) // getActiveNotifications() not available <23
   public void channelIgnored_belowApi26TargetSdk25() throws Exception {
     setTargetSdkVersion(25);
     createDisplayNotification(context, createNotificationMessage(), executor).handleNotification();
@@ -83,7 +83,7 @@ public void channelIgnored_belowApi26TargetSdk25() throws Exception {
   }
 
   @Test
-  @Config(minSdk = 23, maxSdk = 25) // getActiveNotifications() not available <23
+  @Config(minSdk = Config.OLDEST_SDK, maxSdk = 25) // getActiveNotifications() not available <23
   public void channelIgnored_belowApi26TargetSdk26() throws Exception {
     setTargetSdkVersion(26);
     createDisplayNotification(context, createNotificationMessage(), executor).handleNotification();
diff --git a/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java b/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java
index de61071d0e0..0f4eed1a5dd 100644
--- a/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java
+++ b/firebase-messaging/src/test/java/com/google/firebase/messaging/DisplayNotificationRoboTest.java
@@ -475,7 +475,7 @@ public void testClickActionAndLink() {
 
   /** Test that a valid notification with color is displayed. */
   @Test
-  @Config(sdk = Build.VERSION_CODES.M)
+  @Config(sdk = Config.OLDEST_SDK)
   public void testColor() {
     final String color = "#123456";
     Bundle data = new Bundle();
@@ -489,7 +489,7 @@ public void testColor() {
   }
 
   @Test
-  @Config(sdk = Build.VERSION_CODES.M)
+  @Config(sdk = Config.OLDEST_SDK)
   public void testNoColor() {
     Bundle data = new Bundle();
     data.putString(KEY_TITLE, "title 123");
@@ -503,7 +503,7 @@ public void testNoColor() {
 
   /** Test that the user can choose the default color via AndroidManifest metadata. */
   @Test
-  @Config(sdk = Build.VERSION_CODES.M)
+  @Config(sdk = Config.OLDEST_SDK)
   public void testColorFromMetadata() {
     Bundle metadata = new Bundle();
     metadata.putInt(