diff --git a/tests/FlickerTests/Android.bp b/tests/FlickerTests/Android.bp
index 3b9bec9..1a83655 100644
--- a/tests/FlickerTests/Android.bp
+++ b/tests/FlickerTests/Android.bp
@@ -59,7 +59,10 @@
 java_library {
     name: "wm-flicker-common-assertions",
     platform_apis: true,
-    srcs: ["src/**/*Assertions.java", "src/**/*Assertions.kt"],
+    srcs: [
+        "src/**/*Assertions.java",
+        "src/**/*Assertions.kt",
+    ],
     exclude_srcs: [
         "**/helpers/*",
     ],
@@ -68,4 +71,17 @@
         "truth-prebuilt",
         "app-helpers-core"
     ],
+}
+
+java_library {
+    name: "wm-flicker-common-app-helpers",
+    platform_apis: true,
+    srcs: [
+        "**/helpers/*"
+    ],
+    static_libs: [
+        "flickerlib",
+        "truth-prebuilt",
+        "app-helpers-core"
+    ],
 }
\ No newline at end of file