diff --git a/services/tests/wmtests/Android.bp b/services/tests/wmtests/Android.bp
index cdba9a10fa823..cd4f0daa8ebcd 100644
--- a/services/tests/wmtests/Android.bp
+++ b/services/tests/wmtests/Android.bp
@@ -13,7 +13,7 @@ android_test {
     ],
 
     static_libs: [
-        "frameworks-base-testutils",
+        "frameworks-base-testutils-minus-mockito",
         "services.core",
         "androidx.test.runner",
         "androidx.test.rules",
diff --git a/tests/utils/testutils/Android.bp b/tests/utils/testutils/Android.bp
index 027b1d6799fda..e13f906cdccd0 100644
--- a/tests/utils/testutils/Android.bp
+++ b/tests/utils/testutils/Android.bp
@@ -17,6 +17,15 @@
 java_library {
     name: "frameworks-base-testutils",
 
+    static_libs: [
+        "frameworks-base-testutils-minus-mockito",
+        "mockito-target-minus-junit4",
+    ]
+}
+
+java_library {
+    name: "frameworks-base-testutils-minus-mockito",
+
     srcs: [
         "java/**/*.java",
         "java/**/*.kt",
@@ -26,7 +35,6 @@ java_library {
         "junit",
         "hamcrest-library",
         "truth-prebuilt",
-        "mockito-target-minus-junit4",
     ],
 
     libs: [