diff --git a/vibrator/aidl/TEST_MAPPING b/vibrator/aidl/TEST_MAPPING
new file mode 100644
index 0000000..5ae32e7
--- /dev/null
+++ b/vibrator/aidl/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "VtsHalVibratorTargetTest"
+    }
+  ]
+}
diff --git a/vibrator/aidl/vts/Android.bp b/vibrator/aidl/vts/Android.bp
index a01e432..d1e135e 100644
--- a/vibrator/aidl/vts/Android.bp
+++ b/vibrator/aidl/vts/Android.bp
@@ -12,6 +12,7 @@
         "android.hardware.vibrator-cpp",
     ],
     test_suites: [
+        "general-tests",
         "vts-core",
     ],
 }
diff --git a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
index 0e2b3e1..f197763 100644
--- a/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
+++ b/vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp
@@ -49,14 +49,9 @@
         static_cast<EffectStrength>(static_cast<int8_t>(kEffectStrengths.back()) + 1),
 };
 
-// TODO(b/143992652): autogenerate
-const std::vector<CompositePrimitive> kCompositePrimitives = {
-        CompositePrimitive::NOOP,       CompositePrimitive::CLICK,
-        CompositePrimitive::THUD,       CompositePrimitive::SPIN,
-        CompositePrimitive::QUICK_RISE, CompositePrimitive::SLOW_RISE,
-        CompositePrimitive::QUICK_FALL,
-};
-// TODO(b/143992652): autogenerate
+const std::vector<CompositePrimitive> kCompositePrimitives{
+        android::enum_range<CompositePrimitive>().begin(),
+        android::enum_range<CompositePrimitive>().end()};
 
 const std::vector<CompositePrimitive> kInvalidPrimitives = {
         static_cast<CompositePrimitive>(static_cast<int32_t>(kCompositePrimitives.front()) - 1),