diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index cd1338438db..04600887a31 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -9,7 +9,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target \
+    mockito-target-minus-junit4 \
     espresso-core
 
 # Include all test java files.
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 5b20173bbbc..ae1cc7256d1 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -9,7 +9,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target \
+    mockito-target-minus-junit4 \
     espresso-core
 
 # Include all test java files.