diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java
index fd9a10ff7b5..fd0fff7f9e5 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java
@@ -16,7 +16,6 @@
 
 import static org.junit.Assert.assertArrayEquals;
 
-import android.os.Build;
 import com.google.firebase.storage.internal.AdaptiveStreamBuffer;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -30,7 +29,7 @@
 
 /** Tests for {@link AdaptiveStreamBuffer}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Config.OLDEST_SDK)
 public class AdaptiveStreamBufferTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java
index 1c1ef9b56ce..97d1759d3d1 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java
@@ -14,7 +14,6 @@
 
 package com.google.firebase.storage;
 
-import android.os.Build;
 import com.google.android.gms.tasks.Task;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -29,7 +28,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Config.OLDEST_SDK)
 public class DependencyTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java
index c55a943f5c3..0847db6d878 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java
@@ -16,7 +16,6 @@
 
 import static com.google.firebase.common.testutil.Assert.assertThrows;
 
-import android.os.Build;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
@@ -38,7 +37,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Config.OLDEST_SDK)
 public class StorageReferenceTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);
diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java
index 196162d5a89..4a35ec47847 100644
--- a/firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java
+++ b/firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java
@@ -16,7 +16,6 @@
 
 import static com.google.firebase.common.testutil.Assert.assertThrows;
 
-import android.os.Build;
 import com.google.firebase.storage.StreamDownloadTask.StreamProgressWrapper;
 import com.google.firebase.storage.network.MockInputStreamHelper;
 import java.io.ByteArrayInputStream;
@@ -35,7 +34,7 @@
 
 /** Tests for {@link StreamProgressWrapper}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Config.OLDEST_SDK)
 @SuppressWarnings("ResultOfMethodCallIgnored")
 public class StreamProgressWrapperTest {