diff --git a/adb/Android.bp b/adb/Android.bp
index 46bc02b2b..b9a15966e 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -369,6 +369,7 @@ cc_test {
         "libusb",
         "libmdnssd",
     ],
+    test_suites: ["device-tests"],
 }
 
 python_binary_host {
diff --git a/base/Android.bp b/base/Android.bp
index 12b396957..ec81f6122 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -162,4 +162,5 @@ cc_test {
             suffix: "64",
         },
     },
+    test_suites: ["device-tests"],
 }
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index 7e6f24d15..9c556c30f 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -221,6 +221,8 @@ cc_test {
             stem: "debuggerd_test64",
         },
     },
+
+    test_suites: ["device-tests"],
 }
 
 cc_benchmark {
diff --git a/demangle/Android.bp b/demangle/Android.bp
index 8d5b1350c..f3b4aa0af 100644
--- a/demangle/Android.bp
+++ b/demangle/Android.bp
@@ -78,4 +78,6 @@ cc_test {
     shared_libs: [
         "libdemangle",
     ],
+
+    test_suites: ["device-tests"],
 }
diff --git a/init/Android.bp b/init/Android.bp
index 70a4ac651..a31c5a587 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -180,6 +180,7 @@ cc_test {
         "util_test.cpp",
     ],
     static_libs: ["libinit"],
+    test_suites: ["device-tests"],
 }
 
 cc_benchmark {
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 4bd01d2cc..49027f366 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -183,6 +183,7 @@ cc_test {
         "art/runtime",
     ],
 
+    test_suites: ["device-tests"],
     data: [
         "testdata/arm/*",
         "testdata/arm64/*",
diff --git a/libkeyutils/Android.bp b/libkeyutils/Android.bp
index 028525925..f3593ff5d 100644
--- a/libkeyutils/Android.bp
+++ b/libkeyutils/Android.bp
@@ -13,4 +13,5 @@ cc_test {
     cflags: ["-Werror"],
     shared_libs: ["libkeyutils"],
     srcs: ["keyutils_test.cpp"],
+    test_suites: ["device-tests"],
 }
diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp
index 619ee3411..f164a19e0 100644
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@@ -89,6 +89,8 @@ cc_test {
             enabled: false,
         },
     },
+
+    test_suites: ["device-tests"],
 }
 
 cc_test {
@@ -103,4 +105,5 @@ cc_test {
         "libhwbinder",
         "libutils",
     ],
+    test_suites: ["device-tests"],
 }
diff --git a/libprocinfo/Android.bp b/libprocinfo/Android.bp
index 83b0a7fcf..b35882c57 100644
--- a/libprocinfo/Android.bp
+++ b/libprocinfo/Android.bp
@@ -83,4 +83,6 @@ cc_test {
             suffix: "64",
         },
     },
+
+    test_suites: ["device-tests"],
 }
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 6868f1800..d411cee7f 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -186,6 +186,7 @@ cc_test {
         "libgmock",
     ],
 
+    test_suites: ["device-tests"],
     data: [
         "tests/files/elf32.xz",
         "tests/files/elf64.xz",
diff --git a/property_service/libpropertyinfoserializer/Android.bp b/property_service/libpropertyinfoserializer/Android.bp
index 72ae19adf..3c4bdc346 100644
--- a/property_service/libpropertyinfoserializer/Android.bp
+++ b/property_service/libpropertyinfoserializer/Android.bp
@@ -35,4 +35,5 @@ cc_test {
         "property_info_serializer_test.cpp",
     ],
     static_libs: ["libpropertyinfoserializer"],
+    test_suites: ["device-tests"],
 }