Migrate away from deprecated test classes

There are some unnecessary imports, test dependencies, and explicit casts
now, but we don't have reasonable tooling to clean those up automatically
across the entire codebase. Also, some imports may be out of order.

Fixes: 119834874
Test: ./gradlew buildOnServer
Change-Id: Ic48c88f4f03f890651fc9cdabdefdc82774dcdf5

diff --git a/activity/build.gradle b/activity/build.gradle
index 91a9895..fea0bf1 100644
--- a/activity/build.gradle
+++ b/activity/build.gradle

@@ -23,6 +23,8 @@
     api(project(":savedstate:savedstate-bundle"))
 
     androidTestImplementation(KOTLIN_STDLIB)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(TRUTH)

diff --git a/activity/integration-tests/testapp/build.gradle b/activity/integration-tests/testapp/build.gradle
index 0db760b..18c13b5 100644
--- a/activity/integration-tests/testapp/build.gradle
+++ b/activity/integration-tests/testapp/build.gradle

@@ -31,6 +31,8 @@
     implementation(project(":activity"))
     androidTestImplementation(LEAKCANARY_INSTRUMENTATION)
     androidTestImplementation(KOTLIN_STDLIB)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE)

diff --git a/activity/integration-tests/testapp/src/androidTest/java/androidx/activity/integration/testapp/LeakInputMethodManagerTest.kt b/activity/integration-tests/testapp/src/androidTest/java/androidx/activity/integration/testapp/LeakInputMethodManagerTest.kt
index 736d96a..d308df5 100644
--- a/activity/integration-tests/testapp/src/androidTest/java/androidx/activity/integration/testapp/LeakInputMethodManagerTest.kt
+++ b/activity/integration-tests/testapp/src/androidTest/java/androidx/activity/integration/testapp/LeakInputMethodManagerTest.kt

@@ -24,9 +24,9 @@
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.activity.ComponentActivity
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/activity/ktx/build.gradle b/activity/ktx/build.gradle
index a39ae87..2ed6707 100644
--- a/activity/ktx/build.gradle
+++ b/activity/ktx/build.gradle

@@ -37,6 +37,8 @@
     api(KOTLIN_STDLIB)
     androidTestImplementation(JUNIT)
     androidTestImplementation(TRUTH)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
 }

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt b/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt
index 279875a..2408922 100644
--- a/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt
+++ b/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt

@@ -20,9 +20,9 @@
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivityOnBackPressedTest.kt b/activity/src/androidTest/java/androidx/activity/ComponentActivityOnBackPressedTest.kt
index c8aea2c..dda0ad5 100644
--- a/activity/src/androidTest/java/androidx/activity/ComponentActivityOnBackPressedTest.kt
+++ b/activity/src/androidTest/java/androidx/activity/ComponentActivityOnBackPressedTest.kt

@@ -21,9 +21,9 @@
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertWithMessage
 import org.junit.Rule
 import org.junit.Test

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt b/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt
index 3c75fc7..ea69c00 100644
--- a/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt
+++ b/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt

@@ -19,9 +19,9 @@
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleRegistry
 import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import org.junit.Assert.fail
 import org.junit.Rule

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt b/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt
index bd8262d..a46b155 100644
--- a/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt
+++ b/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt

@@ -21,9 +21,9 @@
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.savedstate.SavedStateRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import org.junit.After
 import org.junit.Rule

diff --git a/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt b/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt
index d8b2083..35f7874 100644
--- a/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt
+++ b/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt

@@ -23,9 +23,9 @@
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
 import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
 import org.junit.Rule

diff --git a/animation/build.gradle b/animation/build.gradle
index 7d3a2dd..ffacab8 100644
--- a/animation/build.gradle
+++ b/animation/build.gradle

@@ -26,7 +26,7 @@
     implementation(project(":annotation"))
     implementation(project(":core"))
 
-    androidTestImplementation(TEST_RUNNER, libs.exclude_for_espresso)
+    androidTestImplementation(TEST_EXT_JUNIT, libs.exclude_for_espresso)
     androidTestImplementation(TEST_RULES, libs.exclude_for_espresso)
 }
 

diff --git a/animation/integration-tests/testapp/build.gradle b/animation/integration-tests/testapp/build.gradle
index 5f2a26d..155bc10 100644
--- a/animation/integration-tests/testapp/build.gradle
+++ b/animation/integration-tests/testapp/build.gradle

@@ -26,7 +26,8 @@
     implementation(project(":animation"))
     implementation(project(":animation:testing"))
 
-    implementation(TEST_RUNNER, libs.exclude_for_espresso)
+    implementation(TEST_EXT_JUNIT, libs.exclude_for_espresso)
+    implementation(TEST_CORE, libs.exclude_for_espresso)
     implementation(TEST_RULES, libs.exclude_for_espresso)
 }
 

diff --git a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/AnimatorInflaterTest.java b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/AnimatorInflaterTest.java
index 53393d6..0115e60 100644
--- a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/AnimatorInflaterTest.java
+++ b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/AnimatorInflaterTest.java

@@ -16,17 +16,17 @@
 
 package androidx.animation;
 
