diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java
index 0ee5d452585..d1d479804db 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java
@@ -43,7 +43,7 @@
 import org.robolectric.junit.rules.ExpectedLogMessagesRule;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = 22, qualifiers = "es")
+@Config(manifest = Config.NONE, sdk = Config.OLDEST_SDK, qualifiers = "es")
 public class AnalyticsEventsManagerTest {
 
   @Rule public final ExpectedLogMessagesRule logged = new ExpectedLogMessagesRule();
diff --git a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java
index bac8d1cecc3..2d2b7fa4456 100644
--- a/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java
+++ b/firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java
@@ -49,10 +49,11 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = 22, qualifiers = "es")
+@Config(manifest = Config.NONE, sdk = Config.OLDEST_SDK, qualifiers = "es")
 public class ApiClientTest {
 
   public static final String TIME_ZONE = "Europe/London";
@@ -210,7 +211,8 @@ public void getFiams_signalsContainsPlatformVersion() {
         fetchEligibleCampaignsRequestArgcaptor.getValue().getClientSignals();
 
     // sdk version set in roboelectric annotation above
-    assertThat(clientSignals.getPlatformVersion()).isEqualTo("22");
+    assertThat(clientSignals.getPlatformVersion())
+        .isEqualTo(String.valueOf(RuntimeEnvironment.getApiLevel()));
   }
 
   @Test