diff --git a/automotive/vehicle/aidl/aidl_test/Android.bp b/automotive/vehicle/aidl/aidl_test/Android.bp
index 4337ac7..5284a0a 100644
--- a/automotive/vehicle/aidl/aidl_test/Android.bp
+++ b/automotive/vehicle/aidl/aidl_test/Android.bp
@@ -32,6 +32,6 @@
         "libgmock",
     ],
     defaults: ["VehicleHalDefaults"],
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
     vendor: true,
 }
diff --git a/automotive/vehicle/aidl/impl/default_config/test/Android.bp b/automotive/vehicle/aidl/impl/default_config/test/Android.bp
index 7ea4ca7..771472c 100644
--- a/automotive/vehicle/aidl/impl/default_config/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/default_config/test/Android.bp
@@ -30,5 +30,5 @@
     header_libs: [
         "VehicleHalDefaultConfig",
     ],
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
 }
diff --git a/automotive/vehicle/aidl/impl/utils/common/test/Android.bp b/automotive/vehicle/aidl/impl/utils/common/test/Android.bp
index 65b0e46..dd43712 100644
--- a/automotive/vehicle/aidl/impl/utils/common/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/utils/common/test/Android.bp
@@ -28,5 +28,5 @@
         "libgmock",
     ],
     defaults: ["VehicleHalDefaults"],
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
 }