-import android.content.Context;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import android.content.Context;
+
 import androidx.animation.testapp.test.R;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -44,7 +44,7 @@
     @UiThreadTest
     @Test
     public void testLoadAnimator() {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         Animator anim = AnimatorInflater.loadAnimator(context, R.animator.animator_set_with_dimens);
         assertEquals(100, anim.getTotalDuration());
 
@@ -68,7 +68,7 @@
     @UiThreadTest
     @Test
     public void testLoadAnimatorAlongPath() {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         Animator anim = AnimatorInflater.loadAnimator(context, R.animator.animator_along_path);
         assertTrue(anim.getInterpolator() instanceof LinearInterpolator);
         assertEquals(100, anim.getDuration());

diff --git a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/AnimatorSetTest.java b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/AnimatorSetTest.java
index 5778992..9ad4a8bb 100644
--- a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/AnimatorSetTest.java
+++ b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/AnimatorSetTest.java

@@ -25,8 +25,8 @@
 import static org.junit.Assert.assertTrue;
 
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/EvaluatorTest.java b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/EvaluatorTest.java
index d557261..6a2407f 100644
--- a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/EvaluatorTest.java
+++ b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/EvaluatorTest.java

@@ -23,8 +23,8 @@
 import android.graphics.PointF;
 import android.graphics.Rect;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/InterpolatorTest.java b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/InterpolatorTest.java
index 7419bcd..8f5d962 100644
--- a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/InterpolatorTest.java
+++ b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/InterpolatorTest.java

@@ -22,8 +22,8 @@
 import android.graphics.Path;
 
 import androidx.core.graphics.PathParser;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/ObjectAnimatorTest.java b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/ObjectAnimatorTest.java
index 3af36d9..d222dd5 100644
--- a/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/ObjectAnimatorTest.java
+++ b/animation/integration-tests/testapp/src/androidTest/java/androidx/animation/ObjectAnimatorTest.java

@@ -26,8 +26,8 @@
 import android.util.Property;
 
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/animation/testing/build.gradle b/animation/testing/build.gradle
index c251db0..d823fa1 100644
--- a/animation/testing/build.gradle
+++ b/animation/testing/build.gradle

@@ -26,7 +26,8 @@
     implementation(project(":annotation"))
     implementation(project(":core"))
     implementation(project(":animation"))
-    implementation(TEST_RUNNER)
+    implementation(TEST_EXT_JUNIT)
+    implementation(TEST_CORE)
 }
 
 supportLibrary {

diff --git a/appcompat/build.gradle b/appcompat/build.gradle
index a672c0c..fc10b3f 100644
--- a/appcompat/build.gradle
+++ b/appcompat/build.gradle

@@ -17,6 +17,8 @@
     api("androidx.vectordrawable:vectordrawable-animated:1.0.0")
     api("androidx.drawerlayout:drawerlayout:1.0.0")
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(TRUTH)

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogCursorTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogCursorTest.java
index 2786c50..44b38dd 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogCursorTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogCursorTest.java

@@ -52,10 +52,10 @@
 import androidx.appcompat.test.R;
 import androidx.appcompat.testutils.TestUtilsMatchers;
 import androidx.test.espresso.DataInteraction;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Matcher;
 import org.junit.After;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterPassTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterPassTest.java
index 21ac9053..87563b7 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterPassTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterPassTest.java

@@ -28,9 +28,9 @@
 import androidx.appcompat.widget.AppCompatSpinner;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.AppCompatToggleButton;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemIconTintingTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemIconTintingTest.java
index 360f6ce..c88ba2a 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemIconTintingTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemIconTintingTest.java

@@ -36,9 +36,9 @@
 import androidx.core.graphics.ColorUtils;
 import androidx.core.view.MenuItemCompat;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemShortcutsTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemShortcutsTest.java
index 9df4413..d3948e9 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemShortcutsTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemShortcutsTest.java

@@ -24,9 +24,9 @@
 import android.view.KeyEvent;
 
 import androidx.appcompat.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java
index 0aebb2d..43830f4 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java

@@ -28,9 +28,9 @@
 
 import androidx.appcompat.test.R;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
index be1e04b..8749fc8 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java

@@ -48,10 +48,10 @@
 import androidx.appcompat.testutils.BaseTestActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyEventsTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyEventsTestCase.java
index 7c07c9e..3cef5f4 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyEventsTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyEventsTestCase.java

@@ -39,11 +39,11 @@
 import androidx.appcompat.testutils.BaseTestActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.core.view.MenuItemCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Matchers;
 import org.junit.Before;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyboardShortcutsTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyboardShortcutsTestCase.java
index 0e4b490..58f6681 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyboardShortcutsTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyboardShortcutsTestCase.java

@@ -27,10 +27,10 @@
 
 import androidx.appcompat.test.R;
 import androidx.appcompat.testutils.BaseTestActivity;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DialogTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DialogTestCase.java
index dd95a16..bdff597 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DialogTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DialogTestCase.java

@@ -22,10 +22,10 @@
 import android.app.Dialog;
 import android.os.Bundle;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerDynamicLayoutTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerDynamicLayoutTest.java
index b27c46e..b0b231b 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerDynamicLayoutTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerDynamicLayoutTest.java

@@ -35,9 +35,9 @@
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerInteractionTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerInteractionTest.java
index f3fbe52..c3283d0 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerInteractionTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerInteractionTest.java

@@ -34,10 +34,10 @@
 
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -62,8 +62,8 @@
     public void setUp() throws Throwable {
         final Activity activity = mActivityTestRule.getActivity();
 
-        Context context = InstrumentationRegistry.getContext();
-        mDrawerLayout = new TestDrawerLayout(InstrumentationRegistry.getContext());
+        Context context = ApplicationProvider.getApplicationContext();
+        mDrawerLayout = new TestDrawerLayout(ApplicationProvider.getApplicationContext());
         mContentView = new MockView(context);
         mStartDrawer = new MockView(context);
 

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutDoubleTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutDoubleTest.java
index f74b10a..37d13f6 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutDoubleTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutDoubleTest.java

@@ -32,10 +32,10 @@
 import androidx.appcompat.test.R;
 import androidx.core.view.ViewCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutTest.java
index 855f747..23dd7c0 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutTest.java

@@ -51,12 +51,12 @@
 import androidx.test.espresso.action.GeneralSwipeAction;
 import androidx.test.espresso.action.Press;
 import androidx.test.espresso.action.Swipe;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.Suppress;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/FragmentContentIdTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/FragmentContentIdTest.java
index 7ea806c..27f0ed7 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/FragmentContentIdTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/FragmentContentIdTest.java

@@ -23,9 +23,9 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 
 import androidx.appcompat.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithToolbar.java b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithToolbar.java
index aae8cac..29366ef 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithToolbar.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithToolbar.java

@@ -23,8 +23,8 @@
 import android.view.Window;
 
 import androidx.appcompat.widget.Toolbar;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithWindowDecor.java b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithWindowDecor.java
index e122523..092a092 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithWindowDecor.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithWindowDecor.java

@@ -27,8 +27,8 @@
 
 import androidx.appcompat.test.R;
 import androidx.core.view.ViewCompat;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java
index 3a2b2ec..6139115 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java

@@ -29,10 +29,10 @@
 
 import androidx.appcompat.testutils.BaseTestActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/LayoutInflaterFactoryTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/LayoutInflaterFactoryTestCase.java
index df2b9e3..1b0a1da 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/LayoutInflaterFactoryTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/LayoutInflaterFactoryTestCase.java

@@ -41,9 +41,9 @@
 import androidx.appcompat.widget.AppCompatRatingBar;
 import androidx.appcompat.widget.AppCompatSpinner;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/MenuBuilderTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/MenuBuilderTest.java
index b4f230d..b8f16c8 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/MenuBuilderTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/MenuBuilderTest.java

@@ -20,8 +20,8 @@
 import static org.junit.Assert.assertTrue;
 
 import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeTestCase.java
index b46481f6..782098e 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeTestCase.java

@@ -29,10 +29,10 @@
 
 import androidx.appcompat.test.R;
 import androidx.core.content.ContextCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.AppCompatActivityUtils;
 import androidx.testutils.RecreatedAppCompatActivity;
 

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompatTest.java b/appcompat/src/androidTest/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompatTest.java
index 24a9681..61959ce 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompatTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompatTest.java

@@ -32,9 +32,9 @@
 import android.util.StateSet;
 
 import androidx.appcompat.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
 
 import org.junit.Before;
@@ -56,7 +56,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @Test

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/res/content/AppCompatResourcesTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/res/content/AppCompatResourcesTestCase.java
index 02266c0..6cf62e0 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/res/content/AppCompatResourcesTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/res/content/AppCompatResourcesTestCase.java

@@ -25,9 +25,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/view/ContextThemeWrapperTest.java b/appcompat/src/androidTest/java/androidx/appcompat/view/ContextThemeWrapperTest.java
index 9754b67..9dd6ea7 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/view/ContextThemeWrapperTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/view/ContextThemeWrapperTest.java

@@ -29,9 +29,9 @@
 import android.os.Build;
 
 import androidx.appcompat.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -59,7 +59,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @Test

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/view/SupportMenuInflaterTest.java b/appcompat/src/androidTest/java/androidx/appcompat/view/SupportMenuInflaterTest.java
index e3140c9..6635778 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/view/SupportMenuInflaterTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/view/SupportMenuInflaterTest.java

@@ -24,9 +24,9 @@
 import androidx.appcompat.test.R;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.internal.view.SupportMenuItem;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/view/menu/ActionMenuItemTest.java b/appcompat/src/androidTest/java/androidx/appcompat/view/menu/ActionMenuItemTest.java
index e843c83..afd6fab0 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/view/menu/ActionMenuItemTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/view/menu/ActionMenuItemTest.java

@@ -22,9 +22,9 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,7 +38,7 @@
 
     @Test
     public void setShowAsActionNever() throws Exception {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final ActionMenuItem item = new ActionMenuItem(
                 context, Menu.NONE, Menu.NONE, 0, 0, "item");
 

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/view/menu/MenuItemImplTest.java b/appcompat/src/androidTest/java/androidx/appcompat/view/menu/MenuItemImplTest.java
index c553240..264dffb 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/view/menu/MenuItemImplTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/view/menu/MenuItemImplTest.java

@@ -22,9 +22,9 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,7 +41,7 @@
 
     @Before
     public void setUp() throws Exception {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final MenuBuilder menu = new MenuBuilder(context);
         mMenuItem = new MenuItemImpl(
                 menu, Menu.NONE, Menu.NONE, 0, 0, "item", MenuItem.SHOW_AS_ACTION_IF_ROOM);

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseAutoSizeTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseAutoSizeTest.java
index e3bbbd3..6e7adf2 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseAutoSizeTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseAutoSizeTest.java

@@ -42,10 +42,10 @@
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.widget.AutoSizeableTextView;
 import androidx.core.widget.TextViewCompat;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Before;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseViewTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseViewTest.java
index 681291f..2dd5ce0 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseViewTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseViewTest.java

@@ -44,9 +44,9 @@
 import androidx.appcompat.testutils.TestUtils;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.ColorUtils;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonAutoSizeTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonAutoSizeTest.java
index 5b4be0b..f2da2e8 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonAutoSizeTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonAutoSizeTest.java

@@ -16,8 +16,8 @@
 
 package androidx.appcompat.widget;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.runner.RunWith;
 

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatCheckBoxTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatCheckBoxTest.java
index 4461a7c..6dec2f0 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatCheckBoxTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatCheckBoxTest.java

@@ -28,9 +28,9 @@
 import androidx.appcompat.test.R;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.widget.CompoundButtonCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java
index f69ad3d..b9e6a32 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java

@@ -26,10 +26,10 @@
 
 import androidx.appcompat.test.R;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java
index 9de0976..dee4845 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java

@@ -28,9 +28,9 @@
 import androidx.appcompat.test.R;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.widget.CompoundButtonCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeTest.java
index 82c52eb..5d766a6 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeTest.java

@@ -31,9 +31,9 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.test.R;
 import androidx.core.widget.TextViewCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatToggleButtonTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatToggleButtonTest.java
index b8404e9..12a3d27 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatToggleButtonTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatToggleButtonTest.java

@@ -23,9 +23,9 @@
 
 import androidx.appcompat.test.R;
 import androidx.core.content.res.ResourcesCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/ListPopupWindowTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/ListPopupWindowTest.java
index c5a72c0..c38fe17 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/ListPopupWindowTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/ListPopupWindowTest.java

@@ -55,12 +55,12 @@
 import android.widget.TextView;
 
 import androidx.appcompat.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/PopupMenuTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/PopupMenuTest.java
index 1712854..6004bb6 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/PopupMenuTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/PopupMenuTest.java

@@ -59,16 +59,16 @@
 
 import androidx.appcompat.test.R;
 import androidx.core.view.MenuItemCompat;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.espresso.Root;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.PollingCheck;
 
 import org.hamcrest.Description;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchViewTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchViewTest.java
index 5d6247a..e580f33 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchViewTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchViewTest.java

@@ -35,11 +35,11 @@
 import android.view.inputmethod.EditorInfo;
 
 import androidx.appcompat.test.R;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchView_CursorTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchView_CursorTest.java
index 7c98396..d8be674 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchView_CursorTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchView_CursorTest.java

@@ -39,11 +39,11 @@
 import androidx.appcompat.testutils.TestUtils;
 import androidx.cursoradapter.widget.CursorAdapter;
 import androidx.cursoradapter.widget.SimpleCursorAdapter;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.PollingCheck;
 
 import org.junit.Before;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/SwitchCompatTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/SwitchCompatTest.java
index a306a22..bea1cd3 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/SwitchCompatTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/SwitchCompatTest.java

@@ -29,9 +29,9 @@
 
 import androidx.appcompat.test.R;
 import androidx.core.content.res.ResourcesCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java
index 4413a52..d3afb0a 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java

@@ -23,9 +23,9 @@
 import android.graphics.drawable.Drawable;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/ToolbarTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/ToolbarTest.java
index 32fdf41..d15a3be 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/ToolbarTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/ToolbarTest.java

@@ -26,10 +26,10 @@
 
 import androidx.appcompat.test.R;
 import androidx.appcompat.testutils.TestUtils;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/arch/core-testing/build.gradle b/arch/core-testing/build.gradle
index 32d63c8..f733c36 100644
--- a/arch/core-testing/build.gradle
+++ b/arch/core-testing/build.gradle

@@ -32,6 +32,8 @@
     testImplementation(JUNIT)
 
     androidTestImplementation(JUNIT)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(ESPRESSO_CORE)
 }

diff --git a/arch/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java b/arch/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java
index 6f4e56e..ac68079f 100644
--- a/arch/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java
+++ b/arch/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java

@@ -19,10 +19,9 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
 import androidx.arch.core.executor.ArchTaskExecutor;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/browser/build.gradle b/browser/build.gradle
index 0e00196..c8a3fca 100644
--- a/browser/build.gradle
+++ b/browser/build.gradle

@@ -19,6 +19,8 @@
     api(project(":collection"))
     api(project(":legacy-support-core-ui"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUiTest.java b/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUiTest.java
index 2355209..c25c01e2 100644
--- a/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUiTest.java
+++ b/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUiTest.java

@@ -28,9 +28,9 @@
 
 import androidx.browser.R;
 import androidx.browser.customtabs.TestActivity;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsIntentTest.java b/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsIntentTest.java
index 3bd0273..69bed08 100644
--- a/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsIntentTest.java
+++ b/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsIntentTest.java

@@ -27,9 +27,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,7 +44,7 @@
     private static final String TEST_URL = "http://www.example.com";
     private static final String CUSTOM_ITEM_TITLE = "Share url";
     private Uri mUri = Uri.parse(TEST_URL);
-    private Context mContext = InstrumentationRegistry.getTargetContext();
+    private Context mContext = ApplicationProvider.getApplicationContext();
 
     /**
      * Test whether default {@link BrowserActionsIntent} is populated correctly.
@@ -101,7 +101,7 @@
     }
 
     static PendingIntent createCustomItemAction(String url) {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         Intent customIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         return PendingIntent.getActivity(context, 0, customIntent, 0);
     }

diff --git a/browser/src/androidTest/java/androidx/browser/customtabs/CustomTabsIntentTest.java b/browser/src/androidTest/java/androidx/browser/customtabs/CustomTabsIntentTest.java
index 3852598..f98e9e19 100644
--- a/browser/src/androidTest/java/androidx/browser/customtabs/CustomTabsIntentTest.java
+++ b/browser/src/androidTest/java/androidx/browser/customtabs/CustomTabsIntentTest.java

@@ -27,9 +27,9 @@
 import android.os.Build;
 
 import androidx.annotation.ColorRes;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,7 +67,7 @@
     @Test
     public void testToolbarColorIsNotAResource() {
         @ColorRes int colorId = android.R.color.background_dark;
-        int color = InstrumentationRegistry.getContext().getResources().getColor(colorId);
+        int color = ApplicationProvider.getApplicationContext().getResources().getColor(colorId);
         Intent intent = new CustomTabsIntent.Builder().setToolbarColor(colorId).build().intent;
         assertFalse("The color should not be a resource ID",
                 color == intent.getIntExtra(CustomTabsIntent.EXTRA_TOOLBAR_COLOR, 0));

diff --git a/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageServiceConnectionTest.java b/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageServiceConnectionTest.java
index 1e0c4ce..e14f40e 100644
--- a/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageServiceConnectionTest.java
+++ b/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageServiceConnectionTest.java

@@ -23,10 +23,10 @@
 import android.content.Context;
 import android.content.Intent;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.ServiceTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.PollingCheck;
 
 import org.junit.Before;

diff --git a/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageTest.java b/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageTest.java
index d7d8c55..87d4f59 100644
--- a/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageTest.java
+++ b/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageTest.java

@@ -26,10 +26,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.ServiceTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.PollingCheck;
 
 import org.junit.Before;

diff --git a/browser/src/androidTest/java/androidx/browser/customtabs/TrustedWebUtilsTest.java b/browser/src/androidTest/java/androidx/browser/customtabs/TrustedWebUtilsTest.java
index e63a926..557c813 100644
--- a/browser/src/androidTest/java/androidx/browser/customtabs/TrustedWebUtilsTest.java
+++ b/browser/src/androidTest/java/androidx/browser/customtabs/TrustedWebUtilsTest.java

@@ -25,9 +25,9 @@
 import android.net.Uri;
 
 import androidx.core.app.BundleCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/car/cluster/build.gradle b/car/cluster/build.gradle
index 9f58c0c..ee87717 100644
--- a/car/cluster/build.gradle
+++ b/car/cluster/build.gradle

@@ -28,11 +28,15 @@
 
     annotationProcessor(project(":versionedparcelable-annotation"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
 
     testImplementation(JUNIT)
+    testImplementation(TEST_EXT_JUNIT)
+    testImplementation(TEST_CORE)
     testImplementation(TEST_RUNNER)
 
     compileOnly fileTree(dir: '../stubs', include: ['android.car.jar'])

diff --git a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/ImageReferenceTest.java b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/ImageReferenceTest.java
index b00029a..697eaae 100644
--- a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/ImageReferenceTest.java
+++ b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/ImageReferenceTest.java

@@ -23,8 +23,8 @@
 
 import android.net.Uri;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/LaneTest.java b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/LaneTest.java
index 865d972..99ef1ef 100644
--- a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/LaneTest.java
+++ b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/LaneTest.java

@@ -20,8 +20,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/NavigationStateTest.java b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/NavigationStateTest.java
index f657b9b..538c0fe 100644
--- a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/NavigationStateTest.java
+++ b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/NavigationStateTest.java

@@ -25,8 +25,8 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/RichTextElementTest.java b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/RichTextElementTest.java
index fce32e19..f1a1cd7 100644
--- a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/RichTextElementTest.java
+++ b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/RichTextElementTest.java

@@ -19,8 +19,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/RichTextTest.java b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/RichTextTest.java
index 488b650..cac4cb0 100644
--- a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/RichTextTest.java
+++ b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/RichTextTest.java

@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/SegmentTest.java b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/SegmentTest.java
index 93a1a36..4788a64 100644
--- a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/SegmentTest.java
+++ b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/SegmentTest.java

@@ -19,8 +19,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/StepTest.java b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/StepTest.java
index 020bcd5..503e64d 100644
--- a/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/StepTest.java
+++ b/car/cluster/src/androidTest/java/androidx/car/cluster/navigation/StepTest.java

@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/core/build.gradle b/car/core/build.gradle
index 221eec4..df5f78c 100644
--- a/car/core/build.gradle
+++ b/car/core/build.gradle

@@ -17,6 +17,8 @@
     api(CONSTRAINT_LAYOUT, { transitive = true })
     api(SUPPORT_DESIGN, libs.exclude_for_material)
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
@@ -25,6 +27,8 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 
     testImplementation(JUNIT)
+    testImplementation(TEST_EXT_JUNIT)
+    testImplementation(TEST_CORE)
     testImplementation(TEST_RUNNER)
     testImplementation(MOCKITO_CORE)
 

diff --git a/car/core/src/androidTest/java/androidx/car/drawer/CarDrawerTest.java b/car/core/src/androidTest/java/androidx/car/drawer/CarDrawerTest.java
index 7b1675d..428a141 100644
--- a/car/core/src/androidTest/java/androidx/car/drawer/CarDrawerTest.java
+++ b/car/core/src/androidTest/java/androidx/car/drawer/CarDrawerTest.java

@@ -31,11 +31,11 @@
 import androidx.car.test.R;
 import androidx.car.util.CarUxRestrictionsTestUtils;
 import androidx.car.widget.PagedListView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.contrib.DrawerActions;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Assume;
@@ -67,7 +67,8 @@
 
     /** Returns {@code true} if the testing device has the automotive feature flag. */
     private boolean isAutoDevice() {
-        PackageManager packageManager = InstrumentationRegistry.getContext().getPackageManager();
+        PackageManager packageManager =
+                ApplicationProvider.getApplicationContext().getPackageManager();
         return packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
     }
 

diff --git a/car/core/src/androidTest/java/androidx/car/navigation/utils/BundlableTest.java b/car/core/src/androidTest/java/androidx/car/navigation/utils/BundlableTest.java
index a53b130..68ae04e 100644
--- a/car/core/src/androidTest/java/androidx/car/navigation/utils/BundlableTest.java
+++ b/car/core/src/androidTest/java/androidx/car/navigation/utils/BundlableTest.java

@@ -18,8 +18,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/core/src/androidTest/java/androidx/car/navigation/utils/BundleMarshallerTest.java b/car/core/src/androidTest/java/androidx/car/navigation/utils/BundleMarshallerTest.java
index ad84267..5a9ad6e 100644
--- a/car/core/src/androidTest/java/androidx/car/navigation/utils/BundleMarshallerTest.java
+++ b/car/core/src/androidTest/java/androidx/car/navigation/utils/BundleMarshallerTest.java

@@ -24,8 +24,8 @@
 
 import android.os.Bundle;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/car/core/src/androidTest/java/androidx/car/util/GridLayoutManagerUtilsTest.java b/car/core/src/androidTest/java/androidx/car/util/GridLayoutManagerUtilsTest.java
index 1578f62..90e6a9d 100644
--- a/car/core/src/androidTest/java/androidx/car/util/GridLayoutManagerUtilsTest.java
+++ b/car/core/src/androidTest/java/androidx/car/util/GridLayoutManagerUtilsTest.java

@@ -35,12 +35,12 @@
 import androidx.car.widget.PagedListViewTestActivity;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.espresso.Espresso;
 import androidx.test.espresso.IdlingResource;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Assume;

diff --git a/car/core/src/androidTest/java/androidx/car/widget/ActionListItemTest.java b/car/core/src/androidTest/java/androidx/car/widget/ActionListItemTest.java
index 287d0d3..38fbef4 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/ActionListItemTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/ActionListItemTest.java

@@ -42,12 +42,12 @@
 import androidx.car.test.R;
 import androidx.car.util.CarUxRestrictionsTestUtils;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Matcher;
 import org.junit.Assume;
@@ -158,7 +158,7 @@
         for (int i = 0; i < items.size(); i++) {
             ActionListItem.ViewHolder viewHolder = getViewHolderAtPosition(i);
 
-            int expected = InstrumentationRegistry.getContext().getResources()
+            int expected = ApplicationProvider.getApplicationContext().getResources()
                     .getDimensionPixelSize(expectedStartMargin.get(i));
             assertThat(((ViewGroup.MarginLayoutParams) viewHolder.getTitle().getLayoutParams())
                     .getMarginStart(), is(equalTo(expected)));
@@ -436,13 +436,14 @@
 
         // String wouldn't fit in one line.
         ActionListItem item3 = new ActionListItem(mActivity);
-        item3.setTitle(InstrumentationRegistry.getContext().getResources().getString(
+        item3.setTitle(ApplicationProvider.getApplicationContext().getResources().getString(
                 R.string.over_uxr_text_length_limit));
 
         List<ActionListItem> items = Arrays.asList(item0, item1, item2, item3);
         setupPagedListView(items);
 
-        double singleLineHeight = InstrumentationRegistry.getContext().getResources().getDimension(
+        double singleLineHeight =
+                ApplicationProvider.getApplicationContext().getResources().getDimension(
                 R.dimen.car_single_line_list_item_height);
 
         LinearLayoutManager layoutManager =
@@ -465,14 +466,14 @@
 
         // String wouldn't fit in one line.
         ActionListItem item2 = new ActionListItem(mActivity);
-        item2.setBody(InstrumentationRegistry.getContext().getResources().getString(
+        item2.setBody(ApplicationProvider.getApplicationContext().getResources().getString(
                 R.string.over_uxr_text_length_limit));
 
         List<ActionListItem> items = Arrays.asList(item0, item1, item2);
         setupPagedListView(items);
 
         final int doubleLineHeight =
-                (int) InstrumentationRegistry.getContext().getResources().getDimension(
+                (int) ApplicationProvider.getApplicationContext().getResources().getDimension(
                         R.dimen.car_double_line_list_item_height);
 
         LinearLayoutManager layoutManager =
@@ -485,7 +486,7 @@
 
     @Test
     public void testPrimaryIconDrawable() {
-        Drawable drawable = InstrumentationRegistry.getContext().getResources().getDrawable(
+        Drawable drawable = ApplicationProvider.getApplicationContext().getResources().getDrawable(
                 android.R.drawable.sym_def_app_icon, null);
 
         ActionListItem item0 = new ActionListItem(mActivity);
@@ -553,7 +554,8 @@
         List<ActionListItem> items = Arrays.asList(item0, item1);
         setupPagedListView(items);
 
-        int expected = InstrumentationRegistry.getContext().getResources().getDimensionPixelSize(
+        int expected =
+                ApplicationProvider.getApplicationContext().getResources().getDimensionPixelSize(
                 R.dimen.car_keyline_1);
 
         ActionListItem.ViewHolder viewHolder = getViewHolderAtPosition(0);
@@ -567,7 +569,8 @@
 
     @Test
     public void testSmallPrimaryIconTopMarginRemainsTheSameRegardlessOfTextLength() {
-        final String longText = InstrumentationRegistry.getContext().getResources().getString(
+        final String longText =
+                ApplicationProvider.getApplicationContext().getResources().getString(
                 R.string.over_uxr_text_length_limit);
 
         // Single line item.
@@ -727,7 +730,7 @@
         // Custom binder interacts with body but has no effect.
         // Expect card height to remain single line.
         assertThat((double) viewHolder.itemView.getHeight(), is(closeTo(
-                InstrumentationRegistry.getContext().getResources().getDimension(
+                ApplicationProvider.getApplicationContext().getResources().getDimension(
                         R.dimen.car_single_line_list_item_height), 1.0d)));
     }
 

diff --git a/car/core/src/androidTest/java/androidx/car/widget/AlphaJumpPagedListViewTest.java b/car/core/src/androidTest/java/androidx/car/widget/AlphaJumpPagedListViewTest.java
index c8aca0f..44a55eb 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/AlphaJumpPagedListViewTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/AlphaJumpPagedListViewTest.java

@@ -33,9 +33,9 @@
 
 import androidx.car.test.R;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assume;
 import org.junit.Before;

diff --git a/car/core/src/androidTest/java/androidx/car/widget/CarToolbarTest.java b/car/core/src/androidTest/java/androidx/car/widget/CarToolbarTest.java
index 0bc7042..fa749cf 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/CarToolbarTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/CarToolbarTest.java

@@ -39,9 +39,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.car.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;

diff --git a/car/core/src/androidTest/java/androidx/car/widget/ColumnCardViewTest.java b/car/core/src/androidTest/java/androidx/car/widget/ColumnCardViewTest.java
index 03c629b..e1203fd 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/ColumnCardViewTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/ColumnCardViewTest.java

@@ -24,9 +24,9 @@
 import androidx.car.test.R;
 import androidx.car.util.ColumnCalculator;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/car/core/src/androidTest/java/androidx/car/widget/DividerVisibilityManagerTest.java b/car/core/src/androidTest/java/androidx/car/widget/DividerVisibilityManagerTest.java
index b655686..cb30645 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/DividerVisibilityManagerTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/DividerVisibilityManagerTest.java

@@ -33,10 +33,11 @@
 
 import androidx.car.test.R;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assume;
 import org.junit.Before;
@@ -107,7 +108,7 @@
                 mPagedListView.getRecyclerView().getLayoutManager();
 
         // Fetch divider height.
-        int dividerHeight = InstrumentationRegistry.getContext().getResources()
+        int dividerHeight = ApplicationProvider.getApplicationContext().getResources()
                 .getDimensionPixelSize(R.dimen.car_list_divider_height);
 
         // Initially, dividers are present between each two items.

diff --git a/car/core/src/androidTest/java/androidx/car/widget/ListItemAdapterTest.java b/car/core/src/androidTest/java/androidx/car/widget/ListItemAdapterTest.java
index fc767ca..5c28055 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/ListItemAdapterTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/ListItemAdapterTest.java

@@ -27,9 +27,9 @@
 
 import androidx.car.test.R;
 import androidx.car.uxrestrictions.CarUxRestrictions;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assume;
 import org.junit.Before;

diff --git a/car/core/src/androidTest/java/androidx/car/widget/PagedListViewSavedStateTest.java b/car/core/src/androidTest/java/androidx/car/widget/PagedListViewSavedStateTest.java
index 71c2416..15ad1d8 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/PagedListViewSavedStateTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/PagedListViewSavedStateTest.java

@@ -33,12 +33,12 @@
 import androidx.car.test.R;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.espresso.IdlingRegistry;
 import androidx.test.espresso.IdlingResource;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Matcher;
 import org.junit.After;

diff --git a/car/core/src/androidTest/java/androidx/car/widget/PagedListViewTest.java b/car/core/src/androidTest/java/androidx/car/widget/PagedListViewTest.java
index 9718c50..8b92b7d 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/PagedListViewTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/PagedListViewTest.java

@@ -52,15 +52,16 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.OrientationHelper;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.IdlingRegistry;
 import androidx.test.espresso.IdlingResource;
 import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -340,7 +341,7 @@
 
     @Test
     public void testDefaultScrollBarTopMargin() {
-        Resources res = InstrumentationRegistry.getContext().getResources();
+        Resources res = ApplicationProvider.getApplicationContext().getResources();
         int defaultTopMargin = res.getDimensionPixelSize(R.dimen.car_padding_4);
 
         // Just need enough items to ensure the scroll bar is showing.
@@ -400,7 +401,7 @@
 
         waitForIdleSync();
 
-        Resources res = InstrumentationRegistry.getContext().getResources();
+        Resources res = ApplicationProvider.getApplicationContext().getResources();
         int gutterSize = res.getDimensionPixelSize(R.dimen.car_margin);
 
         assertThat(mRecyclerViewLayoutParams.getMarginStart(), is(equalTo(gutterSize)));
@@ -418,7 +419,7 @@
         mActivityRule.runOnUiThread(() -> mPagedListView.setGutter(PagedListView.Gutter.END));
         waitForIdleSync();
 
-        Resources res = InstrumentationRegistry.getContext().getResources();
+        Resources res = ApplicationProvider.getApplicationContext().getResources();
         int gutterSize = res.getDimensionPixelSize(R.dimen.car_margin);
 
         assertThat(mRecyclerViewLayoutParams.getMarginStart(),
@@ -434,7 +435,7 @@
         mActivityRule.runOnUiThread(() -> mPagedListView.setGutter(PagedListView.Gutter.BOTH));
         waitForIdleSync();
 
-        Resources res = InstrumentationRegistry.getContext().getResources();
+        Resources res = ApplicationProvider.getApplicationContext().getResources();
         int gutterSize = res.getDimensionPixelSize(R.dimen.car_margin);
 
         assertThat(mRecyclerViewLayoutParams.getMarginStart(), is(equalTo(gutterSize)));
@@ -523,7 +524,7 @@
         // Just need enough items to ensure the scroll bar is showing.
         setUpPagedListView(ITEMS_PER_PAGE * 10);
 
-        Resources res = InstrumentationRegistry.getContext().getResources();
+        Resources res = ApplicationProvider.getApplicationContext().getResources();
         int defaultWidth = res.getDimensionPixelSize(R.dimen.car_margin);
 
         onView(withId(R.id.paged_scroll_view)).check(matches(withWidth(defaultWidth)));

diff --git a/car/core/src/androidTest/java/androidx/car/widget/RadioButtonListItemTest.java b/car/core/src/androidTest/java/androidx/car/widget/RadioButtonListItemTest.java
index a1a2b22..6174cf5 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/RadioButtonListItemTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/RadioButtonListItemTest.java

@@ -33,13 +33,13 @@
 import android.view.View;
 
 import androidx.car.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.contrib.RecyclerViewActions;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Matcher;
 import org.junit.Assume;
@@ -107,7 +107,7 @@
 
         setupPagedListView(Arrays.asList(item));
 
-        int expected = InstrumentationRegistry.getContext().getResources()
+        int expected = ApplicationProvider.getApplicationContext().getResources()
                 .getDimensionPixelSize(R.dimen.car_keyline_3);
         assertThat(getViewHolderAtPosition(0).getText().getLeft(), is(equalTo(expected)));
     }
@@ -122,7 +122,7 @@
 
         setupPagedListView(Arrays.asList(item));
 
-        int expected = InstrumentationRegistry.getContext().getResources()
+        int expected = ApplicationProvider.getApplicationContext().getResources()
                 .getDimensionPixelSize(R.dimen.car_keyline_3);
         assertThat(getViewHolderAtPosition(0).getText().getLeft(), is(equalTo(expected)));
     }
@@ -137,7 +137,7 @@
 
         setupPagedListView(Arrays.asList(item));
 
-        int expected = InstrumentationRegistry.getContext().getResources()
+        int expected = ApplicationProvider.getApplicationContext().getResources()
                 .getDimensionPixelSize(R.dimen.car_keyline_4);
         assertThat(getViewHolderAtPosition(0).getText().getLeft(), is(equalTo(expected)));
     }
@@ -161,7 +161,7 @@
 
         setupPagedListView(Arrays.asList(item));
 
-        int expected = InstrumentationRegistry.getContext().getResources()
+        int expected = ApplicationProvider.getApplicationContext().getResources()
                 .getDimensionPixelSize(R.dimen.car_keyline_1);
         assertThat(getViewHolderAtPosition(0).getText().getLeft(), is(equalTo(expected)));
     }
@@ -177,10 +177,10 @@
 
         setupPagedListView(Arrays.asList(item));
 
-        int margin = InstrumentationRegistry.getContext().getResources()
+        int margin = ApplicationProvider.getApplicationContext().getResources()
                 .getDimensionPixelSize(R.dimen.car_keyline_1);
         // Offset is determined by icon size - small icon uses keyline 3.
-        int offset = InstrumentationRegistry.getContext().getResources()
+        int offset = ApplicationProvider.getApplicationContext().getResources()
                 .getDimensionPixelSize(R.dimen.car_keyline_3);
         assertThat(getViewHolderAtPosition(0).getText().getLeft(), is(equalTo(offset + margin)));
     }

diff --git a/car/core/src/androidTest/java/androidx/car/widget/SeekbarListItemTest.java b/car/core/src/androidTest/java/androidx/car/widget/SeekbarListItemTest.java
index 67a812d..540d1f1 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/SeekbarListItemTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/SeekbarListItemTest.java

@@ -39,9 +39,9 @@
 import androidx.car.test.R;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Matcher;
 import org.junit.Assume;

diff --git a/car/core/src/androidTest/java/androidx/car/widget/SubheaderListItemTest.java b/car/core/src/androidTest/java/androidx/car/widget/SubheaderListItemTest.java
index 6771e82..5bd1bb4 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/SubheaderListItemTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/SubheaderListItemTest.java

@@ -28,9 +28,9 @@
 import android.content.pm.PackageManager;
 
 import androidx.car.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assume;
 import org.junit.Before;

diff --git a/car/core/src/androidTest/java/androidx/car/widget/TextListItemTest.java b/car/core/src/androidTest/java/androidx/car/widget/TextListItemTest.java
index c2f7fdd..fba44e8 100644
--- a/car/core/src/androidTest/java/androidx/car/widget/TextListItemTest.java
+++ b/car/core/src/androidTest/java/androidx/car/widget/TextListItemTest.java

@@ -52,12 +52,12 @@
 import androidx.car.test.R;
 import androidx.car.util.CarUxRestrictionsTestUtils;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.hamcrest.Matcher;
 import org.junit.Assume;
@@ -414,7 +414,7 @@
         for (int i = 0; i < items.size(); i++) {
             TextListItem.ViewHolder viewHolder = getViewHolderAtPosition(i);
 
-            int expected = InstrumentationRegistry.getContext().getResources()
+            int expected = ApplicationProvider.getApplicationContext().getResources()
                     .getDimensionPixelSize(expectedStartMargin.get(i));
             assertThat(((ViewGroup.MarginLayoutParams) viewHolder.getTitle().getLayoutParams())
                     .getMarginStart(), is(equalTo(expected)));
@@ -438,13 +438,14 @@
 
         // String wouldn't fit in one line.
         TextListItem item3 = new TextListItem(mActivity);
-        item3.setTitle(InstrumentationRegistry.getContext().getResources().getString(
+        item3.setTitle(ApplicationProvider.getApplicationContext().getResources().getString(
                 R.string.over_uxr_text_length_limit));
 
         List<TextListItem> items = Arrays.asList(item0, item1, item2, item3);
         setupPagedListView(items);
 
-        double singleLineHeight = InstrumentationRegistry.getContext().getResources().getDimension(
+        double singleLineHeight =
+                ApplicationProvider.getApplicationContext().getResources().getDimension(
                 R.dimen.car_single_line_list_item_height);
 
         LinearLayoutManager layoutManager =
@@ -467,14 +468,14 @@
 
         // String wouldn't fit in one line.
         TextListItem item2 = new TextListItem(mActivity);
-        item2.setBody(InstrumentationRegistry.getContext().getResources().getString(
+        item2.setBody(ApplicationProvider.getApplicationContext().getResources().getString(
                 R.string.over_uxr_text_length_limit));
 
         List<TextListItem> items = Arrays.asList(item0, item1, item2);
         setupPagedListView(items);
 
         final int doubleLineHeight =
-                (int) InstrumentationRegistry.getContext().getResources().getDimension(
+                (int) ApplicationProvider.getApplicationContext().getResources().getDimension(
                         R.dimen.car_double_line_list_item_height);
 
         LinearLayoutManager layoutManager =
@@ -487,7 +488,7 @@
 
     @Test
     public void testPrimaryIconDrawable() {
-        Drawable drawable = InstrumentationRegistry.getContext().getResources().getDrawable(
+        Drawable drawable = ApplicationProvider.getApplicationContext().getResources().getDrawable(
                 android.R.drawable.sym_def_app_icon, null);
 
         TextListItem item0 = new TextListItem(mActivity);
@@ -574,7 +575,8 @@
         List<TextListItem> items = Arrays.asList(item0, item1);
         setupPagedListView(items);
 
-        int expected = InstrumentationRegistry.getContext().getResources().getDimensionPixelSize(
+        int expected =
+                ApplicationProvider.getApplicationContext().getResources().getDimensionPixelSize(
                 R.dimen.car_keyline_1);
 
         TextListItem.ViewHolder viewHolder = getViewHolderAtPosition(0);
@@ -588,7 +590,8 @@
 
     @Test
     public void testSmallPrimaryIconTopMarginRemainsTheSameRegardlessOfTextLength() {
-        final String longText = InstrumentationRegistry.getContext().getResources().getString(
+        final String longText =
+                ApplicationProvider.getApplicationContext().getResources().getString(
                 R.string.over_uxr_text_length_limit);
 
         // Single line item.
@@ -761,7 +764,7 @@
         // Custom binder interacts with body but has no effect.
         // Expect card height to remain single line.
         assertThat((double) viewHolder.itemView.getHeight(), is(closeTo(
-                InstrumentationRegistry.getContext().getResources().getDimension(
+                ApplicationProvider.getApplicationContext().getResources().getDimension(
                         R.dimen.car_single_line_list_item_height), 1.0d)));
     }
 

diff --git a/car/moderator/build.gradle b/car/moderator/build.gradle
index be522b7..db6a3dd 100644
--- a/car/moderator/build.gradle
+++ b/car/moderator/build.gradle

@@ -26,12 +26,16 @@
     api(project(":annotation"))
     api(project(":core"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
 
     testImplementation(JUNIT)
+    testImplementation(TEST_EXT_JUNIT)
+    testImplementation(TEST_CORE)
     testImplementation(TEST_RUNNER)
     testImplementation(MOCKITO_CORE)
 

diff --git a/car/moderator/src/androidTest/java/androidx/car/moderator/ContentRateLimiterTest.java b/car/moderator/src/androidTest/java/androidx/car/moderator/ContentRateLimiterTest.java
index b1295df..9b6d7ca 100644
--- a/car/moderator/src/androidTest/java/androidx/car/moderator/ContentRateLimiterTest.java
+++ b/car/moderator/src/androidTest/java/androidx/car/moderator/ContentRateLimiterTest.java

@@ -22,8 +22,8 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/content/build.gradle b/content/build.gradle
index c2a5c78..5971918 100644
--- a/content/build.gradle
+++ b/content/build.gradle

@@ -27,6 +27,8 @@
     api(project(":core"))
 
     androidTestImplementation(JUNIT)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/content/src/androidTest/java/androidx/contentpager/content/ContentPagerTest.java b/content/src/androidTest/java/androidx/contentpager/content/ContentPagerTest.java
index 13b7938..e67db75 100644
--- a/content/src/androidTest/java/androidx/contentpager/content/ContentPagerTest.java
+++ b/content/src/androidTest/java/androidx/contentpager/content/ContentPagerTest.java

@@ -36,9 +36,9 @@
 
 import androidx.annotation.Nullable;
 import androidx.contentpager.content.ContentPager.ContentCallback;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/content/src/androidTest/java/androidx/contentpager/content/LoaderQueryRunnerTest.java b/content/src/androidTest/java/androidx/contentpager/content/LoaderQueryRunnerTest.java
index 1917cf8..51643a0 100644
--- a/content/src/androidTest/java/androidx/contentpager/content/LoaderQueryRunnerTest.java
+++ b/content/src/androidTest/java/androidx/contentpager/content/LoaderQueryRunnerTest.java

@@ -24,9 +24,9 @@
 
 import androidx.contentpager.content.ContentPager.ContentCallback;
 import androidx.contentpager.content.ContentPager.QueryRunner;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/content/src/androidTest/java/androidx/contentpager/content/QueryTest.java b/content/src/androidTest/java/androidx/contentpager/content/QueryTest.java
index ceaa3b3..67146aa 100644
--- a/content/src/androidTest/java/androidx/contentpager/content/QueryTest.java
+++ b/content/src/androidTest/java/androidx/contentpager/content/QueryTest.java

@@ -22,8 +22,8 @@
 import android.net.Uri;
 
 import androidx.contentpager.content.ContentPager.ContentCallback;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/coordinatorlayout/build.gradle b/coordinatorlayout/build.gradle
index e954569..63aaec0 100644
--- a/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/build.gradle

@@ -11,6 +11,8 @@
     api("androidx.core:core:1.1.0-alpha01")
     api("androidx.customview:customview:1.0.0")
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java
index ba51756..08c5827 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java

@@ -18,8 +18,8 @@
 
 import android.app.Activity;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.runner.RunWith;

diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentCompatTest.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentCompatTest.java
index 4b33e8a..4f09755 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentCompatTest.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentCompatTest.java

@@ -30,9 +30,9 @@
 import android.view.View;
 
 import androidx.core.view.ViewCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -109,7 +109,7 @@
     }
 
     private void setup(boolean behaviorIsV3) {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
 
         mSpyBehavior = spy(behaviorIsV3 ? new V3TestBehavior() : new NonV3TestBehavior());
         when(mSpyBehavior.onStartNestedScroll(

diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentTest.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentTest.java
index cff78ae..4f55c81 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentTest.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutNestedScrollingParentTest.java

@@ -29,9 +29,9 @@
 import android.view.View;
 
 import androidx.core.view.ViewCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -64,7 +64,7 @@
 
     @Before
     public void setup() {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
 
         mMockBehavior1 = setupMockBehavior();
         mMockBehavior2 = setupMockBehavior();

diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java
index eb22e0f..3a93ea2 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java

@@ -22,8 +22,8 @@
 import android.view.View;
 
 import androidx.coordinatorlayout.testutils.CoordinatorLayoutUtils;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Rule;

diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
index ec03fc0..6abc391 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java

@@ -16,10 +16,10 @@
 
 package androidx.coordinatorlayout.widget;
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.swipeUp;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -55,10 +55,10 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/core/build.gradle b/core/build.gradle
index b607b7b..71eaf37 100644
--- a/core/build.gradle
+++ b/core/build.gradle

@@ -14,6 +14,8 @@
     api(GUAVA_LISTENABLE_FUTURE)
     implementation("androidx.concurrent:concurrent-futures:1.0.0-alpha02")
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/core/ktx/build.gradle b/core/ktx/build.gradle
index 92b28c0..0d717d0 100644
--- a/core/ktx/build.gradle
+++ b/core/ktx/build.gradle

@@ -21,6 +21,8 @@
     api(project(":core"))
 
     androidTestImplementation(JUNIT)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(TRUTH)

diff --git a/core/ktx/src/androidTest/java/androidx/core/animation/AnimatorTest.kt b/core/ktx/src/androidTest/java/androidx/core/animation/AnimatorTest.kt
index 1da6d7a..148e864 100644
--- a/core/ktx/src/androidTest/java/androidx/core/animation/AnimatorTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/animation/AnimatorTest.kt

@@ -19,11 +19,11 @@
 import android.animation.Animator
 import android.animation.ObjectAnimator
 import android.view.View
-import androidx.test.InstrumentationRegistry
 import androidx.test.annotation.UiThreadTest
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.SmallTest
-import androidx.test.runner.AndroidJUnit4
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -32,7 +32,7 @@
 @RunWith(AndroidJUnit4::class)
 @SmallTest
 class AnimatorTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
     private val view = View(context)
 
     private lateinit var animator: Animator

diff --git a/core/ktx/src/androidTest/java/androidx/core/content/ContextTest.kt b/core/ktx/src/androidTest/java/androidx/core/content/ContextTest.kt
index 8db8ca4..0fb2adf 100644
--- a/core/ktx/src/androidTest/java/androidx/core/content/ContextTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/content/ContextTest.kt

@@ -17,17 +17,17 @@
 package androidx.core.content
 
 import android.content.ContextWrapper
-import androidx.test.InstrumentationRegistry
-import androidx.test.filters.SdkSuppress
 import androidx.core.ktx.test.R
 import androidx.core.getAttributeSet
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.filters.SdkSuppress
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue
 import org.junit.Test
 
 class ContextTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
 
     @SdkSuppress(minSdkVersion = 23)
     @Test fun systemService() {

diff --git a/core/ktx/src/androidTest/java/androidx/core/content/SharedPreferencesTest.kt b/core/ktx/src/androidTest/java/androidx/core/content/SharedPreferencesTest.kt
index 4afcf2d..50e9b59 100644
--- a/core/ktx/src/androidTest/java/androidx/core/content/SharedPreferencesTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/content/SharedPreferencesTest.kt

@@ -16,14 +16,14 @@
 
 package androidx.core.content
 
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SmallTest
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
 @SmallTest
 class SharedPreferencesTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
 
     @Test fun editApply() {
         val preferences = context.getSharedPreferences("prefs", 0)

diff --git a/core/ktx/src/androidTest/java/androidx/core/content/res/TypedArrayTest.kt b/core/ktx/src/androidTest/java/androidx/core/content/res/TypedArrayTest.kt
index 7808251..deab214 100644
--- a/core/ktx/src/androidTest/java/androidx/core/content/res/TypedArrayTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/content/res/TypedArrayTest.kt

@@ -17,18 +17,18 @@
 package androidx.core.content.res
 
 import android.graphics.Color
-import androidx.test.InstrumentationRegistry
+import androidx.core.getAttributeSet
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SdkSuppress
 import androidx.core.ktx.test.R
 import androidx.testutils.assertThrows
-import androidx.core.getAttributeSet
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
 
 class TypedArrayTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
 
     @Test fun boolean() {
         val attrs = context.getAttributeSet(R.layout.typed_array)

diff --git a/core/ktx/src/androidTest/java/androidx/core/database/sqlite/SQLiteDatabaseTest.kt b/core/ktx/src/androidTest/java/androidx/core/database/sqlite/SQLiteDatabaseTest.kt
index a53fd08..d155e91 100644
--- a/core/ktx/src/androidTest/java/androidx/core/database/sqlite/SQLiteDatabaseTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/database/sqlite/SQLiteDatabaseTest.kt

@@ -19,7 +19,7 @@
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SmallTest
 import androidx.testutils.assertThrows
 import org.junit.Assert.assertEquals
@@ -27,7 +27,7 @@
 
 @SmallTest
 class SQLiteDatabaseTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
     private val openHelper = object : SQLiteOpenHelper(context, null, null, 1) {
         override fun onCreate(db: SQLiteDatabase) {
             db.execSQL("CREATE TABLE test(name TEXT)")

diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/BitmapDrawableTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/BitmapDrawableTest.kt
index 73c5719..c077e65 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/BitmapDrawableTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/BitmapDrawableTest.kt

@@ -17,14 +17,14 @@
 package androidx.core.graphics.drawable
 
 import androidx.core.graphics.createBitmap
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SmallTest
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
 @SmallTest
 class BitmapDrawableTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
 
     @Test fun fromBitmap() {
         val b = createBitmap(1, 1)

diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/DrawableTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/DrawableTest.kt
index f6d5a09..9c011eb 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/DrawableTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/DrawableTest.kt

@@ -21,14 +21,14 @@
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.ColorDrawable
 import androidx.core.graphics.createBitmap
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SmallTest
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
 @SmallTest
 class DrawableTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
     private val resources = context.resources
 
     @Test fun bitmapDrawableNoSizeNoConfig() {

diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/IconTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/IconTest.kt
index ce17637..70ac3426 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/IconTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/IconTest.kt

@@ -23,7 +23,7 @@
 import android.graphics.drawable.Icon
 import androidx.core.graphics.createBitmap
 import androidx.core.net.toUri
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.SmallTest
 import org.junit.Assert.assertEquals
@@ -33,7 +33,7 @@
 @SdkSuppress(minSdkVersion = 26)
 @SmallTest
 class IconTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
 
     @Test fun fromBitmapAdaptive() {
         val density = context.resources.displayMetrics.density

diff --git a/core/ktx/src/androidTest/java/androidx/core/os/BundleTest.kt b/core/ktx/src/androidTest/java/androidx/core/os/BundleTest.kt
index be23df1..d4bf905 100644
--- a/core/ktx/src/androidTest/java/androidx/core/os/BundleTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/os/BundleTest.kt

@@ -22,7 +22,7 @@
 import android.util.Size
 import android.util.SizeF
 import android.view.View
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.SmallTest
 import androidx.testutils.assertThrows
@@ -133,11 +133,11 @@
 
     @Test fun bundleOfInvalid() {
         assertThrows<IllegalArgumentException> {
-            bundleOf("nope" to View(InstrumentationRegistry.getContext()))
+            bundleOf("nope" to View(ApplicationProvider.getApplicationContext() as android.content.Context))
         }.hasMessageThat().isEqualTo("Illegal value type android.view.View for key \"nope\"")
 
         assertThrows<IllegalArgumentException> {
-            bundleOf("nopes" to arrayOf(View(InstrumentationRegistry.getContext())))
+            bundleOf("nopes" to arrayOf(View(ApplicationProvider.getApplicationContext() as android.content.Context)))
         }.hasMessageThat().isEqualTo("Illegal value array type android.view.View for key \"nopes\"")
     }
 }

diff --git a/core/ktx/src/androidTest/java/androidx/core/os/HandlerTest.kt b/core/ktx/src/androidTest/java/androidx/core/os/HandlerTest.kt
index a475418..e8cc7e2 100644
--- a/core/ktx/src/androidTest/java/androidx/core/os/HandlerTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/os/HandlerTest.kt

@@ -22,9 +22,9 @@
 import android.os.SystemClock
 import android.os.TestLooperManager
 import androidx.annotation.RequiresApi
-import androidx.test.InstrumentationRegistry
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse

diff --git a/core/ktx/src/androidTest/java/androidx/core/os/PersistableBundleTest.kt b/core/ktx/src/androidTest/java/androidx/core/os/PersistableBundleTest.kt
index 41f5fb0..2213799 100644
--- a/core/ktx/src/androidTest/java/androidx/core/os/PersistableBundleTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/os/PersistableBundleTest.kt

@@ -17,7 +17,7 @@
 package androidx.core.os
 
 import android.view.View
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.SmallTest
 import androidx.testutils.assertThrows
@@ -77,11 +77,11 @@
 
     @Test fun persistableBundleOfInvalid() {
         assertThrows<IllegalArgumentException> {
-            persistableBundleOf("nope" to View(InstrumentationRegistry.getContext()))
+            persistableBundleOf("nope" to View(ApplicationProvider.getApplicationContext() as android.content.Context))
         }.hasMessageThat().isEqualTo("Illegal value type android.view.View for key \"nope\"")
 
         assertThrows<IllegalArgumentException> {
-            persistableBundleOf("nopes" to arrayOf(View(InstrumentationRegistry.getContext())))
+            persistableBundleOf("nopes" to arrayOf(View(ApplicationProvider.getApplicationContext() as android.content.Context)))
         }.hasMessageThat().isEqualTo("Illegal value array type android.view.View for key \"nopes\"")
     }
 }

diff --git a/core/ktx/src/androidTest/java/androidx/core/transition/TransitionTest.kt b/core/ktx/src/androidTest/java/androidx/core/transition/TransitionTest.kt
index 3a8ddd6..dff228c 100644
--- a/core/ktx/src/androidTest/java/androidx/core/transition/TransitionTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/transition/TransitionTest.kt

@@ -16,9 +16,6 @@
 
 package androidx.core.transition
 
-import androidx.test.InstrumentationRegistry
-import androidx.test.filters.SdkSuppress
-import androidx.test.rule.ActivityTestRule
 import android.transition.Fade
 import android.transition.Transition
 import android.transition.TransitionManager
@@ -27,6 +24,9 @@
 import android.widget.ImageView
 import androidx.core.TestActivity
 import androidx.core.ktx.test.R
+import androidx.test.filters.SdkSuppress
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule

diff --git a/core/ktx/src/androidTest/java/androidx/core/view/MenuTest.kt b/core/ktx/src/androidTest/java/androidx/core/view/MenuTest.kt
index fc68024..6e195ce 100644
--- a/core/ktx/src/androidTest/java/androidx/core/view/MenuTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/view/MenuTest.kt

@@ -19,7 +19,7 @@
 import android.view.Menu.NONE
 import android.view.MenuItem
 import android.widget.Toolbar
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.SmallTest
 import androidx.testutils.assertThrows
@@ -34,7 +34,8 @@
 @SdkSuppress(minSdkVersion = 21)
 @SmallTest
 class MenuTest {
-    private val menu = Toolbar(InstrumentationRegistry.getContext()).menu
+    private val menu =
+        Toolbar(ApplicationProvider.getApplicationContext() as android.content.Context).menu
 
     @Test fun get() {
         val item = menu.add("")

diff --git a/core/ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt b/core/ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt
index 5dda38d..d6b8505 100644
--- a/core/ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt

@@ -19,7 +19,7 @@
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.SmallTest
 import androidx.testutils.assertThrows
@@ -33,7 +33,7 @@
 
 @SmallTest
 class ViewGroupTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
     private val viewGroup = LinearLayout(context)
 
     @Test fun get() {

diff --git a/core/ktx/src/androidTest/java/androidx/core/view/ViewTest.kt b/core/ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
index 36ed8b4..6c72308 100644
--- a/core/ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/view/ViewTest.kt

@@ -24,7 +24,7 @@
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import androidx.core.ktx.test.R
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SmallTest
 import androidx.testutils.assertThrows
 import androidx.testutils.fail
@@ -36,7 +36,7 @@
 
 @SmallTest
 class ViewTest {
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
     private val view = View(context)
 
     @Test

diff --git a/core/ktx/src/androidTest/java/androidx/core/widget/TextViewTest.kt b/core/ktx/src/androidTest/java/androidx/core/widget/TextViewTest.kt
index dc04f6f..80eeb61 100644
--- a/core/ktx/src/androidTest/java/androidx/core/widget/TextViewTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/widget/TextViewTest.kt

@@ -17,10 +17,10 @@
 package androidx.core.widget
 
 import android.widget.TextView
-import androidx.test.InstrumentationRegistry
 import androidx.test.annotation.UiThreadTest
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
-import androidx.test.runner.AndroidJUnit4
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -30,7 +30,7 @@
 @SmallTest
 class TextViewTest {
 
-    private val context = InstrumentationRegistry.getContext()
+    private val context = ApplicationProvider.getApplicationContext() as android.content.Context
     private val view = TextView(context)
 
     @UiThreadTest

diff --git a/core/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java b/core/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java
index 5bac999..22d4b20 100644
--- a/core/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java
+++ b/core/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java

@@ -18,8 +18,8 @@
 
 import android.app.Activity;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/app/ActivityCompatTest.java b/core/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
index 27d2e8c..10f729d 100644
--- a/core/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/app/ActivityCompatTest.java

@@ -31,8 +31,8 @@
 
 import androidx.core.app.ActivityCompat.PermissionCompatDelegate;
 import androidx.core.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/app/ComponentActivityTest.java b/core/src/androidTest/java/androidx/core/app/ComponentActivityTest.java
index d6249e8..bb1a508 100644
--- a/core/src/androidTest/java/androidx/core/app/ComponentActivityTest.java
+++ b/core/src/androidTest/java/androidx/core/app/ComponentActivityTest.java

@@ -20,8 +20,8 @@
 
 import android.support.v4.BaseInstrumentationTestCase;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/app/DialogCompatTest.java b/core/src/androidTest/java/androidx/core/app/DialogCompatTest.java
index 7dec53f3..a4b07ed 100644
--- a/core/src/androidTest/java/androidx/core/app/DialogCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/app/DialogCompatTest.java

@@ -24,8 +24,8 @@
 import android.view.View;
 
 import androidx.core.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/app/FrameMetricsAggregatorTest.java b/core/src/androidTest/java/androidx/core/app/FrameMetricsAggregatorTest.java
index b06d9bd..2ea188c 100644
--- a/core/src/androidTest/java/androidx/core/app/FrameMetricsAggregatorTest.java
+++ b/core/src/androidTest/java/androidx/core/app/FrameMetricsAggregatorTest.java

@@ -25,11 +25,11 @@
 import android.os.Build;
 import android.util.SparseIntArray;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java b/core/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java
index c4d5a0f..2dd945a 100644
--- a/core/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java
+++ b/core/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java

@@ -32,9 +32,9 @@
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -66,7 +66,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @SuppressLint("BanParcelableUsage")

diff --git a/core/src/androidTest/java/androidx/core/app/NotificationCompatTest.java b/core/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
index 75fbb0a..049199c 100644
--- a/core/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/app/NotificationCompatTest.java

@@ -48,9 +48,9 @@
 import androidx.core.R;
 import androidx.core.app.NotificationCompat.MessagingStyle.Message;
 import androidx.core.graphics.drawable.IconCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/app/NotificationManagerCompatTest.java b/core/src/androidTest/java/androidx/core/app/NotificationManagerCompatTest.java
index 8c42972..d1819a4 100644
--- a/core/src/androidTest/java/androidx/core/app/NotificationManagerCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/app/NotificationManagerCompatTest.java

@@ -30,10 +30,10 @@
 import android.net.Uri;
 import android.os.Build;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -60,6 +60,7 @@
 
     /**
      * Generate unique ID for Channels and Groups to prevent conflicts between tests
+     *
      * @param type Type of ID. Channel, group or any string
      * @return Unique ID
      */
@@ -70,7 +71,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mPlatformNotificationManager = (NotificationManager) mContext.getSystemService(
                 Context.NOTIFICATION_SERVICE);
     }
@@ -81,8 +82,9 @@
 
         if (Build.VERSION.SDK_INT < 26) return;
 
-        NotificationManager notificationManager = (NotificationManager) InstrumentationRegistry
-                .getTargetContext().getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager notificationManager =
+                (NotificationManager) ApplicationProvider.getApplicationContext().getSystemService(
+                        Context.NOTIFICATION_SERVICE);
         if (notificationManager == null) return;
 
         List<NotificationChannel> channels = notificationManager.getNotificationChannels();

diff --git a/core/src/androidTest/java/androidx/core/app/PersonTest.java b/core/src/androidTest/java/androidx/core/app/PersonTest.java
index 029ee4c..10c8f72 100644
--- a/core/src/androidTest/java/androidx/core/app/PersonTest.java
+++ b/core/src/androidTest/java/androidx/core/app/PersonTest.java

@@ -25,9 +25,9 @@
 import android.os.PersistableBundle;
 
 import androidx.core.graphics.drawable.IconCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/app/RemoteActionCompatTest.java b/core/src/androidTest/java/androidx/core/app/RemoteActionCompatTest.java
index 64f640d..47da629 100644
--- a/core/src/androidTest/java/androidx/core/app/RemoteActionCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/app/RemoteActionCompatTest.java

@@ -24,9 +24,9 @@
 import android.support.v4.BaseInstrumentationTestCase;
 
 import androidx.core.graphics.drawable.IconCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,7 +44,8 @@
         IconCompat icon = IconCompat.createWithContentUri("content://test");
         String title = "title";
         String description = "description";
-        PendingIntent action = PendingIntent.getBroadcast(InstrumentationRegistry.getContext(), 0,
+        PendingIntent action = PendingIntent.getBroadcast(
+                ApplicationProvider.getApplicationContext(), 0,
                 new Intent("TESTACTION"), 0);
         RemoteActionCompat reference = new RemoteActionCompat(icon, title, description, action);
         reference.setEnabled(false);
@@ -65,7 +66,8 @@
         IconCompat icon = IconCompat.createWithContentUri("content://test");
         String title = "title";
         String description = "description";
-        PendingIntent action = PendingIntent.getBroadcast(InstrumentationRegistry.getContext(), 0,
+        PendingIntent action = PendingIntent.getBroadcast(
+                ApplicationProvider.getApplicationContext(), 0,
                 new Intent("TESTACTION"), 0);
         RemoteActionCompat reference = new RemoteActionCompat(icon, title, description, action);
         reference.setEnabled(false);

diff --git a/core/src/androidTest/java/androidx/core/app/RemoteInputTest.java b/core/src/androidTest/java/androidx/core/app/RemoteInputTest.java
index 8b4b158..01354fe 100644
--- a/core/src/androidTest/java/androidx/core/app/RemoteInputTest.java
+++ b/core/src/androidTest/java/androidx/core/app/RemoteInputTest.java

@@ -26,9 +26,9 @@
 import android.os.Bundle;
 import android.support.v4.BaseInstrumentationTestCase;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/content/FileProviderTest.java b/core/src/androidTest/java/androidx/core/content/FileProviderTest.java
index 63b00ec..61c01e7 100644
--- a/core/src/androidTest/java/androidx/core/content/FileProviderTest.java
+++ b/core/src/androidTest/java/androidx/core/content/FileProviderTest.java

@@ -31,9 +31,9 @@
 import android.os.Environment;
 
 import androidx.core.content.FileProvider.SimplePathStrategy;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -64,7 +64,7 @@
 
     @Before
     public void setup() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mResolver = mContext.getContentResolver();
     }
 

diff --git a/core/src/androidTest/java/androidx/core/content/MimeTypeFilterTest.java b/core/src/androidTest/java/androidx/core/content/MimeTypeFilterTest.java
index 235ae83..e2c6749 100644
--- a/core/src/androidTest/java/androidx/core/content/MimeTypeFilterTest.java
+++ b/core/src/androidTest/java/androidx/core/content/MimeTypeFilterTest.java

@@ -23,8 +23,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/content/PermissionCheckerTest.java b/core/src/androidTest/java/androidx/core/content/PermissionCheckerTest.java
index aaf1c9c..1c9e24e 100644
--- a/core/src/androidTest/java/androidx/core/content/PermissionCheckerTest.java
+++ b/core/src/androidTest/java/androidx/core/content/PermissionCheckerTest.java

@@ -21,9 +21,9 @@
 import android.Manifest;
 import android.content.Context;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +39,7 @@
 
     @Before
     public void setup() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @Test

diff --git a/core/src/androidTest/java/androidx/core/content/pm/PermissionInfoCompatTest.java b/core/src/androidTest/java/androidx/core/content/pm/PermissionInfoCompatTest.java
index def7e6f..6c92b88 100644
--- a/core/src/androidTest/java/androidx/core/content/pm/PermissionInfoCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/content/pm/PermissionInfoCompatTest.java

@@ -18,8 +18,8 @@
 
 import android.content.pm.PermissionInfo;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java b/core/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java
index ae888ec..94eb2ed 100644
--- a/core/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java

@@ -39,10 +39,10 @@
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -65,7 +65,7 @@
 
     @Before
     public void setup() {
-        mContext = spy(new ContextWrapper(InstrumentationRegistry.getContext()));
+        mContext = spy(new ContextWrapper(ApplicationProvider.getApplicationContext()));
         mAction = new Intent(Intent.ACTION_VIEW).setPackage(mContext.getPackageName());
 
         mBuilder = new ShortcutInfoCompat.Builder(mContext, TEST_SHORTCUT_ID)

diff --git a/core/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java b/core/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java
index 91d1ea2..711a825 100644
--- a/core/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java

@@ -49,10 +49,10 @@
 
 import androidx.core.app.TestActivity;
 import androidx.core.graphics.drawable.IconCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/content/res/ColorStateListInflaterCompatTest.java b/core/src/androidTest/java/androidx/core/content/res/ColorStateListInflaterCompatTest.java
index 08cab83..23d80c9 100644
--- a/core/src/androidTest/java/androidx/core/content/res/ColorStateListInflaterCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/content/res/ColorStateListInflaterCompatTest.java

@@ -27,9 +27,9 @@
 import android.graphics.Color;
 
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +47,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mResources = mContext.getResources();
     }
 

diff --git a/core/src/androidTest/java/androidx/core/content/res/ComplexColorCompatTest.java b/core/src/androidTest/java/androidx/core/content/res/ComplexColorCompatTest.java
index bccb813..3351d01 100644
--- a/core/src/androidTest/java/androidx/core/content/res/ComplexColorCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/content/res/ComplexColorCompatTest.java

@@ -29,9 +29,9 @@
 import android.graphics.Shader;
 
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +49,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mResources = mContext.getResources();
     }
 

diff --git a/core/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java b/core/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java
index f6f7bae..cc09f91 100644
--- a/core/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java

@@ -33,9 +33,9 @@
 
 import androidx.core.provider.FontRequest;
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/content/res/GradientColorInflaterCompatTest.java b/core/src/androidTest/java/androidx/core/content/res/GradientColorInflaterCompatTest.java
index c25f4fb..8b94e11 100644
--- a/core/src/androidTest/java/androidx/core/content/res/GradientColorInflaterCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/content/res/GradientColorInflaterCompatTest.java

@@ -28,9 +28,9 @@
 import android.graphics.SweepGradient;
 
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -48,7 +48,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mResources = mContext.getResources();
     }
 

diff --git a/core/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java b/core/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java
index a2d4e9a..98b7a2cc 100644
--- a/core/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java

@@ -36,8 +36,9 @@
 import androidx.core.provider.FontsContractCompat;
 import androidx.core.provider.MockFontProvider;
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -52,7 +53,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mResources = mContext.getResources();
         MockFontProvider.prepareFontFiles(mContext);
     }

diff --git a/core/src/androidTest/java/androidx/core/content/res/TypedArrayUtilsTest.java b/core/src/androidTest/java/androidx/core/content/res/TypedArrayUtilsTest.java
index ef0c81f..76bdedb 100644
--- a/core/src/androidTest/java/androidx/core/content/res/TypedArrayUtilsTest.java
+++ b/core/src/androidTest/java/androidx/core/content/res/TypedArrayUtilsTest.java

@@ -29,7 +29,7 @@
 import android.util.Xml;
 
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.SmallTest;
 
 import org.junit.Before;
@@ -55,7 +55,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mResources = mContext.getResources();
     }
 

diff --git a/core/src/androidTest/java/androidx/core/database/CursorWindowCompatTest.java b/core/src/androidTest/java/androidx/core/database/CursorWindowCompatTest.java
index a0ff3a8..1624a6b 100644
--- a/core/src/androidTest/java/androidx/core/database/CursorWindowCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/database/CursorWindowCompatTest.java

@@ -22,8 +22,8 @@
 import android.database.CursorWindow;
 import android.os.Build;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/database/sqlite/SQLiteCursorCompatTest.java b/core/src/androidTest/java/androidx/core/database/sqlite/SQLiteCursorCompatTest.java
index e610fac..6d64ccc 100644
--- a/core/src/androidTest/java/androidx/core/database/sqlite/SQLiteCursorCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/database/sqlite/SQLiteCursorCompatTest.java

@@ -24,8 +24,8 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQuery;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/graphics/ColorUtilsTest.java b/core/src/androidTest/java/androidx/core/graphics/ColorUtilsTest.java
index 1cc4bcf..73413be 100644
--- a/core/src/androidTest/java/androidx/core/graphics/ColorUtilsTest.java
+++ b/core/src/androidTest/java/androidx/core/graphics/ColorUtilsTest.java

@@ -26,9 +26,9 @@
 import android.graphics.Color;
 import android.graphics.ColorSpace;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java b/core/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java
index a93d0e4..d72374d 100644
--- a/core/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java

@@ -33,8 +33,8 @@
 import android.os.Build;
 
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java b/core/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java
index 5b63988..958af06 100644
--- a/core/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java

@@ -43,8 +43,8 @@
 import androidx.core.provider.FontsContractCompat;
 import androidx.core.provider.MockFontProvider;
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/core/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java b/core/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java
index e036721..245f6c5 100644
--- a/core/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java
+++ b/core/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java

@@ -24,8 +24,8 @@
 
 import androidx.annotation.RequiresApi;
 import androidx.core.provider.MockFontProvider;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java b/core/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java
index 74e697d..71fd47c 100644
--- a/core/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java

@@ -40,10 +40,10 @@
 
 import androidx.core.content.ContextCompat;
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.versionedparcelable.ParcelUtils;
 
 import org.junit.Test;
@@ -62,7 +62,7 @@
 @SmallTest
 public class IconCompatTest {
 
-    private Context mContext = InstrumentationRegistry.getContext();
+    private Context mContext = ApplicationProvider.getApplicationContext();
 
     private static void verifyClippedCircle(Bitmap bitmap, int fillColor, int size) {
         assertEquals(size, bitmap.getHeight());
@@ -108,7 +108,7 @@
 
     @Test
     public void testAddBitmapToShortcutIntent_badged() {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         Bitmap bitmap = Bitmap.createBitmap(200, 200, Bitmap.Config.ARGB_8888);
         bitmap.eraseColor(Color.RED);
         Intent intent = new Intent();
@@ -122,7 +122,7 @@
 
     @Test
     public void testAddResourceToShortcutIntent_badged() {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         Intent intent = new Intent();
 
         // No badge
@@ -147,7 +147,7 @@
         Bitmap bitmap = Bitmap.createBitmap(200, 200, Bitmap.Config.ARGB_8888);
         bitmap.eraseColor(Color.RED);
         IconCompat compat = IconCompat.createWithBitmap(bitmap);
-        Drawable d = compat.toIcon().loadDrawable(InstrumentationRegistry.getContext());
+        Drawable d = compat.toIcon().loadDrawable(ApplicationProvider.getApplicationContext());
         assertTrue(d instanceof BitmapDrawable);
         assertEquals(bitmap, ((BitmapDrawable) d).getBitmap());
     }
@@ -169,7 +169,7 @@
         Bitmap bitmap = Bitmap.createBitmap(200, 200, Bitmap.Config.ARGB_8888);
         bitmap.eraseColor(Color.GREEN);
         IconCompat compat = IconCompat.createWithAdaptiveBitmap(bitmap);
-        Drawable d = compat.toIcon().loadDrawable(InstrumentationRegistry.getContext());
+        Drawable d = compat.toIcon().loadDrawable(ApplicationProvider.getApplicationContext());
         if (Build.VERSION.SDK_INT >= 26) {
             assertTrue(d instanceof AdaptiveIconDrawable);
         } else {
@@ -196,7 +196,7 @@
         }
 
         IconCompat compat = IconCompat.createWithData(resultCopy, 20, bytes.length);
-        Drawable d = compat.toIcon().loadDrawable(InstrumentationRegistry.getContext());
+        Drawable d = compat.toIcon().loadDrawable(ApplicationProvider.getApplicationContext());
         assertTrue(d instanceof BitmapDrawable);
         assertTrue(bitmap.sameAs(((BitmapDrawable) d).getBitmap()));
     }
@@ -204,11 +204,11 @@
     @Test
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.M)
     public void testCreateWithResource() {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         Drawable original = context.getDrawable(R.drawable.test_drawable_red);
 
         IconCompat compat = IconCompat.createWithResource(context, R.drawable.test_drawable_red);
-        Drawable d = compat.toIcon().loadDrawable(InstrumentationRegistry.getContext());
+        Drawable d = compat.toIcon().loadDrawable(ApplicationProvider.getApplicationContext());
 
         // Drawables are same classes
         assertEquals(original.getClass(), d.getClass());

diff --git a/core/src/androidTest/java/androidx/core/math/MathUtilsTest.java b/core/src/androidTest/java/androidx/core/math/MathUtilsTest.java
index 55cc536..e9ddd16 100644
--- a/core/src/androidTest/java/androidx/core/math/MathUtilsTest.java
+++ b/core/src/androidTest/java/androidx/core/math/MathUtilsTest.java

@@ -18,8 +18,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/os/LocaleListCompatTest.java b/core/src/androidTest/java/androidx/core/os/LocaleListCompatTest.java
index c809ecb..f071c00 100644
--- a/core/src/androidTest/java/androidx/core/os/LocaleListCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/os/LocaleListCompatTest.java

@@ -28,9 +28,9 @@
 
 import android.os.Build;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/os/ParcelCompatTest.java b/core/src/androidTest/java/androidx/core/os/ParcelCompatTest.java
index 324a2ec..e1d273b 100644
--- a/core/src/androidTest/java/androidx/core/os/ParcelCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/os/ParcelCompatTest.java

@@ -21,8 +21,8 @@
 
 import android.os.Parcel;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/provider/FontRequestTest.java b/core/src/androidTest/java/androidx/core/provider/FontRequestTest.java
index 4110299..cbdae11 100644
--- a/core/src/androidTest/java/androidx/core/provider/FontRequestTest.java
+++ b/core/src/androidTest/java/androidx/core/provider/FontRequestTest.java

@@ -18,8 +18,8 @@
 
 import android.util.Base64;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java b/core/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java
index d0ec1a6..d53f84b 100644
--- a/core/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java

@@ -46,9 +46,9 @@
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.provider.FontsContractCompat.FontFamilyResult;
 import androidx.core.provider.FontsContractCompat.FontInfo;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/core/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java b/core/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java
index 64e635c..7b0387e 100644
--- a/core/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java
+++ b/core/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java

@@ -27,10 +27,10 @@
 import android.os.Process;
 
 import androidx.annotation.GuardedBy;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/telephony/mbms/MbmsHelperTest.java b/core/src/androidTest/java/androidx/core/telephony/mbms/MbmsHelperTest.java
index 55f8c9d..a25a398 100644
--- a/core/src/androidTest/java/androidx/core/telephony/mbms/MbmsHelperTest.java
+++ b/core/src/androidTest/java/androidx/core/telephony/mbms/MbmsHelperTest.java

@@ -28,10 +28,10 @@
 import android.os.LocaleList;
 import android.telephony.mbms.ServiceInfo;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -55,7 +55,7 @@
                 Locale.forLanguageTag("es-us"));
         ServiceInfo sampleService = makeServiceInfoWithLocales(
                 Locale.forLanguageTag("en-us"), Locale.forLanguageTag("es-us"));
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         context.getResources().getConfiguration().setLocales(userPreferredLocales);
         assertEquals(getServiceNameForLocale(Locale.forLanguageTag("es-us")),
                 MbmsHelper.getBestNameForService(context, sampleService));
@@ -70,7 +70,7 @@
                 Locale.forLanguageTag("es-us"));
         ServiceInfo sampleService = makeServiceInfoWithLocales(
                 Locale.forLanguageTag("en-us"), Locale.forLanguageTag("en-uk"));
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         context.getResources().getConfiguration().setLocales(userPreferredLocales);
 
         assertNull(MbmsHelper.getBestNameForService(context, sampleService));

diff --git a/core/src/androidTest/java/androidx/core/text/BidiFormatterTest.java b/core/src/androidTest/java/androidx/core/text/BidiFormatterTest.java
index 2b48cdf..fa222af 100644
--- a/core/src/androidTest/java/androidx/core/text/BidiFormatterTest.java
+++ b/core/src/androidTest/java/androidx/core/text/BidiFormatterTest.java

@@ -23,8 +23,8 @@
 import android.text.Spanned;
 import android.text.style.RelativeSizeSpan;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/text/IcuCompatTest.java b/core/src/androidTest/java/androidx/core/text/IcuCompatTest.java
index 73c9537..2b9efd6 100644
--- a/core/src/androidTest/java/androidx/core/text/IcuCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/text/IcuCompatTest.java

@@ -20,8 +20,8 @@
 
 import android.os.Build;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/text/PrecomputedTextCompatTest.java b/core/src/androidTest/java/androidx/core/text/PrecomputedTextCompatTest.java
index 4e36e59..02f9eeb 100644
--- a/core/src/androidTest/java/androidx/core/text/PrecomputedTextCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/text/PrecomputedTextCompatTest.java

@@ -36,9 +36,9 @@
 import android.text.style.TypefaceSpan;
 
 import androidx.core.text.PrecomputedTextCompat.Params;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/text/util/FindAddressTest.java b/core/src/androidTest/java/androidx/core/text/util/FindAddressTest.java
index 897694a..d1e098b 100644
--- a/core/src/androidTest/java/androidx/core/text/util/FindAddressTest.java
+++ b/core/src/androidTest/java/androidx/core/text/util/FindAddressTest.java

@@ -16,8 +16,8 @@
 
 package androidx.core.text.util;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java b/core/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java
index c9a06d2..e0caa0f 100644
--- a/core/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java

@@ -30,8 +30,8 @@
 import android.text.util.Linkify.TransformFilter;
 
 import androidx.core.util.PatternsCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/util/ObjectsCompatTest.java b/core/src/androidTest/java/androidx/core/util/ObjectsCompatTest.java
index 7c10019..65915b7 100644
--- a/core/src/androidTest/java/androidx/core/util/ObjectsCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/util/ObjectsCompatTest.java

@@ -20,8 +20,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/util/PatternsCompatTest.java b/core/src/androidTest/java/androidx/core/util/PatternsCompatTest.java
index 1ce218d..97225b2 100644
--- a/core/src/androidTest/java/androidx/core/util/PatternsCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/util/PatternsCompatTest.java

@@ -19,8 +19,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/view/AccessibilityDelegateCompatTest.java b/core/src/androidTest/java/androidx/core/view/AccessibilityDelegateCompatTest.java
index a5fa152..7d62b79 100644
--- a/core/src/androidTest/java/androidx/core/view/AccessibilityDelegateCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/AccessibilityDelegateCompatTest.java

@@ -52,9 +52,9 @@
 import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
 import androidx.core.view.accessibility.AccessibilityViewCommand;
 import androidx.core.view.accessibility.AccessibilityViewCommand.MoveAtGranularityArguments;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/view/DisplayCutoutCompatTest.java b/core/src/androidTest/java/androidx/core/view/DisplayCutoutCompatTest.java
index c30969a..027a6ed 100644
--- a/core/src/androidTest/java/androidx/core/view/DisplayCutoutCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/DisplayCutoutCompatTest.java

@@ -24,8 +24,8 @@
 
 import android.graphics.Rect;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/view/DragStartHelperTest.java b/core/src/androidTest/java/androidx/core/view/DragStartHelperTest.java
index 9d7a053..8d0ce23 100644
--- a/core/src/androidTest/java/androidx/core/view/DragStartHelperTest.java
+++ b/core/src/androidTest/java/androidx/core/view/DragStartHelperTest.java

@@ -36,15 +36,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.LargeTest;
-import androidx.test.filters.SmallTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.InOrder;

diff --git a/core/src/androidTest/java/androidx/core/view/GravityCompatTest.java b/core/src/androidTest/java/androidx/core/view/GravityCompatTest.java
index 91680a0..a3adf6a 100644
--- a/core/src/androidTest/java/androidx/core/view/GravityCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/GravityCompatTest.java

@@ -22,8 +22,8 @@
 import android.support.v4.testutils.TestUtils;
 import android.view.Gravity;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/view/MarginLayoutParamsCompatTest.java b/core/src/androidTest/java/androidx/core/view/MarginLayoutParamsCompatTest.java
index 6c4e67f..77676e7 100644
--- a/core/src/androidTest/java/androidx/core/view/MarginLayoutParamsCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/MarginLayoutParamsCompatTest.java

@@ -20,8 +20,8 @@
 import android.os.Build;
 import android.view.ViewGroup;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/view/NestedScrollingChildHelperTest.java b/core/src/androidTest/java/androidx/core/view/NestedScrollingChildHelperTest.java
index df8a002..4271c4d 100644
--- a/core/src/androidTest/java/androidx/core/view/NestedScrollingChildHelperTest.java
+++ b/core/src/androidTest/java/androidx/core/view/NestedScrollingChildHelperTest.java

@@ -31,9 +31,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -50,12 +50,12 @@
     @Before
     public void setup() {
         mNestedScrollingParentImpl =
-                spy(new NestedScrollingParentImpl(InstrumentationRegistry.getContext()));
+                spy(new NestedScrollingParentImpl(ApplicationProvider.getApplicationContext()));
         mNestedScrollingParentImpl.setLayoutParams(
                 new FrameLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
-        mNestedScrollingChild = spy(new View(InstrumentationRegistry.getContext()));
+        mNestedScrollingChild = spy(new View(ApplicationProvider.getApplicationContext()));
         mNestedScrollingChild.setLayoutParams(
                 new NestedScrollView.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));

diff --git a/core/src/androidTest/java/androidx/core/view/NestedScrollingHelperIntegrationTest.java b/core/src/androidTest/java/androidx/core/view/NestedScrollingHelperIntegrationTest.java
index e29807c..8129e2e 100644
--- a/core/src/androidTest/java/androidx/core/view/NestedScrollingHelperIntegrationTest.java
+++ b/core/src/androidTest/java/androidx/core/view/NestedScrollingHelperIntegrationTest.java

@@ -25,9 +25,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,9 +43,11 @@
 
     @Before
     public void setup() {
-        mNestedScrollingImpl3 = new NestedScrollingImpl3(InstrumentationRegistry.getContext());
-        mNestedScrollingImpl2 = new NestedScrollingImpl2(InstrumentationRegistry.getContext());
-        mNestedScrollingImpl = new NestedScrollingImpl(InstrumentationRegistry.getContext());
+        mNestedScrollingImpl3 = new NestedScrollingImpl3(
+                ApplicationProvider.getApplicationContext());
+        mNestedScrollingImpl2 = new NestedScrollingImpl2(
+                ApplicationProvider.getApplicationContext());
+        mNestedScrollingImpl = new NestedScrollingImpl(ApplicationProvider.getApplicationContext());
     }
 
     @Test

diff --git a/core/src/androidTest/java/androidx/core/view/NestedScrollingParentHelperTest.java b/core/src/androidTest/java/androidx/core/view/NestedScrollingParentHelperTest.java
index 4a2e003..f70323c 100644
--- a/core/src/androidTest/java/androidx/core/view/NestedScrollingParentHelperTest.java
+++ b/core/src/androidTest/java/androidx/core/view/NestedScrollingParentHelperTest.java

@@ -23,9 +23,9 @@
 import android.view.View;
 import android.widget.FrameLayout;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,7 +40,7 @@
 
     @Before
     public void setup() {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         mNestedScrollingParentHelper = new NestedScrollingParentHelper(new FrameLayout(context));
         mView = new View(context);
     }

diff --git a/core/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java b/core/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java
index 153f947..14f1c60 100644
--- a/core/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java

@@ -28,9 +28,9 @@
 
 import androidx.core.test.R;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/view/ViewCompatTest.java b/core/src/androidTest/java/androidx/core/view/ViewCompatTest.java
index 02d2661..1a223f7 100644
--- a/core/src/androidTest/java/androidx/core/view/ViewCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/ViewCompatTest.java

@@ -36,9 +36,9 @@
 
 import androidx.annotation.Nullable;
 import androidx.core.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java b/core/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java
index 644802a..a0054a2 100644
--- a/core/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java

@@ -26,9 +26,9 @@
 import android.view.ViewGroup;
 
 import androidx.core.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/view/ViewParentCompatTest.java b/core/src/androidTest/java/androidx/core/view/ViewParentCompatTest.java
index 523431b..a3c945f 100644
--- a/core/src/androidTest/java/androidx/core/view/ViewParentCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/ViewParentCompatTest.java

@@ -26,10 +26,10 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +44,7 @@
 
     @Before
     public void setup() {
-        mView = new View(InstrumentationRegistry.getContext());
+        mView = new View(ApplicationProvider.getApplicationContext());
     }
 
     @Test

diff --git a/core/src/androidTest/java/androidx/core/view/WindowInsetsCompatTest.java b/core/src/androidTest/java/androidx/core/view/WindowInsetsCompatTest.java
index 950c35f..1b7a8fd 100644
--- a/core/src/androidTest/java/androidx/core/view/WindowInsetsCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/WindowInsetsCompatTest.java

@@ -21,8 +21,8 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/core/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java b/core/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
index 61d1e8e..6b7746e 100644
--- a/core/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
+++ b/core/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java

@@ -24,9 +24,9 @@
 import android.view.accessibility.AccessibilityNodeInfo;
 
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/core/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java b/core/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java
index c00d11a..a33e05b 100644
--- a/core/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java
+++ b/core/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java

@@ -21,9 +21,9 @@
 import android.view.View;
 
 import androidx.core.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.PollingCheck;
 
 import org.junit.Before;

diff --git a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingChildTest.java b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingChildTest.java
index ca5422b..7efa3c6 100644
--- a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingChildTest.java
+++ b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingChildTest.java

@@ -40,9 +40,9 @@
 import androidx.core.view.NestedScrollingChild3;
 import androidx.core.view.NestedScrollingParent3;
 import androidx.core.view.ViewCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.Direction;
 import androidx.testutils.FlingData;
 import androidx.testutils.MotionEventData;
@@ -74,15 +74,16 @@
 
         // Create views
 
-        View child = new View(InstrumentationRegistry.getContext());
+        View child = new View(ApplicationProvider.getApplicationContext());
         child.setMinimumWidth(1000);
         child.setMinimumHeight(1100);
 
-        mNestedScrollView = new NestedScrollView(InstrumentationRegistry.getContext());
+        mNestedScrollView = new NestedScrollView(ApplicationProvider.getApplicationContext());
         mNestedScrollView.setMinimumWidth(1000);
         mNestedScrollView.setMinimumHeight(1000);
 
-        mParentSpy = Mockito.spy(new NestedScrollingSpyView(InstrumentationRegistry.getContext()));
+        mParentSpy = Mockito.spy(
+                new NestedScrollingSpyView(ApplicationProvider.getApplicationContext()));
         mParentSpy.setMinimumWidth(1000);
         mParentSpy.setMinimumHeight(1000);
 
@@ -159,7 +160,8 @@
         when(mParentSpy.onStartNestedScroll(any(View.class), any(View.class), anyInt(), anyInt()))
                 .thenReturn(true);
         int touchSlop =
-                ViewConfiguration.get(InstrumentationRegistry.getContext()).getScaledTouchSlop();
+                ViewConfiguration.get(
+                        ApplicationProvider.getApplicationContext()).getScaledTouchSlop();
         MotionEvent down = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 500, 500, 0);
         MotionEvent move =
                 MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 500, 300 - touchSlop, 0);
@@ -176,7 +178,8 @@
         when(mParentSpy.onStartNestedScroll(any(View.class), any(View.class), anyInt(), anyInt()))
                 .thenReturn(true);
         int touchSlop =
-                ViewConfiguration.get(InstrumentationRegistry.getContext()).getScaledTouchSlop();
+                ViewConfiguration.get(
+                        ApplicationProvider.getApplicationContext()).getScaledTouchSlop();
         MotionEvent down = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 500, 500, 0);
         MotionEvent move =
                 MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 500, 450 - touchSlop, 0);
@@ -201,7 +204,8 @@
         when(mParentSpy.onStartNestedScroll(any(View.class), any(View.class), anyInt(), anyInt()))
                 .thenReturn(true);
         int touchSlop =
-                ViewConfiguration.get(InstrumentationRegistry.getContext()).getScaledTouchSlop();
+                ViewConfiguration.get(
+                        ApplicationProvider.getApplicationContext()).getScaledTouchSlop();
         MotionEvent down = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 500, 500, 0);
         MotionEvent move =
                 MotionEvent.obtain(0, 100, MotionEvent.ACTION_MOVE, 500, 300, 0);
@@ -255,7 +259,7 @@
         when(mParentSpy.onStartNestedScroll(any(View.class), any(View.class), anyInt(), anyInt()))
                 .thenReturn(true);
 
-        final Context context = InstrumentationRegistry.getContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         FlingData flingData = SimpleGestureGeneratorKt.generateFlingData(context);
 
         final long firstDownTime = SystemClock.uptimeMillis();

diff --git a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParent2Test.java b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParent2Test.java
index 10b0552..756b3f4 100644
--- a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParent2Test.java
+++ b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParent2Test.java

@@ -39,9 +39,9 @@
 import androidx.core.view.NestedScrollingChild2;
 import androidx.core.view.NestedScrollingParent2;
 import androidx.core.view.ViewCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -61,9 +61,9 @@
 
     @Before
     public void instantiateMembers() {
-        mNestedScrollView = new NestedScrollView(InstrumentationRegistry.getContext());
-        mParent = spy(new NestedScrollingSpyView(InstrumentationRegistry.getContext()));
-        mChild = new View(InstrumentationRegistry.getContext());
+        mNestedScrollView = new NestedScrollView(ApplicationProvider.getApplicationContext());
+        mParent = spy(new NestedScrollingSpyView(ApplicationProvider.getApplicationContext()));
+        mChild = new View(ApplicationProvider.getApplicationContext());
     }
 
     @Test
@@ -514,7 +514,7 @@
     private void setupNestedScrollViewWithParentAndChild(int nestedScrollViewHeight,
             int childHeight) {
 
-        final ViewGroup viewGroup = new FrameLayout(InstrumentationRegistry.getContext());
+        final ViewGroup viewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
 
         mNestedScrollView.setLayoutParams(new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT, nestedScrollViewHeight));

diff --git a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParent3Test.java b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParent3Test.java
index 2503ff7..f4b3dc0 100644
--- a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParent3Test.java
+++ b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParent3Test.java

@@ -36,9 +36,9 @@
 import androidx.core.view.NestedScrollingChild3;
 import androidx.core.view.NestedScrollingParent3;
 import androidx.core.view.ViewCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -222,9 +222,9 @@
     @SuppressWarnings("SameParameterValue")
     private void setupNestedScrollViewWithChild(int nestedScrollViewHeight, int childHeight) {
 
-        mNestedScrollView = new NestedScrollView(InstrumentationRegistry.getContext());
+        mNestedScrollView = new NestedScrollView(ApplicationProvider.getApplicationContext());
 
-        mChild = new View(InstrumentationRegistry.getContext());
+        mChild = new View(ApplicationProvider.getApplicationContext());
         mChild.setMinimumHeight(childHeight);
         mChild.setLayoutParams(
                 new NestedScrollView.LayoutParams(
@@ -242,16 +242,16 @@
     private void setupNestedScrollViewWithParentAndChild(int parentHeight,
             int nestedScrollViewHeight, int childHeight) {
 
-        mParent = spy(new NestedScrollingSpyView(InstrumentationRegistry.getContext()));
+        mParent = spy(new NestedScrollingSpyView(ApplicationProvider.getApplicationContext()));
         mParent.setMinimumHeight(parentHeight);
 
-        mNestedScrollView = new NestedScrollView(InstrumentationRegistry.getContext());
+        mNestedScrollView = new NestedScrollView(ApplicationProvider.getApplicationContext());
         mNestedScrollView.setMinimumHeight(nestedScrollViewHeight);
         mNestedScrollView.setLayoutParams(
                 new ViewGroup.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT, nestedScrollViewHeight));
 
-        mChild = new View(InstrumentationRegistry.getContext());
+        mChild = new View(ApplicationProvider.getApplicationContext());
         mChild.setMinimumHeight(childHeight);
         mChild.setLayoutParams(
                 new NestedScrollView.LayoutParams(

diff --git a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewScrollingTest.java b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewScrollingTest.java
index dc8d752..050ae9a0 100644
--- a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewScrollingTest.java
+++ b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewScrollingTest.java

@@ -43,9 +43,9 @@
 import androidx.core.view.NestedScrollingChild3;
 import androidx.core.view.NestedScrollingParent3;
 import androidx.core.view.ViewCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.Direction;
 import androidx.testutils.SimpleGestureGeneratorKt;
 
@@ -95,7 +95,7 @@
         setup();
         attachToActivity();
 
-        final Context context = InstrumentationRegistry.getContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final int targetVelocity = (int)
                 Math.ceil(SimpleGestureGeneratorKt.generateFlingData(context).getVelocity() * 1000);
         final CountDownLatch countDownLatch = new CountDownLatch(1);
@@ -246,7 +246,7 @@
     public void fling_fullyParticipatesInNestedScrolling() throws Throwable {
         setup();
         attachToActivity();
-        final Context context = InstrumentationRegistry.getContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final int targetVelocity = (int)
                 Math.ceil(SimpleGestureGeneratorKt.generateFlingData(context).getVelocity() * 1000);
 

diff --git a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewTest.java b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewTest.java
index 89fa117..a6b9e414 100644
--- a/core/src/androidTest/java/androidx/core/widget/NestedScrollViewTest.java
+++ b/core/src/androidTest/java/androidx/core/widget/NestedScrollViewTest.java

@@ -26,9 +26,9 @@
 import android.view.KeyEvent;
 import android.view.View;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -304,7 +304,7 @@
     }
 
     private void setup(int childHeight) {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
 
         mChild = new View(context);
         mChild.setMinimumWidth(100);

diff --git a/core/src/androidTest/java/androidx/core/widget/ScrollerCompatTestBase.java b/core/src/androidTest/java/androidx/core/widget/ScrollerCompatTestBase.java
index 48fa072..0871282 100644
--- a/core/src/androidTest/java/androidx/core/widget/ScrollerCompatTestBase.java
+++ b/core/src/androidTest/java/androidx/core/widget/ScrollerCompatTestBase.java

@@ -22,9 +22,9 @@
 import android.util.Log;
 import android.view.animation.Interpolator;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,7 +45,7 @@
     protected void createScroller(Interpolator interpolator)
             throws NoSuchMethodException, IllegalAccessException, InvocationTargetException,
             InstantiationException {
-        mScroller = new ScrollerCompat(InstrumentationRegistry.getContext(), interpolator);
+        mScroller = new ScrollerCompat(ApplicationProvider.getApplicationContext(), interpolator);
     }
 
     @Test

diff --git a/customview/build.gradle b/customview/build.gradle
index 49bab6f..15bbf9c 100644
--- a/customview/build.gradle
+++ b/customview/build.gradle

@@ -11,6 +11,8 @@
     api(project(":core"))
 
     androidTestImplementation(JUNIT)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
 }

diff --git a/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java b/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java
index 409593c..aec280e 100644
--- a/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java
+++ b/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java

@@ -29,9 +29,9 @@
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.customview.test.R;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/dumb-tests/build.gradle b/dumb-tests/build.gradle
index 846295a..f26410b 100644
--- a/dumb-tests/build.gradle
+++ b/dumb-tests/build.gradle

@@ -22,6 +22,8 @@
 
 dependencies {
     testImplementation(JUNIT)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
 }

diff --git a/dumb-tests/src/androidTest/java/androidx/testinfra/dumbintegrationtest/DumbTest.java b/dumb-tests/src/androidTest/java/androidx/testinfra/dumbintegrationtest/DumbTest.java
index e14fb749..b12aad5 100644
--- a/dumb-tests/src/androidTest/java/androidx/testinfra/dumbintegrationtest/DumbTest.java
+++ b/dumb-tests/src/androidTest/java/androidx/testinfra/dumbintegrationtest/DumbTest.java

@@ -16,10 +16,10 @@
 
 package androidx.testinfra.dumbintegrationtest;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/dynamic-animation/build.gradle b/dynamic-animation/build.gradle
index 015290f..802fbef 100644
--- a/dynamic-animation/build.gradle
+++ b/dynamic-animation/build.gradle

@@ -11,6 +11,8 @@
     api(project(":collection"))
     api(project(":legacy-support-core-utils"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/dynamic-animation/ktx/build.gradle b/dynamic-animation/ktx/build.gradle
index 2a2e6cb..2511749 100644
--- a/dynamic-animation/ktx/build.gradle
+++ b/dynamic-animation/ktx/build.gradle

@@ -39,6 +39,8 @@
     api(project(":dynamicanimation"))
 
     androidTestImplementation(JUNIT)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(TRUTH)

diff --git a/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java b/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java
index 7e9b155..a00d048 100644
--- a/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java
+++ b/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java

@@ -31,10 +31,10 @@
 import androidx.dynamicanimation.animation.FloatPropertyCompat;
 import androidx.dynamicanimation.animation.FloatValueHolder;
 import androidx.dynamicanimation.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java b/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
index 84bd288..d436d02 100644
--- a/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
+++ b/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java

@@ -42,11 +42,11 @@
 import androidx.dynamicanimation.animation.SpringAnimation;
 import androidx.dynamicanimation.animation.SpringForce;
 import androidx.dynamicanimation.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index 253b91c..08bccb1 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle

@@ -24,6 +24,8 @@
 
     api(project(":core"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java
index ae41da7..a94d6c2 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java

@@ -27,7 +27,7 @@
 
 import androidx.core.graphics.PaintCompat;
 import androidx.emoji.util.TestString;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 
@@ -74,7 +74,7 @@
 
     @Parameterized.Parameters
     public static Collection<Object[]> data() throws IOException {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final InputStream inputStream = context.getAssets().open("emojis.txt");
         try {
             final BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java
index 61473d3..bd0e5ac 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java

@@ -34,10 +34,11 @@
 import android.graphics.Color;
 
 import androidx.emoji.util.TestString;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,7 +52,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @Test(expected = NullPointerException.class)

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java
index 9de5be3..6b7ffdf 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java

@@ -75,10 +75,10 @@
 
 import androidx.emoji.util.Emoji.EmojiMapping;
 import androidx.emoji.util.TestString;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java
index 57b7a37..47142fd 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java

@@ -32,11 +32,11 @@
 import androidx.emoji.test.R;
 import androidx.emoji.util.KeyboardUtil;
 import androidx.emoji.util.TestString;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.Suppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.PollingCheck;
 
 import org.junit.Before;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java
index 491711b..4f4b856 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java

@@ -31,11 +31,11 @@
 import android.widget.TextView;
 
 import androidx.emoji.util.TestString;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java
index c9156ca3..61a3f71 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java

@@ -29,9 +29,9 @@
 import android.graphics.Paint.FontMetricsInt;
 import android.text.TextPaint;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java
index 87e51de..5db5aa7 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java

@@ -53,10 +53,10 @@
 import androidx.core.provider.FontRequest;
 import androidx.core.provider.FontsContractCompat.FontFamilyResult;
 import androidx.core.provider.FontsContractCompat.FontInfo;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -82,7 +82,7 @@
 
     @Before
     public void setup() {
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mFontRequest = new FontRequest("authority", "package", "query",
                 new ArrayList<List<byte[]>>());
         mFontProviderHelper = mock(FontRequestEmojiCompatConfig.FontProviderHelper.class);

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java
index 9d344e5..614c6a9 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java

@@ -40,9 +40,9 @@
 import android.view.KeyEvent;
 
 import androidx.emoji.util.TestString;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java
index e7adb56..435384d 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java

@@ -23,10 +23,10 @@
 import static org.mockito.Mockito.verify;
 
 import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java
index 15e76bf..4be9a03 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java

@@ -18,9 +18,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java
index 80c7ca1..9676fc8 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java

@@ -35,9 +35,9 @@
 
 import androidx.emoji.util.Emoji;
 import androidx.emoji.util.TestString;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java b/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java
index 74ab9f6..944e929 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java

@@ -21,7 +21,7 @@
 
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -101,7 +101,7 @@
                     if (sMetadataRepo == null) {
                         try {
                             final AssetManager assetManager =
-                                    InstrumentationRegistry.getContext().getAssets();
+                                    ApplicationProvider.getApplicationContext().getAssets();
                             sMetadataRepo = MetadataRepo.create(assetManager,
                                     "NotoColorEmojiCompat.ttf");
                         } catch (Throwable e) {

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java
index a3afc15..9a3d61f 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java

@@ -15,9 +15,9 @@
  */
 package androidx.emoji.text;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java
index 594b7f93..c38cf2b 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java

@@ -30,10 +30,10 @@
 import android.view.inputmethod.InputConnection;
 import android.widget.EditText;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java
index 2a12407..79bed4a 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java

@@ -33,10 +33,10 @@
 import android.widget.EditText;
 
 import androidx.emoji.text.EmojiCompat;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +53,7 @@
     @Before
     public void setup() {
         EmojiCompat.reset(mock(EmojiCompat.class));
-        mEditText = new EditText(InstrumentationRegistry.getTargetContext());
+        mEditText = new EditText(ApplicationProvider.getApplicationContext());
         mEmojiEditTextHelper = new EmojiEditTextHelper(mEditText);
     }
 

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java
index 7f831da..faa4ad1 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java

@@ -30,12 +30,12 @@
 import androidx.emoji.text.TestActivity;
 import androidx.emoji.text.TestConfigBuilder;
 import androidx.emoji.util.TestString;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java
index b4a499a..31d8280 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java

@@ -31,8 +31,8 @@
 import androidx.emoji.text.EmojiMetadata;
 import androidx.emoji.text.EmojiSpan;
 import androidx.emoji.text.TypefaceEmojiSpan;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java
index ce0598c..9f9f404 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java

@@ -40,11 +40,11 @@
 
 import androidx.emoji.R;
 import androidx.emoji.text.EmojiCompat;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -70,7 +70,7 @@
     @Test
     @UiThreadTest
     public void testInflate() {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final EmojiExtractTextLayout layout = (EmojiExtractTextLayout) LayoutInflater.from(context)
                 .inflate(androidx.emoji.test.R.layout.extract_view, null);
 
@@ -90,7 +90,7 @@
     @Test
     @UiThreadTest
     public void testSetKeyListener_withNull() {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final EmojiExtractTextLayout layout = (EmojiExtractTextLayout) LayoutInflater.from(context)
                 .inflate(androidx.emoji.test.R.layout.extract_view, null);
 
@@ -105,7 +105,7 @@
     @Test
     @UiThreadTest
     public void testSetEmojiReplaceStrategy() {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
 
         final EmojiExtractTextLayout layout = (EmojiExtractTextLayout) LayoutInflater.from(context)
                 .inflate(androidx.emoji.test.R.layout.extract_view_with_attrs, null);
@@ -127,7 +127,7 @@
     @UiThreadTest
     @SdkSuppress(minSdkVersion = 19)
     public void testSetEmojiReplaceStrategyCallEmojiCompatWithCorrectStrategy() {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
 
         final EmojiExtractTextLayout layout = (EmojiExtractTextLayout) LayoutInflater.from(context)
                 .inflate(androidx.emoji.test.R.layout.extract_view_with_attrs, null);
@@ -152,7 +152,7 @@
     @Test
     @UiThreadTest
     public void testOnUpdateExtractingViews() {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final EmojiExtractTextLayout layout = (EmojiExtractTextLayout) LayoutInflater.from(context)
                 .inflate(androidx.emoji.test.R.layout.extract_view, null);
 
@@ -180,7 +180,7 @@
     @Test
     @UiThreadTest
     public void testOnUpdateExtractingViews_hidesAccessoriesIfNoAction() {
-        final Context context = InstrumentationRegistry.getTargetContext();
+        final Context context = ApplicationProvider.getApplicationContext();
         final EmojiExtractTextLayout layout = (EmojiExtractTextLayout) LayoutInflater.from(context)
                 .inflate(androidx.emoji.test.R.layout.extract_view, null);
 

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java
index 9b47fbf..77101b3 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java

@@ -42,10 +42,10 @@
 import androidx.emoji.text.TestConfigBuilder;
 import androidx.emoji.util.Emoji;
 import androidx.emoji.util.TestString;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java
index c4548f7..32d9068 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java

@@ -35,8 +35,8 @@
 import android.widget.TextView;
 
 import androidx.emoji.text.EmojiCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java
index 98cd6ef..6a01d13 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java

@@ -48,9 +48,9 @@
 import androidx.emoji.text.EmojiCompat;
 import androidx.emoji.text.TestConfigBuilder;
 import androidx.emoji.util.TestString;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java
index e387a9c..a1ec7ec 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java

@@ -24,10 +24,10 @@
 import android.text.method.TransformationMethod;
 import android.widget.TextView;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +42,7 @@
 
     @Before
     public void setup() {
-        mTextView = new TextView(InstrumentationRegistry.getTargetContext());
+        mTextView = new TextView(ApplicationProvider.getApplicationContext());
         mTextViewHelper = new EmojiTextViewHelper(mTextView);
     }
 

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java
index 733e246..f3d069a 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java

@@ -30,10 +30,10 @@
 import android.text.method.TransformationMethod;
 import android.widget.TextView;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -50,7 +50,7 @@
 
     @Before
     public void setup() {
-        mTextView = new TextView(InstrumentationRegistry.getTargetContext());
+        mTextView = new TextView(ApplicationProvider.getApplicationContext());
         mTextViewHelper = new EmojiTextViewHelper(mTextView);
     }
 

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java
index 3e6607a..89c841f 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java

@@ -32,8 +32,8 @@
 import android.widget.EditText;
 
 import androidx.emoji.text.EmojiCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java
index 014b3ef..1b23687 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java

@@ -36,8 +36,8 @@
 import android.view.View;
 
 import androidx.emoji.text.EmojiCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java
index db48ebc..302957c 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java

@@ -40,8 +40,8 @@
 import android.text.style.QuoteSpan;
 
 import androidx.emoji.text.EmojiSpan;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/exifinterface/build.gradle b/exifinterface/build.gradle
index df7161f..c3c9027 100644
--- a/exifinterface/build.gradle
+++ b/exifinterface/build.gradle

@@ -9,6 +9,8 @@
 dependencies {
     api(project(":annotation"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
 }
 

diff --git a/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java b/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java
index 3100bda..b2a01ef 100644
--- a/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java
+++ b/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java

@@ -16,7 +16,7 @@
 
 package androidx.exifinterface.media;
 
-import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -31,9 +31,9 @@
 import android.util.Pair;
 
 import androidx.exifinterface.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
@@ -310,7 +310,8 @@
             InputStream inputStream = null;
             FileOutputStream outputStream = null;
             try {
-                inputStream = getContext().getResources().openRawResource(IMAGE_RESOURCES[i]);
+                inputStream = getApplicationContext()
+                        .getResources().openRawResource(IMAGE_RESOURCES[i]);
                 outputStream = new FileOutputStream(outputPath);
                 copy(inputStream, outputStream);
             } finally {
@@ -816,7 +817,7 @@
     private void testExifInterfaceForJpeg(String fileName, int typedArrayResourceId)
             throws IOException {
         ExpectedValue expectedValue = new ExpectedValue(
-                getContext().getResources().obtainTypedArray(typedArrayResourceId));
+                getApplicationContext().getResources().obtainTypedArray(typedArrayResourceId));
 
         // Test for reading from external data storage.
         testExifInterfaceCommon(fileName, expectedValue);
@@ -828,7 +829,7 @@
     private void testExifInterfaceForRaw(String fileName, int typedArrayResourceId)
             throws IOException {
         ExpectedValue expectedValue = new ExpectedValue(
-                getContext().getResources().obtainTypedArray(typedArrayResourceId));
+                getApplicationContext().getResources().obtainTypedArray(typedArrayResourceId));
 
         // Test for reading from external data storage.
         testExifInterfaceCommon(fileName, expectedValue);

diff --git a/fragment/build.gradle b/fragment/build.gradle
index ad02cca..eb1f7db 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle

@@ -22,6 +22,8 @@
     api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive)
 
     androidTestImplementation(KOTLIN_STDLIB)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(TRUTH)

diff --git a/fragment/ktx/build.gradle b/fragment/ktx/build.gradle
index 21eae11e..b150f6a 100644
--- a/fragment/ktx/build.gradle
+++ b/fragment/ktx/build.gradle

@@ -41,6 +41,8 @@
     api(KOTLIN_STDLIB)
     androidTestImplementation(JUNIT)
     androidTestImplementation(TRUTH)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
 }

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/BackStackStateTest.kt b/fragment/src/androidTest/java/androidx/fragment/app/BackStackStateTest.kt
index 7039851..ba3226f 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/BackStackStateTest.kt
+++ b/fragment/src/androidTest/java/androidx/fragment/app/BackStackStateTest.kt

@@ -18,9 +18,9 @@
 
 import android.os.Parcel
 import androidx.fragment.app.test.EmptyFragmentTestActivity
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import org.junit.Rule
 import org.junit.Test

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/ChildFragmentStateTest.java b/fragment/src/androidTest/java/androidx/fragment/app/ChildFragmentStateTest.java
index 21e8bc4..d5ace4d 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/ChildFragmentStateTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/ChildFragmentStateTest.java

@@ -22,9 +22,9 @@
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.app.test.FragmentTestActivity.ParentFragment;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentTest.java
index ce264b1..86134c4 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentTest.java

@@ -31,10 +31,10 @@
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.java
index 0f1f4cd..e623238 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.java

@@ -42,10 +42,10 @@
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimatorTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimatorTest.java
index 4c08a34..d01ca55 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimatorTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimatorTest.java

@@ -35,9 +35,9 @@
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.java
index 2d61243..b4f813f 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.java

@@ -25,9 +25,9 @@
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assert;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentFactoryTest.kt b/fragment/src/androidTest/java/androidx/fragment/app/FragmentFactoryTest.kt
index 12f6404..ca00e0e 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentFactoryTest.kt
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentFactoryTest.kt

@@ -23,9 +23,9 @@
 import androidx.fragment.app.test.EmptyFragmentTestActivity
 import androidx.fragment.test.R
 import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentLifecycleTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentLifecycleTest.java
index 229d22e..1ff391d 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentLifecycleTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentLifecycleTest.java

@@ -57,12 +57,12 @@
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.ViewModelStore;
 import androidx.lifecycle.ViewModelStoreOwner;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Assert;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerNonConfigTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerNonConfigTest.java
index b258e6c..b65b191 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerNonConfigTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerNonConfigTest.java

@@ -23,10 +23,10 @@
 import android.os.Build;
 
 import androidx.fragment.app.test.NonConfigOnStopActivity;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.FragmentActivityUtils;
 
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerViewModelTest.kt b/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerViewModelTest.kt
index 99872fb..c4fecf0 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerViewModelTest.kt
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerViewModelTest.kt

@@ -17,8 +17,8 @@
 package androidx.fragment.app
 
 import androidx.lifecycle.ViewModelStore
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
-import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import org.junit.Before
 import org.junit.Test

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.java
index 455cda8..0d32067 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.java

@@ -33,10 +33,10 @@
 import androidx.fragment.app.test.FragmentResultActivity;
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReorderingTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReorderingTest.java
index 6516ae6..a2597f9 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReorderingTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReorderingTest.java

@@ -26,11 +26,11 @@
 
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReplaceTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReplaceTest.java
index 91ea333..217f236 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReplaceTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReplaceTest.java

@@ -27,10 +27,10 @@
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.app.test.FragmentTestActivity.TestFragment;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentSavedStateRegistryTest.kt b/fragment/src/androidTest/java/androidx/fragment/app/FragmentSavedStateRegistryTest.kt
index e61f66e..0a2021f 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentSavedStateRegistryTest.kt
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentSavedStateRegistryTest.kt

@@ -22,9 +22,9 @@
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.savedstate.SavedStateRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import androidx.testutils.FragmentActivityUtils.recreateActivity
 import androidx.testutils.RecreatedActivity
 import com.google.common.truth.Truth.assertThat

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTest.java
index d7bbed1..25c99ee 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTest.java

@@ -32,14 +32,14 @@
 import androidx.annotation.RequiresApi;
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.java
index 9de64fe..f220673 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.java

@@ -29,7 +29,7 @@
 import android.view.animation.Animation;
 
 import androidx.fragment.app.test.FragmentTestActivity;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import java.lang.ref.WeakReference;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransactionTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransactionTest.java
index d095bff..2ca285b 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransactionTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransactionTest.java

@@ -36,11 +36,11 @@
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.app.test.NewIntentActivity;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Assert;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.java
index aab49d6..04cb401 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.java

@@ -33,9 +33,9 @@
 import androidx.core.app.SharedElementCallback;
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.After;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewLifecycleTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewLifecycleTest.java
index fd96d7f..f5645f4 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewLifecycleTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewLifecycleTest.java

@@ -39,9 +39,9 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewTests.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewTests.java
index d958e39..3673399 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewTests.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewTests.java

@@ -32,10 +32,10 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/HangingFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/HangingFragmentTest.java
index b7487e2..431dafe 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/HangingFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/HangingFragmentTest.java

@@ -17,9 +17,9 @@
 package androidx.fragment.app;
 
 import androidx.fragment.app.test.HangingFragmentActivity;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.FragmentActivityUtils;
 
 import org.junit.Assert;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/LoaderTest.java b/fragment/src/androidTest/java/androidx/fragment/app/LoaderTest.java
index fa9391b..475dcec 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/LoaderTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/LoaderTest.java

@@ -33,10 +33,10 @@
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.AsyncTaskLoader;
 import androidx.loader.content.Loader;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.testutils.FragmentActivityUtils;
 import androidx.testutils.RecreatedActivity;
 

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentRestoreTest.java b/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentRestoreTest.java
index 585e339..543345c 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentRestoreTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentRestoreTest.java

@@ -27,9 +27,9 @@
 import androidx.fragment.app.test.FragmentTestActivity.ChildFragment;
 import androidx.fragment.app.test.FragmentTestActivity.ChildFragment.OnAttachListener;
 import androidx.fragment.app.test.FragmentTestActivity.ParentFragment;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.java
index b2d26b9..cab44cc 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.java

@@ -28,11 +28,11 @@
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.app.test.FragmentTestActivity.ChildFragment;
 import androidx.fragment.app.test.FragmentTestActivity.ParentFragment;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/NestedInflatedFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/NestedInflatedFragmentTest.java
index 3c5d351..a77e21f 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/NestedInflatedFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/NestedInflatedFragmentTest.java

@@ -27,9 +27,9 @@
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/OnBackPressedCallbackTest.kt b/fragment/src/androidTest/java/androidx/fragment/app/OnBackPressedCallbackTest.kt
index ab778b3..8de0f09 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/OnBackPressedCallbackTest.kt
+++ b/fragment/src/androidTest/java/androidx/fragment/app/OnBackPressedCallbackTest.kt

@@ -19,9 +19,9 @@
 import androidx.fragment.app.test.FragmentTestActivity
 import androidx.fragment.test.R
 import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
 import org.junit.Rule

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.java b/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.java
index 1a52b437..80a3208 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.java

@@ -33,11 +33,11 @@
 
 import androidx.fragment.app.test.FragmentTestActivity;
 import androidx.fragment.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/PrimaryNavFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/PrimaryNavFragmentTest.java
index 3288c68..a284225 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/PrimaryNavFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/PrimaryNavFragmentTest.java

@@ -23,9 +23,9 @@
 import static org.junit.Assert.assertTrue;
 
 import androidx.fragment.app.test.EmptyFragmentTestActivity;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/SafeTransactionInOnResumeTest.kt b/fragment/src/androidTest/java/androidx/fragment/app/SafeTransactionInOnResumeTest.kt
index fc6d741..80e926d 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/SafeTransactionInOnResumeTest.kt
+++ b/fragment/src/androidTest/java/androidx/fragment/app/SafeTransactionInOnResumeTest.kt

@@ -20,9 +20,9 @@
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTest.java b/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTest.java
index f678f5f..09807d0 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTest.java

@@ -32,11 +32,11 @@
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTestInTransaction.java b/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTestInTransaction.java
index 5c6eca8..b131559 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTestInTransaction.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTestInTransaction.java

@@ -27,9 +27,9 @@
 import androidx.fragment.app.test.TestViewModel;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/fragment/testing/build.gradle b/fragment/testing/build.gradle
index d6c5ae0..330608f 100644
--- a/fragment/testing/build.gradle
+++ b/fragment/testing/build.gradle

@@ -39,9 +39,13 @@
     api(TEST_CORE)
     api(KOTLIN_STDLIB)
     androidTestImplementation(KOTLIN_STDLIB)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
+    androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TRUTH)
 }
 

diff --git a/fragment/testing/src/main/java/androidx/fragment/app/testing/FragmentScenario.java b/fragment/testing/src/main/java/androidx/fragment/app/testing/FragmentScenario.java
index 26c8ce0..5d691bf 100644
--- a/fragment/testing/src/main/java/androidx/fragment/app/testing/FragmentScenario.java
+++ b/fragment/testing/src/main/java/androidx/fragment/app/testing/FragmentScenario.java

@@ -45,7 +45,7 @@
  * framework.
  * <p>
  * FragmentScenario only supports {@link androidx.fragment.app.Fragment}. If you are using a
- * deprecated fragment class such as {@link android.support.v4.app.Fragment} or
+ * deprecated fragment class such as {@code android.support.v4.app.Fragment} or
  * {@link android.app.Fragment}, please update your code to {@link androidx.fragment.app.Fragment}.
  *
  * @param <F> The Fragment class being tested

diff --git a/graphics/drawable/animated/build.gradle b/graphics/drawable/animated/build.gradle
index e983e40..e0dd10b 100644
--- a/graphics/drawable/animated/build.gradle
+++ b/graphics/drawable/animated/build.gradle

@@ -10,6 +10,8 @@
     api(project(":vectordrawable"))
     implementation(project(":interpolator"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableParameterizedTest.java b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableParameterizedTest.java
index 8eba076..b16e820 100644
--- a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableParameterizedTest.java
+++ b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableParameterizedTest.java

@@ -16,8 +16,7 @@
 
 package androidx.vectordrawable.graphics.drawable.tests;
 
-import static androidx.vectordrawable.graphics.drawable.tests.DrawableUtils
-        .saveVectorDrawableIntoPNG;
+import static androidx.vectordrawable.graphics.drawable.tests.DrawableUtils.saveVectorDrawableIntoPNG;
 
 import static org.junit.Assert.assertTrue;
 
@@ -27,8 +26,8 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback;
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;

diff --git a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableTest.java b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableTest.java
index cff67fd..a7e7b8f 100644
--- a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableTest.java
+++ b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableTest.java

@@ -16,8 +16,7 @@
 
 package androidx.vectordrawable.graphics.drawable.tests;
 
-import static androidx.vectordrawable.graphics.drawable.tests.DrawableUtils
-        .saveVectorDrawableIntoPNG;
+import static androidx.vectordrawable.graphics.drawable.tests.DrawableUtils.saveVectorDrawableIntoPNG;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -41,11 +40,11 @@
 
 import androidx.annotation.DrawableRes;
 import androidx.core.view.ViewCompat;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback;
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
 import androidx.vectordrawable.test.R;

diff --git a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorParameterizedTest.java b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorParameterizedTest.java
index cdefa4c..f378df2 100644
--- a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorParameterizedTest.java
+++ b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorParameterizedTest.java

@@ -16,16 +16,15 @@
 
 package androidx.vectordrawable.graphics.drawable.tests;
 
-import static androidx.vectordrawable.graphics.drawable.tests.DrawableUtils
-        .saveVectorDrawableIntoPNG;
+import static androidx.vectordrawable.graphics.drawable.tests.DrawableUtils.saveVectorDrawableIntoPNG;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;

diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index e8e2b1d..2dc3d55 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle

@@ -10,6 +10,8 @@
     api("androidx.annotation:annotation:1.0.0")
     api(project(":core"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
 }

diff --git a/graphics/drawable/static/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/VectorDrawableTest.java b/graphics/drawable/static/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/VectorDrawableTest.java
index 4ab9c6f..4e42e7b8 100644
--- a/graphics/drawable/static/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/VectorDrawableTest.java
+++ b/graphics/drawable/static/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/VectorDrawableTest.java

@@ -42,9 +42,9 @@
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import androidx.vectordrawable.test.R;
 
@@ -239,7 +239,7 @@
         mBitmap = Bitmap.createBitmap(IMAGE_WIDTH, IMAGE_HEIGHT, ARGB_8888);
         mCanvas = new Canvas(mBitmap);
 
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
         mResources = mContext.getResources();
         mTheme = mContext.getTheme();
         mTheme.applyStyle(R.style.VectorDrawableTestTheme, true);

diff --git a/gridlayout/build.gradle b/gridlayout/build.gradle
index c1ba369..1acf0e3 100644
--- a/gridlayout/build.gradle
+++ b/gridlayout/build.gradle

@@ -9,6 +9,8 @@
 dependencies {
     api(project(":core"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java b/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
index 6678909..888e61a 100644
--- a/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
+++ b/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java

@@ -29,10 +29,10 @@
 import android.view.ViewGroup;
 
 import androidx.gridlayout.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/heifwriter/build.gradle b/heifwriter/build.gradle
index d7d1f58..a7193e0 100644
--- a/heifwriter/build.gradle
+++ b/heifwriter/build.gradle

@@ -15,6 +15,8 @@
 dependencies {
     api(project(":annotation"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/heifwriter/src/androidTest/java/androidx/heifwriter/HeifWriterTest.java b/heifwriter/src/androidTest/java/androidx/heifwriter/HeifWriterTest.java
index ef9e598..daf6db4 100644
--- a/heifwriter/src/androidTest/java/androidx/heifwriter/HeifWriterTest.java
+++ b/heifwriter/src/androidTest/java/androidx/heifwriter/HeifWriterTest.java

@@ -19,7 +19,7 @@
 import static androidx.heifwriter.HeifWriter.INPUT_MODE_BITMAP;
 import static androidx.heifwriter.HeifWriter.INPUT_MODE_BUFFER;
 import static androidx.heifwriter.HeifWriter.INPUT_MODE_SURFACE;
-import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -43,9 +43,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.heifwriter.test.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.GrantPermissionRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
@@ -122,7 +122,8 @@
             InputStream inputStream = null;
             FileOutputStream outputStream = null;
             try {
-                inputStream = getContext().getResources().openRawResource(IMAGE_RESOURCES[i]);
+                inputStream = getApplicationContext()
+                        .getResources().openRawResource(IMAGE_RESOURCES[i]);
                 outputStream = new FileOutputStream(outputPath);
                 copy(inputStream, outputStream);
             } finally {

diff --git a/leanback/build.gradle b/leanback/build.gradle
index 1d4b834..525cb43 100644
--- a/leanback/build.gradle
+++ b/leanback/build.gradle

@@ -13,6 +13,8 @@
     api(project(":fragment"))
     api(project(":recyclerview"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/BackgroundManagerTest.java b/leanback/src/androidTest/java/androidx/leanback/app/BackgroundManagerTest.java
index 861cd3d..c0a48f0 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/BackgroundManagerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/BackgroundManagerTest.java

@@ -31,8 +31,8 @@
 import android.os.Bundle;
 
 import androidx.leanback.testutils.PollingCheck;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTest.java
index 8c644d2..fa05492 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTest.java

@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import android.app.Fragment;
 import android.app.Instrumentation;
 import android.content.Intent;
 import android.os.Build;
@@ -37,7 +38,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.app.Fragment;
 import androidx.leanback.testutils.PollingCheck;
 import androidx.leanback.widget.ArrayObjectAdapter;
 import androidx.leanback.widget.ItemBridgeAdapter;
@@ -46,10 +46,10 @@
 import androidx.leanback.widget.Row;
 import androidx.leanback.widget.RowPresenter;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/BrowseSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/BrowseSupportFragmentTest.java
index ccc3ccc..72dc227 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/BrowseSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/BrowseSupportFragmentTest.java

@@ -43,10 +43,10 @@
 import androidx.leanback.widget.Row;
 import androidx.leanback.widget.RowPresenter;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/DetailsFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/DetailsFragmentTest.java
index 2ff6634..0083f40 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/DetailsFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/DetailsFragmentTest.java

@@ -24,6 +24,7 @@
 import static org.junit.Assert.assertTrue;
 
 import android.animation.PropertyValuesHolder;
+import android.app.Fragment;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -37,7 +38,6 @@
 import android.view.KeyEvent;
 import android.view.View;
 
-import android.app.Fragment;
 import androidx.leanback.R;
 import androidx.leanback.graphics.FitWidthBitmapDrawable;
 import androidx.leanback.media.MediaPlayerGlue;
@@ -50,9 +50,9 @@
 import androidx.leanback.widget.ParallaxTarget;
 import androidx.leanback.widget.RecyclerViewParallax;
 import androidx.leanback.widget.VerticalGridView;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java
index 58b1ad1..cd7144d 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java

@@ -47,9 +47,9 @@
 import androidx.leanback.widget.ParallaxTarget;
 import androidx.leanback.widget.RecyclerViewParallax;
 import androidx.leanback.widget.VerticalGridView;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTest.java
index 4a8ff3b..57a5841 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTest.java

@@ -40,9 +40,9 @@
 import androidx.leanback.widget.VerticalGridView;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestBase.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestBase.java
index b4c5fca..c043bb8 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestBase.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestBase.java

@@ -28,7 +28,7 @@
 
 import androidx.leanback.R;
 import androidx.leanback.testutils.PollingCheck;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Before;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTest.java
index 91f87c3..06fb3e4 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTest.java

@@ -37,9 +37,9 @@
 import androidx.leanback.widget.VerticalGridView;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTestBase.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTestBase.java
index 8137d38..dd573a0 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTestBase.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTestBase.java

@@ -25,7 +25,7 @@
 
 import androidx.leanback.R;
 import androidx.leanback.testutils.PollingCheck;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Before;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/HeadersFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/HeadersFragmentTest.java
index 4b9cd9c..74399dd 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/HeadersFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/HeadersFragmentTest.java

@@ -31,8 +31,8 @@
 import androidx.leanback.widget.ListRow;
 import androidx.leanback.widget.ListRowPresenter;
 import androidx.leanback.widget.VerticalGridView;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/HeadersSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/HeadersSupportFragmentTest.java
index 74bb1bc..976bacf 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/HeadersSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/HeadersSupportFragmentTest.java

@@ -28,8 +28,8 @@
 import androidx.leanback.widget.ListRow;
 import androidx.leanback.widget.ListRowPresenter;
 import androidx.leanback.widget.VerticalGridView;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/ListRowDataAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/app/ListRowDataAdapterTest.java
index 50af75f..81afadf 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/ListRowDataAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/ListRowDataAdapterTest.java

@@ -27,9 +27,9 @@
 import androidx.leanback.widget.ObjectAdapter;
 import androidx.leanback.widget.PresenterSelector;
 import androidx.leanback.widget.SectionRow;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java
index 308d131..8b8ce9a 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java

@@ -45,11 +45,11 @@
 import androidx.leanback.widget.Row;
 import androidx.leanback.widget.RowPresenter;
 import androidx.leanback.widget.SparseArrayObjectAdapter;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.Suppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java
index 77c32df..3f069d7 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java

@@ -42,11 +42,11 @@
 import androidx.leanback.widget.Row;
 import androidx.leanback.widget.RowPresenter;
 import androidx.leanback.widget.SparseArrayObjectAdapter;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.Suppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/ProgressBarManagerTest.java b/leanback/src/androidTest/java/androidx/leanback/app/ProgressBarManagerTest.java
index 62a1d25..f4ee251 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/ProgressBarManagerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/ProgressBarManagerTest.java

@@ -23,8 +23,8 @@
 import android.widget.FrameLayout;
 
 import androidx.leanback.testutils.PollingCheck;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/RowsFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/RowsFragmentTest.java
index 175c09e..f67ed12 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/RowsFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/RowsFragmentTest.java

@@ -26,6 +26,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import android.app.Fragment;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
@@ -37,7 +38,6 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import android.app.Fragment;
 import androidx.leanback.test.R;
 import androidx.leanback.testutils.PollingCheck;
 import androidx.leanback.widget.ArrayObjectAdapter;
@@ -54,10 +54,10 @@
 import androidx.leanback.widget.RowPresenter;
 import androidx.leanback.widget.SinglePresenterSelector;
 import androidx.leanback.widget.VerticalGridView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/RowsSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/RowsSupportFragmentTest.java
index b50f3a8..3e875cb 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/RowsSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/RowsSupportFragmentTest.java

@@ -51,10 +51,10 @@
 import androidx.leanback.widget.RowPresenter;
 import androidx.leanback.widget.SinglePresenterSelector;
 import androidx.leanback.widget.VerticalGridView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestBase.java b/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestBase.java
index 3f8c556..d26f69b 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestBase.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestBase.java

@@ -23,7 +23,7 @@
 import android.os.SystemClock;
 
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/SingleSupportFragmentTestBase.java b/leanback/src/androidTest/java/androidx/leanback/app/SingleSupportFragmentTestBase.java
index 75947d2..3346971 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/SingleSupportFragmentTestBase.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/SingleSupportFragmentTestBase.java

@@ -20,7 +20,7 @@
 import android.os.SystemClock;
 
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridFragmentTest.java
index e23203b..00058ab 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridFragmentTest.java

@@ -19,14 +19,14 @@
 
 package androidx.leanback.app;
 
+import android.app.Fragment;
 import android.os.Bundle;
 
-import android.app.Fragment;
 import androidx.leanback.widget.ArrayObjectAdapter;
 import androidx.leanback.widget.VerticalGridPresenter;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridSupportFragmentTest.java
index 44615b4..f940396 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridSupportFragmentTest.java

@@ -21,9 +21,9 @@
 import androidx.fragment.app.Fragment;
 import androidx.leanback.widget.ArrayObjectAdapter;
 import androidx.leanback.widget.VerticalGridPresenter;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/VideoFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/VideoFragmentTest.java
index 7b78824..8565c65 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/VideoFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/VideoFragmentTest.java

@@ -37,9 +37,9 @@
 import androidx.leanback.media.PlaybackGlueHost;
 import androidx.leanback.test.R;
 import androidx.leanback.testutils.PollingCheck;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/VideoSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/VideoSupportFragmentTest.java
index 60a1fe7..5267b4c 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/VideoSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/VideoSupportFragmentTest.java

@@ -34,9 +34,9 @@
 import androidx.leanback.media.PlaybackGlueHost;
 import androidx.leanback.test.R;
 import androidx.leanback.testutils.PollingCheck;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedDatePickerTest.java b/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedDatePickerTest.java
index 2db87e4..2b2eaf3 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedDatePickerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedDatePickerTest.java

@@ -30,10 +30,10 @@
 import androidx.leanback.widget.GuidedDatePickerAction;
 import androidx.leanback.widget.VerticalGridView;
 import androidx.leanback.widget.picker.DatePicker;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java b/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java
index bd64ca0..715a4e1 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java

@@ -25,10 +25,10 @@
 import androidx.leanback.test.R;
 import androidx.leanback.widget.GuidanceStylist;
 import androidx.leanback.widget.GuidedAction;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/graphics/CompositeDrawableTest.java b/leanback/src/androidTest/java/androidx/leanback/graphics/CompositeDrawableTest.java
index 9c01de2..1cbaa74 100644
--- a/leanback/src/androidTest/java/androidx/leanback/graphics/CompositeDrawableTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/graphics/CompositeDrawableTest.java

@@ -26,10 +26,10 @@
 import android.os.Build;
 
 import androidx.leanback.graphics.BoundsRule.ValueRule;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/graphics/FitWidthBitmapDrawableTest.java b/leanback/src/androidTest/java/androidx/leanback/graphics/FitWidthBitmapDrawableTest.java
index bd5ac81..68f0a1c 100644
--- a/leanback/src/androidTest/java/androidx/leanback/graphics/FitWidthBitmapDrawableTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/graphics/FitWidthBitmapDrawableTest.java

@@ -26,10 +26,10 @@
 import android.graphics.Rect;
 import android.os.Build;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/media/MediaControllerAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/media/MediaControllerAdapterTest.java
index f72822e..732c42c 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/MediaControllerAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/MediaControllerAdapterTest.java

@@ -16,8 +16,8 @@
 
 package androidx.leanback.media;
 
-import static androidx.test.InstrumentationRegistry.getContext;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -35,10 +35,10 @@
 import android.support.v4.media.session.PlaybackStateCompat;
 
 import androidx.leanback.widget.PlaybackControlsRow;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.After;
 import org.junit.Before;
@@ -70,7 +70,7 @@
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                mSession = new MediaSessionCompat(getContext(), SESSION_TAG);
+                mSession = new MediaSessionCompat(getApplicationContext(), SESSION_TAG);
                 mSession.setCallback(mCallback, mHandler);
                 mSession.setFlags(MediaSessionCompat.FLAG_HANDLES_QUEUE_COMMANDS);
                 mControllerCompat = new MediaControllerCompat(mContext, mSession);

diff --git a/leanback/src/androidTest/java/androidx/leanback/media/MediaPlayerGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/MediaPlayerGlueTest.java
index 4f51b84..4b6d5c7 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/MediaPlayerGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/MediaPlayerGlueTest.java

@@ -27,10 +27,10 @@
 import android.os.SystemClock;
 
 import androidx.leanback.testutils.PollingCheck;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackBannerControlGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackBannerControlGlueTest.java
index 406e323..6ced4d8 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackBannerControlGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackBannerControlGlueTest.java

@@ -34,8 +34,8 @@
 import androidx.leanback.widget.PlaybackControlsRowPresenter;
 import androidx.leanback.widget.PlaybackRowPresenter;
 import androidx.leanback.widget.RowPresenter;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.mockito.Mockito;

diff --git a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackControlGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackControlGlueTest.java
index 45c84fa..68b7b7b 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackControlGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackControlGlueTest.java

@@ -29,8 +29,8 @@
 import androidx.leanback.widget.PlaybackControlsRowPresenter;
 import androidx.leanback.widget.PlaybackRowPresenter;
 import androidx.leanback.widget.RowPresenter;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.mockito.Mockito;

diff --git a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackGlueTest.java
index 91f0664..df5ff5d 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackGlueTest.java

@@ -27,9 +27,9 @@
 
 import android.content.Context;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackTransportControlGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackTransportControlGlueTest.java
index b52cfb6..986c2fc 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackTransportControlGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackTransportControlGlueTest.java

@@ -36,8 +36,8 @@
 import androidx.leanback.widget.PlaybackRowPresenter;
 import androidx.leanback.widget.PlaybackTransportRowPresenter;
 import androidx.leanback.widget.RowPresenter;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.mockito.Mockito;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/BaseCardViewTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/BaseCardViewTest.java
index 0d4195d..8a7d02d 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/BaseCardViewTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/BaseCardViewTest.java

@@ -30,7 +30,7 @@
 
 import android.view.View;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.SmallTest;
 
 import org.junit.Test;
@@ -82,7 +82,7 @@
 
     @Test
     public void infoOver_InfoVisibleAlways() {
-        BaseCardView cardView = new BaseCardView(InstrumentationRegistry.getContext());
+        BaseCardView cardView = new BaseCardView(ApplicationProvider.getApplicationContext());
         View main = new View(cardView.getContext());
         main.setLayoutParams(createLayoutParams(VIEW_TYPE_MAIN, 500, 500));
         cardView.addView(main);
@@ -129,7 +129,7 @@
 
     @Test
     public void infoUnder_InfoVisibleAlways() {
-        BaseCardView cardView = new BaseCardView(InstrumentationRegistry.getContext());
+        BaseCardView cardView = new BaseCardView(ApplicationProvider.getApplicationContext());
         View main = new View(cardView.getContext());
         main.setLayoutParams(createLayoutParams(VIEW_TYPE_MAIN, 500, 500));
         cardView.addView(main);
@@ -176,7 +176,7 @@
 
     @Test
     public void infoUnder_InfoVisibleActivated() {
-        BaseCardView cardView = new BaseCardView(InstrumentationRegistry.getContext());
+        BaseCardView cardView = new BaseCardView(ApplicationProvider.getApplicationContext());
         View main = new View(cardView.getContext());
         main.setLayoutParams(createLayoutParams(VIEW_TYPE_MAIN, 500, 500));
         cardView.addView(main);
@@ -221,7 +221,7 @@
 
     @Test
     public void infoUnder_InfoVisibleSelected() {
-        final BaseCardView cardView = new BaseCardView(InstrumentationRegistry.getContext());
+        final BaseCardView cardView = new BaseCardView(ApplicationProvider.getApplicationContext());
         View main = new View(cardView.getContext());
         main.setLayoutParams(createLayoutParams(VIEW_TYPE_MAIN, 500, 500));
         cardView.addView(main);
@@ -262,7 +262,7 @@
 
     @Test
     public void infoOver_InfoVisibleSelected() {
-        final BaseCardView cardView = new BaseCardView(InstrumentationRegistry.getContext());
+        final BaseCardView cardView = new BaseCardView(ApplicationProvider.getApplicationContext());
         View main = new View(cardView.getContext());
         main.setLayoutParams(createLayoutParams(VIEW_TYPE_MAIN, 500, 500));
         cardView.addView(main);

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java
index d4c0e39..1d64d90 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java

@@ -26,9 +26,10 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,7 +43,7 @@
 
     @Test
     public void defaultFocus() {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         final ControlBar bar = new ControlBar(context, null);
         final TextView v1 = new Button(context);
         bar.addView(v1, 100, 100);
@@ -63,7 +64,7 @@
 
     @Test
     public void persistFocus() {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         final LinearLayout rootView = new LinearLayout(context);
         final ControlBar bar = new ControlBar(context, null);
         rootView.addView(bar, 800, 100);
@@ -105,7 +106,7 @@
 
     @Test
     public void getFocusables() {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         final LinearLayout rootView = new LinearLayout(context);
         final ControlBar bar = new ControlBar(context, null);
         rootView.addView(bar, 800, 100);

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetPrefetchTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetPrefetchTest.java
index d2ab42e..c42831d 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetPrefetchTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetPrefetchTest.java

@@ -14,9 +14,9 @@
 import android.view.ViewGroup;
 
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,7 +28,7 @@
 public class GridWidgetPrefetchTest {
 
     private Context getContext() {
-        return InstrumentationRegistry.getContext();
+        return ApplicationProvider.getApplicationContext();
     }
 
     private void layout(View view, int width, int height) {

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetTest.java
index aa1f44d..e11f3b11 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetTest.java

@@ -53,11 +53,11 @@
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/GuidedActionStylistTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/GuidedActionStylistTest.java
index d7941ff..591f484 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/GuidedActionStylistTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/GuidedActionStylistTest.java

@@ -26,10 +26,10 @@
 import android.widget.FrameLayout;
 
 import androidx.leanback.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java
index 8ff5450..65cfa89 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java

@@ -33,8 +33,8 @@
 import androidx.leanback.R;
 import androidx.leanback.app.TestActivity;
 import androidx.leanback.testutils.PollingCheck;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ItemBridgeAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ItemBridgeAdapterTest.java
index 44927ed..0a1eec9 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ItemBridgeAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ItemBridgeAdapterTest.java

@@ -27,7 +27,7 @@
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.SmallTest;
 
 import org.junit.Before;
@@ -81,7 +81,7 @@
         mAdapter.setItems(populateData(), null);
         mItemBridgeAdapter.setAdapter(mAdapter);
 
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         mRecyclerView = new RecyclerView(context);
         mRecyclerView.setItemViewCacheSize(0);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(context,

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ListRowPresenterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ListRowPresenterTest.java
index bb1f9fd..cb8a2fa1 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ListRowPresenterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ListRowPresenterTest.java

@@ -31,9 +31,9 @@
 
 import androidx.core.view.ViewCompat;
 import androidx.leanback.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/MediaNowPlayingViewTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/MediaNowPlayingViewTest.java
index 94319b9..ff1338d 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/MediaNowPlayingViewTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/MediaNowPlayingViewTest.java

@@ -17,9 +17,9 @@
 
 import android.content.Context;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,7 +36,7 @@
 
     @Before
     public void setup() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @Test

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ObjectAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ObjectAdapterTest.java
index 33a10a5..abd89d2 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ObjectAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ObjectAdapterTest.java

@@ -34,8 +34,8 @@
 import androidx.annotation.Nullable;
 import androidx.leanback.R;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/PagingIndicatorTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/PagingIndicatorTest.java
index 9179488..98f81f9 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/PagingIndicatorTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/PagingIndicatorTest.java

@@ -17,9 +17,9 @@
 
 import static org.junit.Assert.assertEquals;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,7 +35,7 @@
 
     @Before
     public void setup() throws Exception {
-        mIndicator = new PagingIndicator(InstrumentationRegistry.getTargetContext());
+        mIndicator = new PagingIndicator(ApplicationProvider.getApplicationContext());
     }
 
     @Test

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatEffectTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatEffectTest.java
index 7f92b1db..3114d8e 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatEffectTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatEffectTest.java

@@ -25,8 +25,8 @@
 
 import android.util.Property;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatTest.java
index 20fc885..5033831 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatTest.java

@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntEffectTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntEffectTest.java
index 6dc7045..1eac513 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntEffectTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntEffectTest.java

@@ -22,8 +22,8 @@
 
 import android.util.Property;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntTest.java
index 2b5181f..aebffbc 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntTest.java

@@ -18,8 +18,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java
index 84df047..0a395f5 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java

@@ -38,8 +38,8 @@
 import androidx.leanback.media.PlaybackTransportControlGlue;
 import androidx.leanback.media.PlayerAdapter;
 import androidx.leanback.widget.PlaybackSeekDataProvider.ResultCallback;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/PresenterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/PresenterTest.java
index 8cf4f19..cf03798 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/PresenterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/PresenterTest.java

@@ -29,9 +29,9 @@
 
 import androidx.leanback.R;
 import androidx.leanback.app.HeadersFragment;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +44,7 @@
 
     @Before
     public void setup() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @Test

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ShadowOverlayContainerTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ShadowOverlayContainerTest.java
index 6c30390..280095f 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ShadowOverlayContainerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ShadowOverlayContainerTest.java

@@ -24,9 +24,9 @@
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +39,7 @@
 
     @Before
     public void setup() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @Test

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/SingleRowTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/SingleRowTest.java
index b040efe..16db165 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/SingleRowTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/SingleRowTest.java

@@ -22,8 +22,8 @@
 import static org.mockito.Mockito.verify;
 
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/StaggeredGridDefaultTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/StaggeredGridDefaultTest.java
index d0f4333..3c04e3e 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/StaggeredGridDefaultTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/StaggeredGridDefaultTest.java

@@ -17,8 +17,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java
index b954f6a..1bee7ac 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java

@@ -24,10 +24,10 @@
 import android.view.View;
 
 import androidx.leanback.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/TitleViewAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/TitleViewAdapterTest.java
index 0e4942e..59fdc3f 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/TitleViewAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/TitleViewAdapterTest.java

@@ -22,9 +22,9 @@
 import android.view.View;
 import android.widget.LinearLayout;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -64,7 +64,7 @@
 
     @Test
     public void customTitle() {
-        CustomTitle t = new CustomTitle(InstrumentationRegistry.getTargetContext(), null);
+        CustomTitle t = new CustomTitle(ApplicationProvider.getApplicationContext(), null);
         TitleViewAdapter adapter = t.getTitleViewAdapter();
         adapter.setTitle("title");
         adapter.setBadgeDrawable(new GradientDrawable());

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/picker/DatePickerTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/picker/DatePickerTest.java
index d5488b8..5ac11bd 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/picker/DatePickerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/picker/DatePickerTest.java

@@ -29,10 +29,11 @@
 import android.view.ViewGroup;
 
 import androidx.leanback.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -62,7 +63,7 @@
 
     @Before
     public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     public void initActivity(Intent intent) throws Throwable {

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/picker/PinPickerTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/picker/PinPickerTest.java
index 61628bd..9788337 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/picker/PinPickerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/picker/PinPickerTest.java

@@ -17,10 +17,10 @@
 package androidx.leanback.widget.picker;
 
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.pressKey;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -32,9 +32,9 @@
 import androidx.leanback.test.R;
 import androidx.leanback.testutils.PollingCheck;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java
index 2a43202..ce591e1 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java

@@ -27,10 +27,11 @@
 import android.view.ViewGroup;
 
 import androidx.leanback.test.R;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -58,7 +59,7 @@
 
     @Before
     public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     public void initActivity(Intent intent) throws Throwable {

diff --git a/lifecycle/extensions/build.gradle b/lifecycle/extensions/build.gradle
index 331b150..0a04c44 100644
--- a/lifecycle/extensions/build.gradle
+++ b/lifecycle/extensions/build.gradle

@@ -44,6 +44,8 @@
     testImplementation(JUNIT)
     testImplementation(MOCKITO_CORE)
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE)

diff --git a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentLifecycleInActivityTest.java b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentLifecycleInActivityTest.java
index f82611e..a44ec6f 100644
--- a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentLifecycleInActivityTest.java
+++ b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentLifecycleInActivityTest.java

@@ -33,8 +33,8 @@
 
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.activity.FragmentLifecycleActivity;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Before;

diff --git a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentOperationsLifecycleTest.java b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentOperationsLifecycleTest.java
index 26682ff..f95bdcb 100644
--- a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentOperationsLifecycleTest.java
+++ b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentOperationsLifecycleTest.java

@@ -33,9 +33,9 @@
 import androidx.lifecycle.activity.EmptyActivity;
 import androidx.lifecycle.extensions.test.R;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTest.java b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTest.java
index dbab932..a286455 100644
--- a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTest.java
+++ b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTest.java

@@ -31,11 +31,12 @@
 import androidx.lifecycle.viewmodeltest.TestViewModel;
 import androidx.lifecycle.viewmodeltest.ViewModelActivity;
 import androidx.lifecycle.viewmodeltest.ViewModelActivity.ViewModelFragment;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -109,7 +110,7 @@
     public void testGetApplication() {
         TestViewModel activityModel = mActivityRule.getActivity().activityModel;
         assertThat(activityModel.getApplication(),
-                is(InstrumentationRegistry.getTargetContext().getApplicationContext()));
+                is(ApplicationProvider.getApplicationContext().getApplicationContext()));
     }
 
     @Test

diff --git a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTestInTransaction.java b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTestInTransaction.java
index 1ebaf8a..b91f77f 100644
--- a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTestInTransaction.java
+++ b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTestInTransaction.java

@@ -26,9 +26,9 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.viewmodeltest.TestViewModel;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/lifecycle/integration-tests/testapp/build.gradle b/lifecycle/integration-tests/testapp/build.gradle
index c6cef65..eaca25f 100644
--- a/lifecycle/integration-tests/testapp/build.gradle
+++ b/lifecycle/integration-tests/testapp/build.gradle

@@ -44,6 +44,8 @@
     annotationProcessor(project(":lifecycle:lifecycle-compiler"))
 
     androidTestAnnotationProcessor(project(":lifecycle:lifecycle-compiler"))
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE)

diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/FragmentInBackStackLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/FragmentInBackStackLifecycleTest.java
index db36be5..f4b0549 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/FragmentInBackStackLifecycleTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/FragmentInBackStackLifecycleTest.java

@@ -37,9 +37,9 @@
 import androidx.lifecycle.Lifecycle.Event;
 import androidx.lifecycle.testapp.EmptyActivity;
 import androidx.lifecycle.testapp.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/LiveDataOnSaveInstanceStateTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/LiveDataOnSaveInstanceStateTest.java
index 4ea1431..ee28d32 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/LiveDataOnSaveInstanceStateTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/LiveDataOnSaveInstanceStateTest.java

@@ -27,11 +27,11 @@
 import androidx.lifecycle.testapp.CollectingSupportActivity;
 import androidx.lifecycle.testapp.CollectingSupportFragment;
 import androidx.lifecycle.testapp.NavigationDialogActivity;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/PartiallyCoveredActivityTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/PartiallyCoveredActivityTest.java
index 5735a8b..f296583 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/PartiallyCoveredActivityTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/PartiallyCoveredActivityTest.java

@@ -46,8 +46,9 @@
 import androidx.lifecycle.testapp.CollectingSupportFragment;
 import androidx.lifecycle.testapp.NavigationDialogActivity;
 import androidx.lifecycle.testapp.TestEvent;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Rule;
@@ -97,7 +98,7 @@
                 @Override
                 protected Intent getActivityIntent() {
                     // helps with less flaky API 16 tests
-                    Intent intent = new Intent(InstrumentationRegistry.getTargetContext(),
+                    Intent intent = new Intent(ApplicationProvider.getApplicationContext(),
                             CollectingSupportActivity.class);
                     intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ProcessOwnerTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ProcessOwnerTest.java
index 865398e..5a73b6d 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ProcessOwnerTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ProcessOwnerTest.java

@@ -36,10 +36,11 @@
 import androidx.lifecycle.testapp.NavigationTestActivityFirst;
 import androidx.lifecycle.testapp.NavigationTestActivitySecond;
 import androidx.lifecycle.testapp.NonSupportActivity;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Rule;
@@ -184,7 +185,7 @@
         };
         addProcessObserver(collectingObserver);
         events.clear();
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         context.startActivity(new Intent(activity, NavigationDialogActivity.class)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
         waitTillResumed(dialogActivity, activityTestRule);

diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SimpleAppFullLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SimpleAppFullLifecycleTest.java
index 18bc289..5cd2100 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SimpleAppFullLifecycleTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SimpleAppFullLifecycleTest.java

@@ -29,9 +29,9 @@
 import androidx.lifecycle.Lifecycle.State;
 import androidx.lifecycle.testapp.SimpleAppLifecycleTestActivity;
 import androidx.lifecycle.testapp.SimpleAppLifecycleTestActivity.TestEventType;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SynchronousActivityLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SynchronousActivityLifecycleTest.java
index 4567696..bbb2292 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SynchronousActivityLifecycleTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SynchronousActivityLifecycleTest.java

@@ -16,7 +16,7 @@
 
 package androidx.lifecycle;
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -31,10 +31,10 @@
 
 import androidx.lifecycle.Lifecycle.Event;
 import androidx.lifecycle.testapp.LifecycleTestActivity;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.UiThreadTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/TestUtils.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/TestUtils.java
index 86a2984..6085cb1 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/TestUtils.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/TestUtils.java

@@ -38,7 +38,7 @@
 
 import androidx.core.util.Pair;
 import androidx.lifecycle.testapp.TestEvent;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import java.util.ArrayList;

diff --git a/lifecycle/livedata-core/ktx/build.gradle b/lifecycle/livedata-core/ktx/build.gradle
index c10a1a7..8aec136 100644
--- a/lifecycle/livedata-core/ktx/build.gradle
+++ b/lifecycle/livedata-core/ktx/build.gradle

@@ -38,6 +38,8 @@
     testImplementation(project(":arch:core-testing"))
     testImplementation(JUNIT)
     testImplementation(TRUTH)
+    testImplementation(TEST_EXT_JUNIT)
+    testImplementation(TEST_CORE)
     testImplementation(TEST_RUNNER)
     testImplementation(TEST_RULES)
 }

diff --git a/lifecycle/livedata/ktx/build.gradle b/lifecycle/livedata/ktx/build.gradle
index 5a8879f..ae36720 100644
--- a/lifecycle/livedata/ktx/build.gradle
+++ b/lifecycle/livedata/ktx/build.gradle

@@ -39,6 +39,8 @@
     testImplementation(project(":arch:core-testing"))
     testImplementation(JUNIT)
     testImplementation(TRUTH)
+    testImplementation(TEST_EXT_JUNIT)
+    testImplementation(TEST_CORE)
     testImplementation(TEST_RUNNER)
     testImplementation(TEST_RULES)
 }

diff --git a/lifecycle/runtime/build.gradle b/lifecycle/runtime/build.gradle
index 4b2e283b..fc45423 100644
--- a/lifecycle/runtime/build.gradle
+++ b/lifecycle/runtime/build.gradle

@@ -27,6 +27,8 @@
     testImplementation(MOCKITO_CORE)
 
     androidTestImplementation(JUNIT)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
 }
 

diff --git a/lifecycle/runtime/src/androidTest/java/androidx/lifecycle/MissingClassTest.java b/lifecycle/runtime/src/androidTest/java/androidx/lifecycle/MissingClassTest.java
index c96d5a4..c927792 100644
--- a/lifecycle/runtime/src/androidTest/java/androidx/lifecycle/MissingClassTest.java
+++ b/lifecycle/runtime/src/androidTest/java/androidx/lifecycle/MissingClassTest.java

@@ -19,9 +19,9 @@
 import android.app.PictureInPictureParams;
 import android.os.Build;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/lifecycle/service/build.gradle b/lifecycle/service/build.gradle
index 5fafdd9..382b322 100644
--- a/lifecycle/service/build.gradle
+++ b/lifecycle/service/build.gradle

@@ -32,6 +32,8 @@
 dependencies {
     api(project(":lifecycle:lifecycle-runtime"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(SUPPORT_CORE_UTILS, libs.support_exclude_config)
 }

diff --git a/lifecycle/service/src/androidTest/java/androidx/lifecycle/ServiceLifecycleTest.java b/lifecycle/service/src/androidTest/java/androidx/lifecycle/ServiceLifecycleTest.java
index c56dd0f..1cab987 100644
--- a/lifecycle/service/src/androidTest/java/androidx/lifecycle/ServiceLifecycleTest.java
+++ b/lifecycle/service/src/androidTest/java/androidx/lifecycle/ServiceLifecycleTest.java

@@ -35,9 +35,10 @@
 import androidx.lifecycle.Lifecycle.Event;
 import androidx.lifecycle.service.TestService;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.After;
 import org.junit.Before;
@@ -65,7 +66,7 @@
 
     @Before
     public void setUp() {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         mServiceIntent = new Intent(context, TestService.class);
         LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
         IntentFilter intentFilter = new IntentFilter();
@@ -81,7 +82,7 @@
 
     @After
     public void tearDown() {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
         localBroadcastManager.unregisterReceiver(mLogger);
         mLogger = null;
@@ -90,7 +91,7 @@
 
     @Test
     public void testUnboundedService() throws TimeoutException, InterruptedException {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         context.startService(mServiceIntent);
         awaitAndAssertEvents(ON_CREATE, ON_START);
         context.stopService(mServiceIntent);
@@ -101,13 +102,13 @@
     public void testBoundedService() throws TimeoutException, InterruptedException {
         ServiceConnection connection = bindToService();
         awaitAndAssertEvents(ON_CREATE, ON_START);
-        InstrumentationRegistry.getTargetContext().unbindService(connection);
+        ApplicationProvider.getApplicationContext().unbindService(connection);
         awaitAndAssertEvents(ON_CREATE, ON_START, ON_STOP, ON_DESTROY);
     }
 
     @Test
     public void testStartBindUnbindStop() throws InterruptedException {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         context.startService(mServiceIntent);
         awaitAndAssertEvents(ON_CREATE, ON_START);
 
@@ -129,7 +130,7 @@
 
     @Test
     public void testStartBindStopUnbind() throws InterruptedException {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         context.startService(mServiceIntent);
         awaitAndAssertEvents(ON_CREATE, ON_START);
 
@@ -152,7 +153,7 @@
 
     @Test
     public void testBindStartUnbindStop() throws InterruptedException {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         ServiceConnection connection = bindToService();
         awaitAndAssertEvents(ON_CREATE, ON_START);
 
@@ -176,7 +177,7 @@
 
     @Test
     public void testBindStartStopUnbind() throws InterruptedException {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         ServiceConnection connection = bindToService();
         awaitAndAssertEvents(ON_CREATE, ON_START);
 
@@ -199,7 +200,7 @@
 
     // can't use ServiceTestRule because it proxies connection, so we can't use unbindService method
     private ServiceConnection bindToService() throws InterruptedException {
-        Context context = InstrumentationRegistry.getTargetContext();
+        Context context = ApplicationProvider.getApplicationContext();
         final CountDownLatch latch = new CountDownLatch(1);
         ServiceConnection connection = new ServiceConnection() {
             @Override

diff --git a/lifecycle/viewmodel-fragment/build.gradle b/lifecycle/viewmodel-fragment/build.gradle
index 8ccc673..afa0ffe 100644
--- a/lifecycle/viewmodel-fragment/build.gradle
+++ b/lifecycle/viewmodel-fragment/build.gradle

@@ -44,6 +44,8 @@
     androidTestImplementation(ESPRESSO_CORE)
     androidTestImplementation(JUNIT)
     androidTestImplementation(TEST_RULES)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
 }
 

diff --git a/lifecycle/viewmodel-fragment/src/androidTest/java/androidx/lifecycle/savedstate/fragment/ViewModelsWithStateTests.java b/lifecycle/viewmodel-fragment/src/androidTest/java/androidx/lifecycle/savedstate/fragment/ViewModelsWithStateTests.java
index 7cc572e..f439b27 100644
--- a/lifecycle/viewmodel-fragment/src/androidTest/java/androidx/lifecycle/savedstate/fragment/ViewModelsWithStateTests.java
+++ b/lifecycle/viewmodel-fragment/src/androidTest/java/androidx/lifecycle/savedstate/fragment/ViewModelsWithStateTests.java

@@ -31,8 +31,8 @@
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelsWithStateFactories;
 import androidx.lifecycle.savedstate.fragment.activity.FakingSavedStateActivity;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Rule;

diff --git a/lifecycle/viewmodel-savedstate/build.gradle b/lifecycle/viewmodel-savedstate/build.gradle
index 811ff25..a80c116 100644
--- a/lifecycle/viewmodel-savedstate/build.gradle
+++ b/lifecycle/viewmodel-savedstate/build.gradle

@@ -31,6 +31,8 @@
 
     androidTestImplementation(ESPRESSO_CORE)
     androidTestImplementation(JUNIT)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     testImplementation(project(":arch:core-testing"))

diff --git a/lifecycle/viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/SavedStateAccessorHolderTest.java b/lifecycle/viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/SavedStateAccessorHolderTest.java
index 9599321..0a0e52f 100644
--- a/lifecycle/viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/SavedStateAccessorHolderTest.java
+++ b/lifecycle/viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/SavedStateAccessorHolderTest.java

@@ -23,8 +23,8 @@
 import android.os.Parcel;
 
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/lifecycle/viewmodel/ktx/build.gradle b/lifecycle/viewmodel/ktx/build.gradle
index 104043a..667e159 100644
--- a/lifecycle/viewmodel/ktx/build.gradle
+++ b/lifecycle/viewmodel/ktx/build.gradle

@@ -37,10 +37,14 @@
     api(KOTLIN_COROUTINES)
 
     testImplementation(JUNIT)
+    testImplementation(TEST_EXT_JUNIT)
+    testImplementation(TEST_CORE)
     testImplementation(TEST_RUNNER)
     testImplementation(TRUTH)
 
     androidTestImplementation(TRUTH)
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
 }
 

diff --git a/loader/build.gradle b/loader/build.gradle
index 8674f82..481dfb2 100644
--- a/loader/build.gradle
+++ b/loader/build.gradle

@@ -12,6 +12,8 @@
     api(ARCH_LIFECYCLE_LIVEDATA_CORE, libs.exclude_annotations_transitive)
     api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive)
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(TEST_RULES)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)

diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java
index ece2cd7..0ec59a7 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java

@@ -29,10 +29,10 @@
 import androidx.loader.app.test.DelayLoader;
 import androidx.loader.app.test.DummyLoaderCallbacks;
 import androidx.loader.content.Loader;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java
index 3b0e16c..a047a00 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java

@@ -33,10 +33,10 @@
 import androidx.loader.app.test.DelayLoaderCallbacks;
 import androidx.loader.app.test.DummyLoaderCallbacks;
 import androidx.loader.content.Loader;
-import androidx.test.InstrumentationRegistry;
 import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/loader/src/androidTest/java/androidx/loader/content/AsyncTaskLoaderTest.java b/loader/src/androidTest/java/androidx/loader/content/AsyncTaskLoaderTest.java
index 4881c83..ad1238e 100644
--- a/loader/src/androidTest/java/androidx/loader/content/AsyncTaskLoaderTest.java
+++ b/loader/src/androidTest/java/androidx/loader/content/AsyncTaskLoaderTest.java

@@ -19,9 +19,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -91,7 +91,7 @@
         int mGetExecutorCallCount = 0;
 
         TestAsyncTaskLoader(int latchCount) {
-            super(InstrumentationRegistry.getContext());
+            super(ApplicationProvider.getApplicationContext());
             mLoadInBackgoundLatch = new CountDownLatch(latchCount);
         }
 

diff --git a/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java b/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java
index eac3922..6892c23 100644
--- a/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java
+++ b/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java

@@ -21,9 +21,9 @@
 import android.os.AsyncTask;
 
 import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/media/build.gradle b/media/build.gradle
index eea99bf..e1271d4 100644
--- a/media/build.gradle
+++ b/media/build.gradle

@@ -11,6 +11,8 @@
     api(project(":core"))
     api("androidx.versionedparcelable:versionedparcelable:1.1.0-alpha01")
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
     androidTestImplementation project(':internal-testutils')

diff --git a/media/version-compat-tests/current/client/build.gradle b/media/version-compat-tests/current/client/build.gradle
index ead6f7e..db03902 100644
--- a/media/version-compat-tests/current/client/build.gradle
+++ b/media/version-compat-tests/current/client/build.gradle

@@ -24,6 +24,8 @@
     androidTestImplementation(project(":media"))
     androidTestImplementation(project(":support-media-compat-test-lib"))
 
+    androidTestImplementation(TEST_EXT_JUNIT)
+    androidTestImplementation(TEST_CORE)
     androidTestImplementation(TEST_RUNNER)
 }
 

diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java
index f0691eb..fe9d555 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java

@@ -24,9 +24,9 @@
 import android.os.Build;
 
 import androidx.media.AudioAttributesCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java
index 16bd883..411f14d 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java

@@ -19,8 +19,7 @@
 import static android.support.mediacompat.testlib.MediaBrowserConstants.CUSTOM_ACTION;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.CUSTOM_ACTION_FOR_ERROR;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.CUSTOM_ACTION_SEND_ERROR;
-import static android.support.mediacompat.testlib.MediaBrowserConstants
-        .CUSTOM_ACTION_SEND_PROGRESS_UPDATE;
+import static android.support.mediacompat.testlib.MediaBrowserConstants.CUSTOM_ACTION_SEND_PROGRESS_UPDATE;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.CUSTOM_ACTION_SEND_RESULT;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.EXTRAS_KEY;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.EXTRAS_VALUE;
@@ -28,8 +27,7 @@
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_CHILDREN_DELAYED;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_INCLUDE_METADATA;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_INVALID;
-import static android.support.mediacompat.testlib.MediaBrowserConstants
-        .MEDIA_ID_ON_LOAD_ITEM_NOT_IMPLEMENTED;
+import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_ON_LOAD_ITEM_NOT_IMPLEMENTED;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_ROOT;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_METADATA;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.NOTIFY_CHILDREN_CHANGED;
@@ -37,8 +35,7 @@
 import static android.support.mediacompat.testlib.MediaBrowserConstants.SEARCH_QUERY_FOR_ERROR;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.SEARCH_QUERY_FOR_NO_RESULT;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.SEND_DELAYED_ITEM_LOADED;
-import static android.support.mediacompat.testlib.MediaBrowserConstants
-        .SEND_DELAYED_NOTIFY_CHILDREN_CHANGED;
+import static android.support.mediacompat.testlib.MediaBrowserConstants.SEND_DELAYED_NOTIFY_CHILDREN_CHANGED;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.SET_SESSION_TOKEN;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.TEST_KEY_1;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.TEST_KEY_2;
@@ -53,9 +50,9 @@
 import static android.support.mediacompat.testlib.util.IntentUtil.SERVICE_PACKAGE_NAME;
 import static android.support.mediacompat.testlib.util.IntentUtil.callMediaBrowserServiceMethod;
 
-import static androidx.test.InstrumentationRegistry.getArguments;
-import static androidx.test.InstrumentationRegistry.getContext;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static androidx.test.platform.app.InstrumentationRegistry.getArguments;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -78,10 +75,10 @@
 
 import androidx.annotation.NonNull;
 import androidx.media.MediaBrowserServiceCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
@@ -334,7 +331,8 @@
 
         // Test MediaBrowserServiceCompat.notifyChildrenChanged()
         mSubscriptionCallback.reset(1);
-        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                getApplicationContext());
         mSubscriptionCallback.await(TIME_OUT_MS);
         assertEquals(1, mSubscriptionCallback.mChildrenLoadedCount);
 
@@ -344,7 +342,8 @@
 
         // After unsubscribing, make StubMediaBrowserServiceCompat notify that the children are
         // changed.
-        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                getApplicationContext());
         mSubscriptionCallback.await(WAIT_TIME_FOR_NO_RESPONSE_MS);
 
         // onChildrenLoaded should not be called.
@@ -381,7 +380,8 @@
 
             // Test MediaBrowserServiceCompat.notifyChildrenChanged()
             mSubscriptionCallback.reset(page + 1);
-            callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+            callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                    getApplicationContext());
             mSubscriptionCallback.await(TIME_OUT_MS);
             assertEquals(page + 1, mSubscriptionCallback.mChildrenLoadedWithOptionCount);
         }
@@ -392,7 +392,8 @@
 
         // After unsubscribing, make StubMediaBrowserServiceCompat notify that the children are
         // changed.
-        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                getApplicationContext());
         try {
             Thread.sleep(SLEEP_MS);
         } catch (InterruptedException e) {
@@ -456,7 +457,8 @@
         assertEquals(0, mSubscriptionCallback.mChildrenLoadedCount);
 
         callMediaBrowserServiceMethod(
-                SEND_DELAYED_NOTIFY_CHILDREN_CHANGED, MEDIA_ID_CHILDREN_DELAYED, getContext());
+                SEND_DELAYED_NOTIFY_CHILDREN_CHANGED, MEDIA_ID_CHILDREN_DELAYED,
+                getApplicationContext());
         mSubscriptionCallback.await(TIME_OUT_MS);
         assertEquals(1, mSubscriptionCallback.mChildrenLoadedCount);
     }
@@ -525,7 +527,8 @@
 
         // After unsubscribing, make StubMediaBrowserServiceCompat notify that the children are
         // changed.
-        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                getApplicationContext());
         try {
             Thread.sleep(SLEEP_MS);
         } catch (InterruptedException e) {
@@ -575,7 +578,8 @@
                     subscriptionCallbacks.get(orderOfRemovingCallbacks[i]));
 
             // Make StubMediaBrowserServiceCompat notify that the children are changed.
-            callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+            callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                    getApplicationContext());
             try {
                 Thread.sleep(SLEEP_MS);
             } catch (InterruptedException e) {
@@ -619,7 +623,8 @@
             assertNull(mItemCallback.mLastMediaItem);
 
             mItemCallback.reset();
-            callMediaBrowserServiceMethod(SEND_DELAYED_ITEM_LOADED, new Bundle(), getContext());
+            callMediaBrowserServiceMethod(SEND_DELAYED_ITEM_LOADED, new Bundle(),
+                    getApplicationContext());
             mItemCallback.mWaitLock.wait(TIME_OUT_MS);
             assertNotNull(mItemCallback.mLastMediaItem);
             assertEquals(MEDIA_ID_CHILDREN_DELAYED, mItemCallback.mLastMediaItem.getMediaId());
@@ -707,7 +712,8 @@
             mCustomActionCallback.reset();
             Bundle data1 = new Bundle();
             data1.putString(TEST_KEY_2, TEST_VALUE_2);
-            callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_PROGRESS_UPDATE, data1, getContext());
+            callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_PROGRESS_UPDATE, data1,
+                    getApplicationContext());
             mCustomActionCallback.mWaitLock.wait(TIME_OUT_MS);
 
             assertTrue(mCustomActionCallback.mOnProgressUpdateCalled);
@@ -720,7 +726,8 @@
             mCustomActionCallback.reset();
             Bundle data2 = new Bundle();
             data2.putString(TEST_KEY_3, TEST_VALUE_3);
-            callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_PROGRESS_UPDATE, data2, getContext());
+            callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_PROGRESS_UPDATE, data2,
+                    getApplicationContext());
             mCustomActionCallback.mWaitLock.wait(TIME_OUT_MS);
 
             assertTrue(mCustomActionCallback.mOnProgressUpdateCalled);
@@ -733,7 +740,8 @@
             Bundle resultData = new Bundle();
             resultData.putString(TEST_KEY_4, TEST_VALUE_4);
             mCustomActionCallback.reset();
-            callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_RESULT, resultData, getContext());
+            callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_RESULT, resultData,
+                    getApplicationContext());
             mCustomActionCallback.mWaitLock.wait(TIME_OUT_MS);
 
             assertTrue(mCustomActionCallback.mOnResultCalled);
@@ -762,7 +770,8 @@
             Bundle progressUpdateData = new Bundle();
             progressUpdateData.putString(TEST_KEY_2, TEST_VALUE_2);
             callMediaBrowserServiceMethod(
-                    CUSTOM_ACTION_SEND_PROGRESS_UPDATE, progressUpdateData, getContext());
+                    CUSTOM_ACTION_SEND_PROGRESS_UPDATE, progressUpdateData,
+                    getApplicationContext());
             mCustomActionCallback.mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCustomActionCallback.mOnProgressUpdateCalled);
             assertEquals(CUSTOM_ACTION, mCustomActionCallback.mAction);
@@ -774,7 +783,8 @@
             mCustomActionCallback.reset();
             Bundle errorData = new Bundle();
             errorData.putString(TEST_KEY_3, TEST_VALUE_3);
-            callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_ERROR, errorData, getContext());
+            callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_ERROR, errorData,
+                    getApplicationContext());
             mCustomActionCallback.mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCustomActionCallback.mOnErrorCalled);
             assertEquals(CUSTOM_ACTION, mCustomActionCallback.mAction);
@@ -798,8 +808,9 @@
 
         // These calls should not make any exceptions.
         callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_PROGRESS_UPDATE, new Bundle(),
-                getContext());
-        callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_RESULT, new Bundle(), getContext());
+                getApplicationContext());
+        callMediaBrowserServiceMethod(CUSTOM_ACTION_SEND_RESULT, new Bundle(),
+                getApplicationContext());
         Thread.sleep(WAIT_TIME_FOR_NO_RESPONSE_MS);
     }
 
@@ -842,7 +853,7 @@
             callback.mWaitLock.wait(WAIT_TIME_FOR_NO_RESPONSE_MS);
             assertEquals(0, callback.mConnectedCount);
 
-            callMediaBrowserServiceMethod(SET_SESSION_TOKEN, new Bundle(), getContext());
+            callMediaBrowserServiceMethod(SET_SESSION_TOKEN, new Bundle(), getApplicationContext());
             callback.mWaitLock.wait(TIME_OUT_MS);
             assertEquals(1, callback.mConnectedCount);
 

diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserTest.java
index 61d2dcd..fe57150 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserTest.java

@@ -21,21 +21,19 @@
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_CHILDREN;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_CHILDREN_DELAYED;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_INVALID;
-import static android.support.mediacompat.testlib.MediaBrowserConstants
-        .MEDIA_ID_ON_LOAD_ITEM_NOT_IMPLEMENTED;
+import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_ON_LOAD_ITEM_NOT_IMPLEMENTED;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.MEDIA_ID_ROOT;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.NOTIFY_CHILDREN_CHANGED;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.SEND_DELAYED_ITEM_LOADED;
-import static android.support.mediacompat.testlib.MediaBrowserConstants
-        .SEND_DELAYED_NOTIFY_CHILDREN_CHANGED;
+import static android.support.mediacompat.testlib.MediaBrowserConstants.SEND_DELAYED_NOTIFY_CHILDREN_CHANGED;
 import static android.support.mediacompat.testlib.MediaBrowserConstants.SET_SESSION_TOKEN;
 import static android.support.mediacompat.testlib.VersionConstants.KEY_SERVICE_VERSION;
 import static android.support.mediacompat.testlib.util.IntentUtil.SERVICE_PACKAGE_NAME;
 import static android.support.mediacompat.testlib.util.IntentUtil.callMediaBrowserServiceMethod;
 
-import static androidx.test.InstrumentationRegistry.getArguments;
-import static androidx.test.InstrumentationRegistry.getContext;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static androidx.test.platform.app.InstrumentationRegistry.getArguments;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -55,11 +53,11 @@
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
@@ -313,7 +311,8 @@
 
         // Test MediaBrowserService.notifyChildrenChanged()
         mSubscriptionCallback.reset(1);
-        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                getApplicationContext());
         mSubscriptionCallback.await(TIME_OUT_MS);
         assertEquals(1, mSubscriptionCallback.mChildrenLoadedCount);
 
@@ -323,7 +322,8 @@
 
         // After unsubscribing, make StubMediaBrowserService notify that the children are
         // changed.
-        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                getApplicationContext());
         mSubscriptionCallback.await(WAIT_TIME_FOR_NO_RESPONSE_MS);
 
         // onChildrenLoaded should not be called.
@@ -362,7 +362,8 @@
 
             // Test MediaBrowserService.notifyChildrenChanged()
             mSubscriptionCallback.reset(page + 1);
-            callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+            callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                    getApplicationContext());
             mSubscriptionCallback.await(TIME_OUT_MS);
             assertEquals(page + 1, mSubscriptionCallback.mChildrenLoadedWithOptionCount);
         }
@@ -373,7 +374,8 @@
 
         // After unsubscribing, make StubMediaBrowserService notify that the children are
         // changed.
-        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                getApplicationContext());
         try {
             Thread.sleep(SLEEP_MS);
         } catch (InterruptedException e) {
@@ -395,7 +397,8 @@
         assertEquals(0, mSubscriptionCallback.mChildrenLoadedCount);
 
         callMediaBrowserServiceMethod(
-                SEND_DELAYED_NOTIFY_CHILDREN_CHANGED, MEDIA_ID_CHILDREN_DELAYED, getContext());
+                SEND_DELAYED_NOTIFY_CHILDREN_CHANGED, MEDIA_ID_CHILDREN_DELAYED,
+                getApplicationContext());
         mSubscriptionCallback.await(TIME_OUT_MS);
         assertEquals(1, mSubscriptionCallback.mChildrenLoadedCount);
     }
@@ -466,7 +469,8 @@
 
         // After unsubscribing, make StubMediaBrowserService notify that the children are
         // changed.
-        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+        callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                getApplicationContext());
         try {
             Thread.sleep(SLEEP_MS);
         } catch (InterruptedException e) {
@@ -517,7 +521,8 @@
                     subscriptionCallbacks.get(orderOfRemovingCallbacks[i]));
 
             // Make StubMediaBrowserService notify that the children are changed.
-            callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT, getContext());
+            callMediaBrowserServiceMethod(NOTIFY_CHILDREN_CHANGED, MEDIA_ID_ROOT,
+                    getApplicationContext());
             try {
                 Thread.sleep(SLEEP_MS);
             } catch (InterruptedException e) {
@@ -561,7 +566,8 @@
             assertNull(mItemCallback.mLastMediaItem);
 
             mItemCallback.reset();
-            callMediaBrowserServiceMethod(SEND_DELAYED_ITEM_LOADED, new Bundle(), getContext());
+            callMediaBrowserServiceMethod(SEND_DELAYED_ITEM_LOADED, new Bundle(),
+                    getApplicationContext());
             mItemCallback.mWaitLock.wait(TIME_OUT_MS);
             assertNotNull(mItemCallback.mLastMediaItem);
             assertEquals(MEDIA_ID_CHILDREN_DELAYED, mItemCallback.mLastMediaItem.getMediaId());
@@ -623,7 +629,7 @@
             callback.mWaitLock.wait(WAIT_TIME_FOR_NO_RESPONSE_MS);
             assertEquals(0, callback.mConnectedCount);
 
-            callMediaBrowserServiceMethod(SET_SESSION_TOKEN, new Bundle(), getContext());
+            callMediaBrowserServiceMethod(SET_SESSION_TOKEN, new Bundle(), getApplicationContext());
             callback.mWaitLock.wait(TIME_OUT_MS);
             assertEquals(1, callback.mConnectedCount);
         }

diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java
index 5ce6554..71b8185 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java

@@ -52,10 +52,9 @@
 import static android.support.mediacompat.testlib.util.TestUtil.assertBundleEquals;
 import static android.support.v4.media.MediaMetadataCompat.METADATA_KEY_RATING;
 
-import static androidx.test.InstrumentationRegistry.getArguments;
-import static androidx.test.InstrumentationRegistry.getContext;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static androidx.test.platform.app.InstrumentationRegistry.getArguments;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -86,10 +85,10 @@
 import android.util.Log;
 
 import androidx.media.VolumeProviderCompat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
@@ -152,7 +151,7 @@
             }
         }
         mSessionToken = mMediaBrowser.getSessionToken();
-        mController = new MediaControllerCompat(getTargetContext(), mSessionToken);
+        mController = new MediaControllerCompat(getApplicationContext(), mSessionToken);
         mController.registerCallback(mMediaControllerCallback, mHandler);
     }
 
@@ -188,7 +187,7 @@
 
             Bundle extras = new Bundle();
             extras.putString(TEST_KEY, TEST_VALUE);
-            callMediaSessionMethod(SET_EXTRAS, extras, getContext());
+            callMediaSessionMethod(SET_EXTRAS, extras, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnExtraChangedCalled);
 
@@ -206,7 +205,7 @@
         synchronized (mWaitLock) {
             mMediaControllerCallback.resetLocked();
 
-            callMediaSessionMethod(SET_FLAGS, TEST_FLAGS, getContext());
+            callMediaSessionMethod(SET_FLAGS, TEST_FLAGS, getApplicationContext());
             new PollingCheck(TIME_OUT_MS) {
                 @Override
                 public boolean check() {
@@ -235,7 +234,7 @@
                     .putRating(METADATA_KEY_RATING, rating)
                     .build();
 
-            callMediaSessionMethod(SET_METADATA, metadata, getContext());
+            callMediaSessionMethod(SET_METADATA, metadata, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnMetadataChangedCalled);
 
@@ -271,7 +270,7 @@
                     .putBitmap(MediaMetadataCompat.METADATA_KEY_ART, bitmapSmall)
                     .build();
 
-            callMediaSessionMethod(SET_METADATA, metadata, getContext());
+            callMediaSessionMethod(SET_METADATA, metadata, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnMetadataChangedCalled);
 
@@ -304,7 +303,7 @@
                             .setErrorMessage(TEST_ERROR_CODE, TEST_ERROR_MSG)
                             .build();
 
-            callMediaSessionMethod(SET_PLAYBACK_STATE, state, getContext());
+            callMediaSessionMethod(SET_PLAYBACK_STATE, state, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnPlaybackStateChangedCalled);
 
@@ -341,11 +340,11 @@
             queue.add(item1);
             queue.add(item2);
 
-            callMediaSessionMethod(SET_QUEUE, queue, getContext());
+            callMediaSessionMethod(SET_QUEUE, queue, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnQueueChangedCalled);
 
-            callMediaSessionMethod(SET_QUEUE_TITLE, TEST_VALUE, getContext());
+            callMediaSessionMethod(SET_QUEUE_TITLE, TEST_VALUE, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnQueueTitleChangedCalled);
 
@@ -356,11 +355,11 @@
             assertQueueEquals(queue, mController.getQueue());
 
             mMediaControllerCallback.resetLocked();
-            callMediaSessionMethod(SET_QUEUE, null, getContext());
+            callMediaSessionMethod(SET_QUEUE, null, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnQueueChangedCalled);
 
-            callMediaSessionMethod(SET_QUEUE_TITLE, null, getContext());
+            callMediaSessionMethod(SET_QUEUE_TITLE, null, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnQueueTitleChangedCalled);
 
@@ -381,9 +380,9 @@
             Intent intent = new Intent("MEDIA_SESSION_ACTION");
             final int requestCode = 555;
             final PendingIntent pi =
-                    PendingIntent.getActivity(getTargetContext(), requestCode, intent, 0);
+                    PendingIntent.getActivity(getApplicationContext(), requestCode, intent, 0);
 
-            callMediaSessionMethod(SET_SESSION_ACTIVITY, pi, getContext());
+            callMediaSessionMethod(SET_SESSION_ACTIVITY, pi, getApplicationContext());
             new PollingCheck(TIME_OUT_MS) {
                 @Override
                 public boolean check() {
@@ -401,14 +400,14 @@
     public void testSetCaptioningEnabled() throws Exception {
         synchronized (mWaitLock) {
             mMediaControllerCallback.resetLocked();
-            callMediaSessionMethod(SET_CAPTIONING_ENABLED, true, getContext());
+            callMediaSessionMethod(SET_CAPTIONING_ENABLED, true, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnCaptioningEnabledChangedCalled);
             assertEquals(true, mMediaControllerCallback.mCaptioningEnabled);
             assertEquals(true, mController.isCaptioningEnabled());
 
             mMediaControllerCallback.resetLocked();
-            callMediaSessionMethod(SET_CAPTIONING_ENABLED, false, getContext());
+            callMediaSessionMethod(SET_CAPTIONING_ENABLED, false, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnCaptioningEnabledChangedCalled);
             assertEquals(false, mMediaControllerCallback.mCaptioningEnabled);
@@ -425,7 +424,7 @@
         synchronized (mWaitLock) {
             mMediaControllerCallback.resetLocked();
             final int repeatMode = PlaybackStateCompat.REPEAT_MODE_ALL;
-            callMediaSessionMethod(SET_REPEAT_MODE, repeatMode, getContext());
+            callMediaSessionMethod(SET_REPEAT_MODE, repeatMode, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnRepeatModeChangedCalled);
             assertEquals(repeatMode, mMediaControllerCallback.mRepeatMode);
@@ -442,7 +441,7 @@
         final int shuffleMode = PlaybackStateCompat.SHUFFLE_MODE_ALL;
         synchronized (mWaitLock) {
             mMediaControllerCallback.resetLocked();
-            callMediaSessionMethod(SET_SHUFFLE_MODE, shuffleMode, getContext());
+            callMediaSessionMethod(SET_SHUFFLE_MODE, shuffleMode, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnShuffleModeChangedCalled);
             assertEquals(shuffleMode, mMediaControllerCallback.mShuffleMode);
@@ -465,7 +464,7 @@
             Bundle extras = new Bundle();
             extras.putString(TEST_KEY, TEST_VALUE);
             arguments.putBundle("extras", extras);
-            callMediaSessionMethod(SEND_SESSION_EVENT, arguments, getContext());
+            callMediaSessionMethod(SEND_SESSION_EVENT, arguments, getApplicationContext());
 
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnSessionEventCalled);
@@ -482,7 +481,7 @@
     public void testRelease() throws Exception {
         synchronized (mWaitLock) {
             mMediaControllerCallback.resetLocked();
-            callMediaSessionMethod(RELEASE, null, getContext());
+            callMediaSessionMethod(RELEASE, null, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mMediaControllerCallback.mOnSessionDestroyedCalled);
         }
@@ -503,7 +502,7 @@
                     TEST_MAX_VOLUME,
                     TEST_CURRENT_VOLUME);
 
-            callMediaSessionMethod(SET_PLAYBACK_TO_REMOTE, volumeInfo, getContext());
+            callMediaSessionMethod(SET_PLAYBACK_TO_REMOTE, volumeInfo, getApplicationContext());
             MediaControllerCompat.PlaybackInfo info = null;
             for (int i = 0; i < MAX_AUDIO_INFO_CHANGED_CALLBACK_COUNT; ++i) {
                 mMediaControllerCallback.mOnAudioInfoChangedCalled = false;
@@ -514,7 +513,7 @@
                         && info.getMaxVolume() == TEST_MAX_VOLUME
                         && info.getVolumeControl() == VolumeProviderCompat.VOLUME_CONTROL_FIXED
                         && info.getPlaybackType()
-                                == MediaControllerCompat.PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
+                        == MediaControllerCompat.PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
                     break;
                 }
             }
@@ -536,7 +535,8 @@
 
             // test setPlaybackToLocal
             mMediaControllerCallback.mOnAudioInfoChangedCalled = false;
-            callMediaSessionMethod(SET_PLAYBACK_TO_LOCAL, AudioManager.STREAM_RING, getContext());
+            callMediaSessionMethod(SET_PLAYBACK_TO_LOCAL, AudioManager.STREAM_RING,
+                    getApplicationContext());
 
             // In API 21 and 22, onAudioInfoChanged is not called.
             if (Build.VERSION.SDK_INT == 21 || Build.VERSION.SDK_INT == 22) {
@@ -559,7 +559,8 @@
         assertEquals("Default rating type of a session must be RatingCompat.RATING_NONE",
                 RatingCompat.RATING_NONE, mController.getRatingType());
 
-        callMediaSessionMethod(SET_RATING_TYPE, RatingCompat.RATING_5_STARS, getContext());
+        callMediaSessionMethod(SET_RATING_TYPE, RatingCompat.RATING_5_STARS,
+                getApplicationContext());
         new PollingCheck(TIME_OUT_MS) {
             @Override
             public boolean check() {
@@ -674,7 +675,7 @@
                 new MediaSessionCompat.QueueItem(desc, 1 /* flags */);
         final MediaBrowserCompat.MediaItem mediaItem =
                 new MediaBrowserCompat.MediaItem(desc, MediaBrowserCompat.MediaItem.FLAG_PLAYABLE);
-        final PlaybackStateCompat state =  new PlaybackStateCompat.Builder()
+        final PlaybackStateCompat state = new PlaybackStateCompat.Builder()
                 .setBufferedPosition(1000)
                 .build();
 
@@ -688,7 +689,7 @@
 
         synchronized (mWaitLock) {
             mMediaControllerCallback.resetLocked();
-            callMediaSessionMethod(SEND_SESSION_EVENT, arguments, getContext());
+            callMediaSessionMethod(SEND_SESSION_EVENT, arguments, getApplicationContext());
             mWaitLock.wait(TIME_OUT_MS);
 
             assertTrue(mMediaControllerCallback.mOnSessionEventCalled);
@@ -723,7 +724,7 @@
         mController.registerCallback(callback, mHandler);
         mController.registerCallback(callback, mHandler); // it must be ignored
 
-        callMediaSessionMethod(SET_EXTRAS, new Bundle(), getContext());
+        callMediaSessionMethod(SET_EXTRAS, new Bundle(), getApplicationContext());
         assertFalse(latch.await(TIME_OUT_MS, TimeUnit.MILLISECONDS));
         assertEquals(1, latch.getCount());
     }
@@ -738,7 +739,7 @@
         mController.unregisterCallback(callback);
         mController.unregisterCallback(callback); // it must be ignored
 
-        callMediaSessionMethod(SET_EXTRAS, new Bundle(), getContext());
+        callMediaSessionMethod(SET_EXTRAS, new Bundle(), getApplicationContext());
         assertFalse(latch.await(TIME_OUT_MS, TimeUnit.MILLISECONDS));
     }
 
@@ -752,7 +753,7 @@
         mController.registerCallback(callback1, mHandler);
         mController.unregisterCallback(callback2); // it must be ignored
 
-        callMediaSessionMethod(SET_EXTRAS, new Bundle(), getContext());
+        callMediaSessionMethod(SET_EXTRAS, new Bundle(), getApplicationContext());
         assertTrue(latch1.await(TIME_OUT_MS, TimeUnit.MILLISECONDS));
         assertFalse(latch2.await(TIME_OUT_MS, TimeUnit.MILLISECONDS));
     }