diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 9a0c422..ad59c94 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -59,16 +59,17 @@
     static_libs: [
         "androidx.test.rules",
         "bouncycastle-repackaged-unbundled",
-        "FrameworksNetCommonTests",
         "frameworks-base-testutils",
         "frameworks-net-integration-testutils",
         "framework-protos",
-        "mockito-target-minus-junit4",
+        "mockito-target-extended-minus-junit4",
         "net-tests-utils",
         "platform-test-annotations",
         "service-connectivity-pre-jarjar",
         "services.core",
         "services.net",
+        // At the bottom to prefer test libraries above instead of those in the common tests
+        "FrameworksNetCommonTests",
     ],
     libs: [
         "android.net.ipsec.ike.stubs.module_lib",
@@ -78,6 +79,9 @@
         "ServiceConnectivityResources",
     ],
     jni_libs: [
+        // For mockito extended
+        "libdexmakerjvmtiagent",
+        "libstaticjvmtiagent",
         "libservice-connectivity",
     ],
 }