diff --git a/LICENSE b/LICENSE
index 42010d9f5f0e60fed8b40e6d5620c353146b6e25..8672be55eca3e7aa228e7aa593e8fdd75eb3f33c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -948,6 +948,6 @@ The following components are provided under the MIT License. See project link fo
      (MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.5 - http://www.slf4j.org)
      (MIT License) pyrolite (org.spark-project:pyrolite:2.0.1 - http://pythonhosted.org/Pyro4/)
      (MIT License) scopt (com.github.scopt:scopt_2.10:3.2.0 - https://github.com/scopt/scopt)
-     (The MIT License) Mockito (org.mockito:mockito-all:1.8.5 - http://www.mockito.org)
+     (The MIT License) Mockito (org.mockito:mockito-core:1.8.5 - http://www.mockito.org)
      (MIT License) jquery (https://jquery.org/license/)
      (MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs)
diff --git a/core/pom.xml b/core/pom.xml
index 40a64beccdc240d41943a236a5d10493d2c6dff4..565437c4861a48b626741c102bd22084cc5a191b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -354,7 +354,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml
index c6f60bc9074382388f791743989cc64f14adf9bc..c242e7a57b9ab6bf7258ec1dfa7290f4b05fed33 100644
--- a/extras/kinesis-asl/pom.xml
+++ b/extras/kinesis-asl/pom.xml
@@ -66,7 +66,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 48dd0d5f9106bd01f6bae7589ec7b06d24bfe670..a853e67f5cf784481875657aa0ca7c6686d751fd 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -49,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/mllib/pom.xml b/mllib/pom.xml
index b16058ddc203a15a78682ea82e5a8d4d91bbb9c5..a5db14407b4fc610670e6750b3fa337397100520 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -106,7 +106,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/network/common/pom.xml b/network/common/pom.xml
index a85e0a66f4a3013ed2ba2a31f1f032b25760fc8e..7dc3068ab8cb7aafdd4a4fa85a9614fba62aa333 100644
--- a/network/common/pom.xml
+++ b/network/common/pom.xml
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml
index 4b5bfcb6f04bcc6ae25164aab2f81dff9c5ef475..532463e96fbb76ced097682ce09b6748317251ec 100644
--- a/network/shuffle/pom.xml
+++ b/network/shuffle/pom.xml
@@ -79,7 +79,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 80cacb5ace2d4343ac869fbc398deb0e0b4d9776..1aa70240888bcf24daeb39a50366460866dd20bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -681,7 +681,7 @@
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
+        <artifactId>mockito-core</artifactId>
         <version>1.9.5</version>
         <scope>test</scope>
       </dependency>
diff --git a/repl/pom.xml b/repl/pom.xml
index 85f7bc8ac10244772c0a8d429efdeabfbe7ffd0d..370b2bc2fa8ed0b32ea50fc4b162e81764337d4d 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -93,7 +93,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/unsafe/pom.xml b/unsafe/pom.xml
index dd2ae6457f0b9daba89678ce12f9ef2a7f54255c..33782c6c66f90406695ed08ab52c307ec885e790 100644
--- a/unsafe/pom.xml
+++ b/unsafe/pom.xml
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/yarn/pom.xml b/yarn/pom.xml
index 644def7501dc8c85f1a78c07d92858eb32e9e7c4..2aeed98285aa86efc91b1c5b46c086358bc7ef5c 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -107,7 +107,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>