diff --git a/tests/Enable16KbTests/Android.bp b/tests/Enable16KbTests/Android.bp
index fa05d33954d..7e1d32c69cc 100644
--- a/tests/Enable16KbTests/Android.bp
+++ b/tests/Enable16KbTests/Android.bp
@@ -34,8 +34,8 @@ android_test {
     platform_apis: true,
     certificate: "platform",
     libs: [
-        "android.test.runner",
-        "android.test.base",
+        "android.test.runner.stubs.system",
+        "android.test.base.stubs.system",
     ],
 }
 
diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
index d437a6c9de3..63af4eee286 100644
--- a/tests/anomaly-tester/Android.bp
+++ b/tests/anomaly-tester/Android.bp
@@ -13,7 +13,7 @@ android_test {
 
     certificate: "platform",
 
-    libs: ["android.test.runner"],
+    libs: ["android.test.runner.stubs.system"],
 
     static_libs: [
         "androidx.test.rules",
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 7e3a8aa6c75..b35bd4a7c18 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -14,7 +14,7 @@ android_test {
     certificate: "platform",
 
     libs: [
-        "android.test.runner",
+        "android.test.runner.stubs.system",
     ],
 
     static_libs: [
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index d6210e71969..3fd430610d3 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -76,7 +76,7 @@ android_robolectric_test {
     ],
 
     libs: [
-        "android.test.mock",
+        "android.test.mock.impl",
         "ims-common",
     ],
 
diff --git a/tests/screenshot/Android.bp b/tests/screenshot/Android.bp
index 5130fe50cb9..f79d00f8c22 100644
--- a/tests/screenshot/Android.bp
+++ b/tests/screenshot/Android.bp
@@ -66,9 +66,9 @@ android_robolectric_test {
 
     ],
     libs: [
-        "android.test.runner",
-        "android.test.base",
-        "android.test.mock",
+        "android.test.runner.impl",
+        "android.test.base.impl",
+        "android.test.mock.impl",
         "truth",
     ],
 
diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
index d5852b30141..be402f42491 100644
--- a/tests/uitests/Android.bp
+++ b/tests/uitests/Android.bp
@@ -33,8 +33,8 @@ android_test {
     ],
 
     libs: [
-        "android.test.runner",
-        "android.test.base",
+        "android.test.runner.stubs.system",
+        "android.test.base.stubs.system",
     ],
 
     static_libs: [