diff --git a/test/cts/Android.bp b/test/cts/Android.bp
index e8571a6..3eef756 100644
--- a/test/cts/Android.bp
+++ b/test/cts/Android.bp
@@ -49,8 +49,14 @@
         suffix: "64",
     },
   },
+  per_testcase_directory: true,
   data: [
-    ":CtsPerfettoReporterApp"
+        ":CtsPerfettoNonProfileableApp",
+        ":CtsPerfettoProfileableApp",
+        ":CtsPerfettoProducerApp",
+        ":CtsPerfettoReleaseApp",
+        ":CtsPerfettoDebuggableApp",
+        ":CtsPerfettoReporterApp"
   ],
   stl: "libc++_static",
   defaults: [