diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 00244ee..370232b 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -52,6 +52,7 @@
 
 cc_test {
     name: "minadbd_test",
+    isolated: true,
 
     defaults: [
         "minadbd_defaults",
@@ -64,7 +65,6 @@
     static_libs: [
         "libminadbd_services",
         "libadbd",
-        "libBionicGtestMain",
     ],
 
     shared_libs: [
diff --git a/tests/Android.bp b/tests/Android.bp
index ab4d31d..9824123 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -99,6 +99,7 @@
 
 cc_test {
     name: "recovery_unit_test",
+    isolated: true,
 
     defaults: [
         "recovery_test_defaults",
@@ -117,7 +118,6 @@
         "libotautil",
         "libupdater",
         "libgtest_prod",
-        "libBionicGtestMain",
     ],
 
     data: ["testdata/*"],
@@ -125,6 +125,7 @@
 
 cc_test {
     name: "recovery_manual_test",
+    isolated: true,
 
     defaults: [
         "recovery_test_defaults",
@@ -135,14 +136,11 @@
     srcs: [
         "manual/recovery_test.cpp",
     ],
-
-    static_libs: [
-        "libBionicGtestMain",
-    ],
 }
 
 cc_test {
     name: "recovery_component_test",
+    isolated: true,
 
     defaults: [
         "recovery_test_defaults",
@@ -159,7 +157,6 @@
         "libupdater",
         "libupdate_verifier",
         "libprotobuf-cpp-lite",
-        "libBionicGtestMain",
     ],
 
     data: [
@@ -170,6 +167,7 @@
 
 cc_test_host {
     name: "recovery_host_test",
+    isolated: true,
 
     defaults: [
         "recovery_test_defaults",
@@ -193,7 +191,6 @@
         "libdivsufsort64",
         "libdivsufsort",
         "libz",
-        "libBionicGtestMain",
     ],
 
     data: ["testdata/*"],