diff --git a/library/test/src/test/java/com/bumptech/glide/GlideContextTest.java b/library/test/src/test/java/com/bumptech/glide/GlideContextTest.java
index 00e137a960..5ffcf5d951 100644
--- a/library/test/src/test/java/com/bumptech/glide/GlideContextTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/GlideContextTest.java
@@ -9,6 +9,7 @@
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Glide.RequestOptionsFactory;
 import com.bumptech.glide.load.engine.Engine;
 import com.bumptech.glide.load.engine.bitmap_recycle.LruArrayPool;
@@ -24,7 +25,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public final class GlideContextTest {
@@ -33,7 +33,7 @@ public final class GlideContextTest {
 
   @Before
   public void setUp() {
-    Application app = RuntimeEnvironment.application;
+    Application app = ApplicationProvider.getApplicationContext();
 
     transitionOptions = new HashMap<>();
     context =
diff --git a/library/test/src/test/java/com/bumptech/glide/GlideTest.java b/library/test/src/test/java/com/bumptech/glide/GlideTest.java
index 8c23af6611..0fb1085c28 100644
--- a/library/test/src/test/java/com/bumptech/glide/GlideTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/GlideTest.java
@@ -34,6 +34,7 @@
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.Options;
@@ -80,7 +81,6 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
@@ -127,7 +127,7 @@ public class GlideTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    context = RuntimeEnvironment.application;
+    context = ApplicationProvider.getApplicationContext();
 
     // Run all tasks on the main thread so they complete synchronously.
     GlideExecutor executor = MockGlideExecutor.newMainThreadExecutor();
diff --git a/library/test/src/test/java/com/bumptech/glide/RequestBuilderTest.java b/library/test/src/test/java/com/bumptech/glide/RequestBuilderTest.java
index 6fdb84ba0f..f8dfb9d9a9 100644
--- a/library/test/src/test/java/com/bumptech/glide/RequestBuilderTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/RequestBuilderTest.java
@@ -12,6 +12,7 @@
 
 import android.app.Application;
 import android.widget.ImageView;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.resource.SimpleResource;
 import com.bumptech.glide.request.Request;
@@ -31,7 +32,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @SuppressWarnings("unchecked")
@@ -52,8 +52,8 @@ public class RequestBuilderTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    glide = Glide.get(RuntimeEnvironment.application);
-    context = RuntimeEnvironment.application;
+    glide = Glide.get(ApplicationProvider.getApplicationContext());
+    context = ApplicationProvider.getApplicationContext();
   }
 
   @Test(expected = NullPointerException.class)
@@ -102,7 +102,7 @@ public void testThrowsIfGivenNullView() {
 
   @Test(expected = RuntimeException.class)
   public void testThrowsIfIntoViewCalledOnBackgroundThread() throws InterruptedException {
-    final ImageView imageView = new ImageView(RuntimeEnvironment.application);
+    final ImageView imageView = new ImageView(ApplicationProvider.getApplicationContext());
     testInBackground(
         new BackgroundTester() {
           @Override
diff --git a/library/test/src/test/java/com/bumptech/glide/RequestManagerTest.java b/library/test/src/test/java/com/bumptech/glide/RequestManagerTest.java
index 481c03f8f0..2c1cbd26bb 100644
--- a/library/test/src/test/java/com/bumptech/glide/RequestManagerTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/RequestManagerTest.java
@@ -16,6 +16,7 @@
 import android.graphics.drawable.Drawable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.manager.ConnectivityMonitor;
 import com.bumptech.glide.manager.ConnectivityMonitor.ConnectivityListener;
 import com.bumptech.glide.manager.ConnectivityMonitorFactory;
@@ -40,7 +41,6 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
 
@@ -63,7 +63,7 @@ public class RequestManagerTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    context = RuntimeEnvironment.application;
+    context = ApplicationProvider.getApplicationContext();
     connectivityMonitor = mock(ConnectivityMonitor.class);
     ConnectivityMonitorFactory factory = mock(ConnectivityMonitorFactory.class);
     when(factory.build(isA(Context.class), isA(ConnectivityMonitor.ConnectivityListener.class)))
@@ -91,7 +91,7 @@ public void onLoadCleared(@Nullable Drawable placeholder) {}
     requestTracker = mock(RequestTracker.class);
     manager =
         new RequestManager(
-            Glide.get(RuntimeEnvironment.application),
+            Glide.get(ApplicationProvider.getApplicationContext()),
             lifecycle,
             treeNode,
             requestTracker,
diff --git a/library/test/src/test/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java b/library/test/src/test/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java
index cf26c7c1f7..ea33c89f1f 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java
@@ -9,6 +9,7 @@
 import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Priority;
 import java.io.Closeable;
 import java.io.FileNotFoundException;
@@ -19,7 +20,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -31,7 +31,9 @@ public class LocalUriFetcherTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    fetcher = new TestLocalUriFetcher(RuntimeEnvironment.application, Uri.parse("content://empty"));
+    fetcher =
+        new TestLocalUriFetcher(
+            ApplicationProvider.getApplicationContext(), Uri.parse("content://empty"));
   }
 
   @Test
diff --git a/library/test/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java b/library/test/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java
index 894b2455ff..344d02f994 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java
@@ -14,6 +14,7 @@
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.provider.MediaStore;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.ImageHeaderParser;
 import com.bumptech.glide.load.engine.bitmap_recycle.ArrayPool;
 import com.bumptech.glide.load.engine.bitmap_recycle.LruArrayPool;
@@ -28,7 +29,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.fakes.RoboCursor;
@@ -86,7 +86,7 @@ public void testClosesCursor() throws FileNotFoundException {
   @Test
   public void testReturnsOpenedInputStreamWhenFileFound() throws FileNotFoundException {
     InputStream expected = new ByteArrayInputStream(new byte[0]);
-    Shadows.shadowOf(RuntimeEnvironment.application.getContentResolver())
+    Shadows.shadowOf(ApplicationProvider.getApplicationContext().getContentResolver())
         .registerInputStream(harness.uri, expected);
     assertEquals(expected, harness.get().open(harness.uri));
   }
@@ -103,7 +103,7 @@ public void testVideoQueryReturnsVideoCursor() {
     ThumbFetcher.VideoThumbnailQuery query =
         new ThumbFetcher.VideoThumbnailQuery(getContentResolver());
     RoboCursor testCursor = new RoboCursor();
-    Shadows.shadowOf(RuntimeEnvironment.application.getContentResolver())
+    Shadows.shadowOf(ApplicationProvider.getApplicationContext().getContentResolver())
         .setCursor(queryUri, testCursor);
     assertEquals(testCursor, query.query(harness.uri));
   }
@@ -114,13 +114,13 @@ public void testImageQueryReturnsImageCursor() {
     ThumbFetcher.ImageThumbnailQuery query =
         new ThumbFetcher.ImageThumbnailQuery(getContentResolver());
     RoboCursor testCursor = new RoboCursor();
-    Shadows.shadowOf(RuntimeEnvironment.application.getContentResolver())
+    Shadows.shadowOf(ApplicationProvider.getApplicationContext().getContentResolver())
         .setCursor(queryUri, testCursor);
     assertEquals(testCursor, query.query(harness.uri));
   }
 
   private static ContentResolver getContentResolver() {
-    return RuntimeEnvironment.application.getContentResolver();
+    return ApplicationProvider.getApplicationContext().getContentResolver();
   }
 
   private static class Harness {
diff --git a/library/test/src/test/java/com/bumptech/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java b/library/test/src/test/java/com/bumptech/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java
index 805b447a67..ea32cd4376 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java
@@ -11,6 +11,7 @@
 import android.content.res.AssetFileDescriptor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.data.FileDescriptorLocalUriFetcher;
@@ -22,7 +23,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 
@@ -41,7 +41,7 @@ public void setUp() {
 
   @Test
   public void testLoadResource_returnsFileDescriptor() throws Exception {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     Uri uri = Uri.parse("file://nothing");
 
     ContentResolver contentResolver = context.getContentResolver();
@@ -60,7 +60,7 @@ public void testLoadResource_returnsFileDescriptor() throws Exception {
 
   @Test
   public void testLoadResource_withNullFileDescriptor_callsLoadFailed() {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     Uri uri = Uri.parse("file://nothing");
 
     ContentResolver contentResolver = context.getContentResolver();
diff --git a/library/test/src/test/java/com/bumptech/glide/load/data/resource/StreamLocalUriFetcherTest.java b/library/test/src/test/java/com/bumptech/glide/load/data/resource/StreamLocalUriFetcherTest.java
index d58c64595a..3b51ca189b 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/data/resource/StreamLocalUriFetcherTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/data/resource/StreamLocalUriFetcherTest.java
@@ -7,6 +7,7 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.data.StreamLocalUriFetcher;
@@ -20,7 +21,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 
@@ -38,7 +38,7 @@ public void setUp() {
 
   @Test
   public void testLoadResource_returnsInputStream() throws Exception {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     Uri uri = Uri.parse("file://nothing");
 
     ContentResolver contentResolver = context.getContentResolver();
@@ -52,7 +52,7 @@ public void testLoadResource_returnsInputStream() throws Exception {
 
   @Test
   public void testLoadResource_withNullInputStream_callsLoadFailed() {
-    Context context = RuntimeEnvironment.application;
+    Context context = ApplicationProvider.getApplicationContext();
     Uri uri = Uri.parse("file://nothing");
 
     ContentResolver contentResolver = context.getContentResolver();
diff --git a/library/test/src/test/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapperTest.java b/library/test/src/test/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapperTest.java
index f1f144899f..0dc500cef6 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapperTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapperTest.java
@@ -7,6 +7,7 @@
 import static org.mockito.Mockito.mock;
 
 import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.signature.ObjectKey;
 import com.bumptech.glide.tests.Util;
@@ -17,7 +18,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -30,7 +30,7 @@ public class DiskLruCacheWrapperTest {
 
   @Before
   public void setUp() {
-    dir = RuntimeEnvironment.application.getCacheDir();
+    dir = ApplicationProvider.getApplicationContext().getCacheDir();
     cache = DiskLruCacheWrapper.create(dir, 10 * 1024 * 1024);
     key = new ObjectKey("test" + Math.random());
     data = new byte[] {1, 2, 3, 4, 5, 6};
diff --git a/library/test/src/test/java/com/bumptech/glide/load/engine/cache/MemorySizeCalculatorTest.java b/library/test/src/test/java/com/bumptech/glide/load/engine/cache/MemorySizeCalculatorTest.java
index 38adb5c56e..67c4f20e2a 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/engine/cache/MemorySizeCalculatorTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/engine/cache/MemorySizeCalculatorTest.java
@@ -7,6 +7,7 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.os.Build;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.engine.cache.MemorySizeCalculatorTest.LowRamActivityManager;
 import com.bumptech.glide.tests.Util;
 import com.google.common.collect.Range;
@@ -15,7 +16,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
@@ -164,14 +164,15 @@ private static class MemorySizeHarness {
     final float sizeMultiplier = MemorySizeCalculator.Builder.MAX_SIZE_MULTIPLIER;
     int byteArrayPoolSizeBytes = MemorySizeCalculator.Builder.ARRAY_POOL_SIZE_BYTES;
     final ActivityManager activityManager =
-        (ActivityManager) RuntimeEnvironment.application.getSystemService(Context.ACTIVITY_SERVICE);
+        (ActivityManager)
+            ApplicationProvider.getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE);
     final MemorySizeCalculator.ScreenDimensions screenDimensions =
         mock(MemorySizeCalculator.ScreenDimensions.class);
 
     MemorySizeCalculator getCalculator() {
       when(screenDimensions.getWidthPixels()).thenReturn(pixelSize);
       when(screenDimensions.getHeightPixels()).thenReturn(pixelSize);
-      return new MemorySizeCalculator.Builder(RuntimeEnvironment.application)
+      return new MemorySizeCalculator.Builder(ApplicationProvider.getApplicationContext())
           .setMemoryCacheScreens(memoryCacheScreens)
           .setBitmapPoolScreens(bitmapPoolScreens)
           .setMaxSizeMultiplier(sizeMultiplier)
diff --git a/library/test/src/test/java/com/bumptech/glide/load/model/AssetUriLoaderTest.java b/library/test/src/test/java/com/bumptech/glide/load/model/AssetUriLoaderTest.java
index 4abfbab858..9f57b3c7ba 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/model/AssetUriLoaderTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/model/AssetUriLoaderTest.java
@@ -8,6 +8,7 @@
 
 import android.content.res.AssetManager;
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.util.Preconditions;
@@ -17,7 +18,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -32,7 +32,7 @@ public class AssetUriLoaderTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    loader = new AssetUriLoader<>(RuntimeEnvironment.application.getAssets(), factory);
+    loader = new AssetUriLoader<>(ApplicationProvider.getApplicationContext().getAssets(), factory);
   }
 
   @Test
diff --git a/library/test/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java b/library/test/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java
index 02df20bc98..e66f86bc6f 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java
@@ -11,6 +11,7 @@
 import static org.mockito.Mockito.when;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.data.DataFetcher;
@@ -21,7 +22,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Tests for the {@link com.bumptech.glide.load.model.ResourceLoader} class. */
@@ -41,7 +41,8 @@ public void setUp() {
     MockitoAnnotations.initMocks(this);
     options = new Options();
 
-    loader = new ResourceLoader<>(RuntimeEnvironment.application.getResources(), uriLoader);
+    loader =
+        new ResourceLoader<>(ApplicationProvider.getApplicationContext().getResources(), uriLoader);
   }
 
   @Test
diff --git a/library/test/src/test/java/com/bumptech/glide/load/model/StreamEncoderTest.java b/library/test/src/test/java/com/bumptech/glide/load/model/StreamEncoderTest.java
index 55b4f1d50d..8185adaece 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/model/StreamEncoderTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/model/StreamEncoderTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.engine.bitmap_recycle.LruArrayPool;
 import com.bumptech.glide.util.ByteBufferUtil;
@@ -13,7 +14,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -25,7 +25,7 @@ public class StreamEncoderTest {
   @Before
   public void setUp() {
     encoder = new StreamEncoder(new LruArrayPool());
-    file = new File(RuntimeEnvironment.application.getCacheDir(), "test");
+    file = new File(ApplicationProvider.getApplicationContext().getCacheDir(), "test");
   }
 
   @After
diff --git a/library/test/src/test/java/com/bumptech/glide/load/model/StringLoaderTest.java b/library/test/src/test/java/com/bumptech/glide/load/model/StringLoaderTest.java
index c3773156a9..9122f98f66 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/model/StringLoaderTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/model/StringLoaderTest.java
@@ -9,6 +9,7 @@
 import static org.mockito.Mockito.when;
 
 import android.net.Uri;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.data.DataFetcher;
@@ -21,7 +22,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Tests for the {@link com.bumptech.glide.load.model.StringLoader} class. */
@@ -52,7 +52,7 @@ public void testHandlesPaths() {
     // TODO fix drive letter parsing somehow
     assumeTrue("it will fail with schema being the drive letter (C:\\... -> C)", !Util.isWindows());
 
-    File f = RuntimeEnvironment.application.getCacheDir();
+    File f = ApplicationProvider.getApplicationContext().getCacheDir();
     Uri expected = Uri.fromFile(f);
     when(uriLoader.buildLoadData(eq(expected), eq(IMAGE_SIDE), eq(IMAGE_SIDE), eq(options)))
         .thenReturn(new ModelLoader.LoadData<>(key, fetcher));
@@ -83,7 +83,7 @@ public void testCanHandleComplexFilePaths() {
 
   @Test
   public void testHandlesFileUris() {
-    File f = RuntimeEnvironment.application.getCacheDir();
+    File f = ApplicationProvider.getApplicationContext().getCacheDir();
 
     Uri expected = Uri.fromFile(f);
     when(uriLoader.buildLoadData(eq(expected), eq(IMAGE_SIDE), eq(IMAGE_SIDE), eq(options)))
diff --git a/library/test/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java b/library/test/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
index 795c6de09d..feb8f31a1e 100644
--- a/library/test/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
@@ -6,13 +6,13 @@
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.engine.Resource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -22,7 +22,8 @@ public class BitmapDrawableTranscoderTest {
 
   @Before
   public void setUp() {
-    transcoder = new BitmapDrawableTranscoder(RuntimeEnvironment.application.getResources());
+    transcoder =
+        new BitmapDrawableTranscoder(ApplicationProvider.getApplicationContext().getResources());
   }
 
   @Test
diff --git a/library/test/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorFactoryTest.java b/library/test/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorFactoryTest.java
index f9407bccb2..8862294b1c 100644
--- a/library/test/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorFactoryTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorFactoryTest.java
@@ -2,14 +2,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.robolectric.Shadows.shadowOf;
 
+import android.app.Application;
+import androidx.test.core.app.ApplicationProvider;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 18)
@@ -23,10 +24,12 @@ public void setUp() {
 
   @Test
   public void testReturnsDefaultConnectivityMonitorWhenHasPermission() {
-    ShadowApplication.getInstance().grantPermissions("android.permission.ACCESS_NETWORK_STATE");
+    shadowOf((Application) ApplicationProvider.getApplicationContext())
+        .grantPermissions("android.permission.ACCESS_NETWORK_STATE");
     ConnectivityMonitor connectivityMonitor =
         factory.build(
-            RuntimeEnvironment.application, mock(ConnectivityMonitor.ConnectivityListener.class));
+            ApplicationProvider.getApplicationContext(),
+            mock(ConnectivityMonitor.ConnectivityListener.class));
     assertThat(connectivityMonitor).isInstanceOf(DefaultConnectivityMonitor.class);
   }
 
@@ -34,7 +37,8 @@ public void testReturnsDefaultConnectivityMonitorWhenHasPermission() {
   public void testReturnsNullConnectivityMonitorWhenDoesNotHavePermission() {
     ConnectivityMonitor connectivityMonitor =
         factory.build(
-            RuntimeEnvironment.application, mock(ConnectivityMonitor.ConnectivityListener.class));
+            ApplicationProvider.getApplicationContext(),
+            mock(ConnectivityMonitor.ConnectivityListener.class));
     assertThat(connectivityMonitor).isInstanceOf(NullConnectivityMonitor.class);
   }
 }
diff --git a/library/test/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorTest.java b/library/test/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorTest.java
index 67e07a5899..55a354f671 100644
--- a/library/test/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorTest.java
@@ -5,13 +5,16 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
 import static org.robolectric.annotation.LooperMode.Mode.LEGACY;
 
+import android.app.Application;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.manager.DefaultConnectivityMonitorTest.PermissionConnectivityManager;
 import java.util.List;
 import org.junit.Before;
@@ -20,13 +23,11 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadow.api.Shadow;
-import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.shadows.ShadowConnectivityManager;
 import org.robolectric.shadows.ShadowNetworkInfo;
 
@@ -41,7 +42,7 @@ public class DefaultConnectivityMonitorTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    monitor = new DefaultConnectivityMonitor(RuntimeEnvironment.application, listener);
+    monitor = new DefaultConnectivityMonitor(ApplicationProvider.getApplicationContext(), listener);
     harness = new ConnectivityHarness();
   }
 
@@ -156,7 +157,8 @@ public void onReceive_withMissingPermission_previouslyConnected_doesNotNotifyLis
 
   private List<BroadcastReceiver> getConnectivityReceivers() {
     Intent connectivity = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);
-    return ShadowApplication.getInstance().getReceiversForIntent(connectivity);
+    return shadowOf((Application) ApplicationProvider.getApplicationContext())
+        .getReceiversForIntent(connectivity);
   }
 
   private static class ConnectivityHarness {
@@ -165,7 +167,8 @@ private static class ConnectivityHarness {
     public ConnectivityHarness() {
       ConnectivityManager connectivityManager =
           (ConnectivityManager)
-              RuntimeEnvironment.application.getSystemService(Context.CONNECTIVITY_SERVICE);
+              ApplicationProvider.getApplicationContext()
+                  .getSystemService(Context.CONNECTIVITY_SERVICE);
       shadowConnectivityManager = Shadow.extract(connectivityManager);
     }
 
@@ -181,7 +184,7 @@ void connect() {
 
     void broadcast() {
       Intent connected = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);
-      RuntimeEnvironment.application.sendBroadcast(connected);
+      ApplicationProvider.getApplicationContext().sendBroadcast(connected);
     }
   }
 
diff --git a/library/test/src/test/java/com/bumptech/glide/request/RequestOptionsTest.java b/library/test/src/test/java/com/bumptech/glide/request/RequestOptionsTest.java
index f9b2f8b643..67b4da7a8a 100644
--- a/library/test/src/test/java/com/bumptech/glide/request/RequestOptionsTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/request/RequestOptionsTest.java
@@ -8,6 +8,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.MultiTransformation;
 import com.bumptech.glide.load.Option;
@@ -25,7 +26,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class RequestOptionsTest {
@@ -39,7 +39,7 @@ public void setUp() {
     MockitoAnnotations.initMocks(this);
     options = new RequestOptions();
 
-    app = RuntimeEnvironment.application;
+    app = ApplicationProvider.getApplicationContext();
   }
 
   @Test
diff --git a/library/test/src/test/java/com/bumptech/glide/request/transition/ViewPropertyAnimationTest.java b/library/test/src/test/java/com/bumptech/glide/request/transition/ViewPropertyAnimationTest.java
index 2c993ba984..cfd47ea26d 100644
--- a/library/test/src/test/java/com/bumptech/glide/request/transition/ViewPropertyAnimationTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/request/transition/ViewPropertyAnimationTest.java
@@ -11,11 +11,11 @@
 
 import android.view.View;
 import android.widget.ImageView;
+import androidx.test.core.app.ApplicationProvider;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -37,7 +37,7 @@ public void testAlwaysReturnsFalse() {
 
   @Test
   public void testCallsAnimatorWithGivenView() {
-    ImageView view = new ImageView(RuntimeEnvironment.application);
+    ImageView view = new ImageView(ApplicationProvider.getApplicationContext());
     ViewAdapter adapter = mock(ViewAdapter.class);
     when(adapter.getView()).thenReturn(view);
     animation.transition(new Object(), adapter);
diff --git a/library/test/src/test/java/com/bumptech/glide/request/transition/ViewTransitionAnimationFactoryTest.java b/library/test/src/test/java/com/bumptech/glide/request/transition/ViewTransitionAnimationFactoryTest.java
index 1d77f9742f..1097568ce2 100644
--- a/library/test/src/test/java/com/bumptech/glide/request/transition/ViewTransitionAnimationFactoryTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/request/transition/ViewTransitionAnimationFactoryTest.java
@@ -11,12 +11,12 @@
 import android.content.Context;
 import android.view.View;
 import android.view.animation.Animation;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.DataSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class ViewTransitionAnimationFactoryTest {
@@ -33,7 +33,8 @@ public void setUp() {
   public void testFactoryReturnsNoAnimationIfFromMemoryCache() {
     Transition<Object> animation = factory.build(DataSource.MEMORY_CACHE, true /*isFirstResource*/);
     assertEquals(NoTransition.get(), animation);
-    verify(viewTransitionAnimationFactory, never()).build(RuntimeEnvironment.application);
+    verify(viewTransitionAnimationFactory, never())
+        .build(ApplicationProvider.getApplicationContext());
   }
 
   @Test
@@ -41,7 +42,8 @@ public void testFactoryReturnsNoAnimationIfNotFirstResource() {
     Transition<Object> animation =
         factory.build(DataSource.DATA_DISK_CACHE, false /*isFirstResource*/);
     assertEquals(NoTransition.get(), animation);
-    verify(viewTransitionAnimationFactory, never()).build(RuntimeEnvironment.application);
+    verify(viewTransitionAnimationFactory, never())
+        .build(ApplicationProvider.getApplicationContext());
   }
 
   @Test
diff --git a/library/test/src/test/java/com/bumptech/glide/signature/ApplicationVersionSignatureTest.java b/library/test/src/test/java/com/bumptech/glide/signature/ApplicationVersionSignatureTest.java
index 45e747de62..d4e6f18d46 100644
--- a/library/test/src/test/java/com/bumptech/glide/signature/ApplicationVersionSignatureTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/signature/ApplicationVersionSignatureTest.java
@@ -6,6 +6,7 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager.NameNotFoundException;
+import androidx.test.core.app.ApplicationProvider;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.tests.KeyTester;
 import java.io.UnsupportedEncodingException;
@@ -17,7 +18,6 @@
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -28,7 +28,7 @@ public class ApplicationVersionSignatureTest {
 
   @Before
   public void setUp() {
-    context = RuntimeEnvironment.application;
+    context = ApplicationProvider.getApplicationContext();
   }
 
   @After
diff --git a/library/test/src/test/java/com/bumptech/glide/util/ViewPreloadSizeProviderTest.java b/library/test/src/test/java/com/bumptech/glide/util/ViewPreloadSizeProviderTest.java
index 1136a3c447..ff0b138710 100644
--- a/library/test/src/test/java/com/bumptech/glide/util/ViewPreloadSizeProviderTest.java
+++ b/library/test/src/test/java/com/bumptech/glide/util/ViewPreloadSizeProviderTest.java
@@ -5,11 +5,11 @@
 
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.test.core.app.ApplicationProvider;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -21,7 +21,7 @@ public class ViewPreloadSizeProviderTest {
 
   @Before
   public void setUp() {
-    view = new View(RuntimeEnvironment.application);
+    view = new View(ApplicationProvider.getApplicationContext());
     provider = new ViewPreloadSizeProvider<>();
   }
 
@@ -71,7 +71,7 @@ public void testCanObtainFixedSizeFromView() {
   public void testIgnoresNewViewIfAlreadyWaitingOnSizeOfAnotherView() {
     provider.setView(view);
 
-    View newView = new View(RuntimeEnvironment.application);
+    View newView = new View(ApplicationProvider.getApplicationContext());
     newView.setLayoutParams(new ViewGroup.LayoutParams(100, 100));
     provider.setView(newView);