diff --git a/tests/Android.bp b/tests/Android.bp
index 24ae158..12cea1f 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -23,14 +23,23 @@
     srcs: [
         "src/**/*.java",
         "src/**/*.kt",
-        "multivalentTests/src/**/*.java",
-        "multivalentTests/src/**/*.kt",
+        ":launcher3-robo-src",
     ],
     exclude_srcs: [
         ":launcher-non-quickstep-tests-src",
     ],
 }
 
+filegroup {
+    name: "launcher3-robo-src",
+    // multivalentTests directory is a shared folder for not only robolectric converted test
+    // classes but also shared helper classes.
+    srcs: [
+        "multivalentTests/src/**/*.java",
+        "multivalentTests/src/**/*.kt",
+    ],
+}
+
 // Source code used for screenshot tests
 filegroup {
     name: "launcher-image-tests-helpers",
@@ -222,11 +231,8 @@
 android_robolectric_test {
     enabled: true,
     name: "Launcher3RoboTests",
-    // multivalentTests directory is a shared folder for not only robolectric converted test
-    // classes but also shared helper classes.
     srcs: [
-        "multivalentTests/src/**/*.java",
-        "multivalentTests/src/**/*.kt",
+        ":launcher3-robo-src",
 
         // Test util classes
         ":launcher-testing-helpers",