diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 60a68033c95..8622ec5f483 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -101,8 +101,6 @@ android_robolectric_test {
         "SettingsLib-search",
     ],
 
-    upstream: true,
-
     strict_mode: false,
 }
 
diff --git a/tests/screenshot/Android.bp b/tests/screenshot/Android.bp
index f79d00f8c22..d3f416083d1 100644
--- a/tests/screenshot/Android.bp
+++ b/tests/screenshot/Android.bp
@@ -72,7 +72,6 @@ android_robolectric_test {
         "truth",
     ],
 
-    upstream: true,
     instrumentation_for: "ScreenshotTestStub",
     java_resource_dirs: ["config"],
 }