diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a89268efe4f3..88ab5b444bc5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -198,6 +198,9 @@ android {
     packaging.resources {
         excludes.addAll(listOf("META-INF/LICENSE*", "META-INF/versions/9/OSGI-INF/MANIFEST*"))
         pickFirsts.add("MANIFEST.MF") // workaround for duplicated manifest on some dependencies
+        // mockito-android (dexmaker-mockito-inline) and mockk-android (mockk-agent-android)
+        // both bundle their own dispatcher.jar for dynamic dex generation; only one is picked
+        pickFirsts.add("dispatcher.jar")
     }
 
     buildFeatures {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c7ba78f2ccc1..a18a5efa1664 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -58,7 +58,7 @@ materialIconsCoreVersion = "1.7.8"
 materialVersion = "1.14.0"
 media3 = "1.11.1"
 mockitoKotlinVersion = "6.4.0"
-mockitoVersion = "5.22.0"
+mockitoVersion = "5.24.0"
 mockkVersion = "1.14.11"
 objenesis = "3.5"
 orchestratorVersion = "1.6.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5e515b486525..3d78279d1556 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -384,6 +384,7 @@
          <trusted-key id="8DF3B0AA23ED78BE5233F6C2DEA3D207428EF16D">
             <trusting group="com.linkedin.dexmaker" name="dexmaker" version="2.28.3"/>
             <trusting group="com.linkedin.dexmaker" name="dexmaker" version="2.28.6"/>
+            <trusting group="com.linkedin.dexmaker" name="dexmaker-mockito-inline" version="2.28.6"/>
          </trusted-key>
          <trusted-key id="8E3A02905A1AE67E7B0F9ACD3967D4EDA591B991">
             <trusting group="io.ktor"/>