diff --git a/common/libs/utils/Android.bp b/common/libs/utils/Android.bp
index 9cfa60e..5f38e3e 100644
--- a/common/libs/utils/Android.bp
+++ b/common/libs/utils/Android.bp
@@ -49,4 +49,5 @@
     shared_libs: ["libcuttlefish_utils"],
     gtest: true,
     defaults: ["cuttlefish_host_only"],
+    test_suites: ["general-tests"],
 }
diff --git a/common/libs/utils/TEST_MAPPING b/common/libs/utils/TEST_MAPPING
new file mode 100644
index 0000000..61de458
--- /dev/null
+++ b/common/libs/utils/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "cuttlefish_simulated_buffer_test",
+      "host": true
+    }
+  ]
+}