1 files changed, 4 insertions, 7 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index 9f3dce78c..2cfc32572 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -100,6 +100,7 @@ librecovery_static_libs = [
 
 cc_test {
     name: "recovery_unit_test",
+    isolated: true,
 
     defaults: [
         "recovery_test_defaults",
@@ -118,7 +119,6 @@ cc_test {
         "libotautil",
         "libupdater",
         "libgtest_prod",
-        "libBionicGtestMain",
     ],
 
     data: ["testdata/*"],
@@ -126,6 +126,7 @@ cc_test {
 
 cc_test {
     name: "recovery_manual_test",
+    isolated: true,
 
     defaults: [
         "recovery_test_defaults",
@@ -136,14 +137,11 @@ cc_test {
     srcs: [
         "manual/recovery_test.cpp",
     ],
-
-    static_libs: [
-        "libBionicGtestMain",
-    ],
 }
 
 cc_test {
     name: "recovery_component_test",
+    isolated: true,
 
     defaults: [
         "recovery_test_defaults",
@@ -160,7 +158,6 @@ cc_test {
         "libupdater",
         "libupdate_verifier",
         "libprotobuf-cpp-lite",
-        "libBionicGtestMain",
     ],
 
     data: [
@@ -171,6 +168,7 @@ cc_test {
 
 cc_test_host {
     name: "recovery_host_test",
+    isolated: true,
 
     defaults: [
         "recovery_test_defaults",
@@ -194,7 +192,6 @@ cc_test_host {
         "libdivsufsort64",
         "libdivsufsort",
         "libz",
-        "libBionicGtestMain",
     ],
 
     data: ["testdata/*"],