diff --git a/libutils/tests/Android.bp b/libutils/tests/Android.bp
index f81943d..ec6b67f 100644
--- a/libutils/tests/Android.bp
+++ b/libutils/tests/Android.bp
@@ -18,43 +18,33 @@
 
 cc_test {
     name: "libutils_tests",
-    host_supported: true,
 
     srcs: [
+        "BlobCache_test.cpp",
         "BitSet_test.cpp",
         "Looper_test.cpp",
         "LruCache_test.cpp",
         "RefBase_test.cpp",
         "String8_test.cpp",
         "StrongPointer_test.cpp",
+        "SystemClock_test.cpp",
         "Unicode_test.cpp",
         "Vector_test.cpp",
     ],
 
-    target: {
-        android: {
-            srcs: [
-                "BlobCache_test.cpp",
-                "SystemClock_test.cpp",
-            ],
-            shared_libs: [
-                "libz",
-                "liblog",
-                "libcutils",
-                "libutils",
-            ],
-        },
-        host: {
-            static_libs: [
-                "libutils",
-                "liblog",
-            ],
-        },
-    },
+    shared_libs: [
+        "libz",
+        "liblog",
+        "libcutils",
+        "libutils",
+    ],
+}
 
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
+cc_test_host {
+    name: "libutils_tests_host",
+    srcs: ["Vector_test.cpp"],
+    static_libs: [
+        "libutils",
+        "liblog",
     ],
 }