diff --git a/annotation/pom.xml b/annotation/pom.xml
index 7b8b7c93c37cd159ff3a15eefc3d15d4d5aa2d69..7d7aff4cb1980831a52f8816711d813c017bbb6b 100644
--- a/annotation/pom.xml
+++ b/annotation/pom.xml
@@ -208,7 +208,7 @@
 <!-- mockito used for testing -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/converter-CellDesigner/pom.xml b/converter-CellDesigner/pom.xml
index e6b82360bbd595417f95a43183a8a5c019b66ed6..646816b248fc5e0c2d9eea042f03cd383a6666ce 100644
--- a/converter-CellDesigner/pom.xml
+++ b/converter-CellDesigner/pom.xml
@@ -35,7 +35,7 @@
 		<!-- mockito used for testing -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/converter-graphics/pom.xml b/converter-graphics/pom.xml
index 176f85a6b01e8d2ebf42730cbef47460aa6e3e2d..e99b5cb5156446a453a4c2bcf082ff31f2e6d0d6 100644
--- a/converter-graphics/pom.xml
+++ b/converter-graphics/pom.xml
@@ -66,8 +66,8 @@
 								
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>${mockito.version}</version>
+			<artifactId>mockito-core</artifactId>
+    			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
 		
diff --git a/converter-sbml/pom.xml b/converter-sbml/pom.xml
index ef36fcd3d15faa53eaf9d55c07114ad062224bf8..02b7787a01428db97df5cacda80e28901a87825f 100644
--- a/converter-sbml/pom.xml
+++ b/converter-sbml/pom.xml
@@ -68,7 +68,7 @@
 		<!-- mockito used for testing -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/converter/pom.xml b/converter/pom.xml
index d4e935383e91546b13cac768fc93f4e8402ddcb3..8721ee4354f98166c3f7cd4b49e90e5eeb00d07d 100644
--- a/converter/pom.xml
+++ b/converter/pom.xml
@@ -25,7 +25,7 @@
 		<!-- mockito used for testing -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/model/pom.xml b/model/pom.xml
index 415ca30eaf125a5f19557470993b8ea69bd00688..34cd348b503b647aa6bda239a10b1463b59669e7 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -57,7 +57,7 @@
 <!-- mockito used for testing -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/pom.xml b/pom.xml
index ec08b5912a61a493af0b2cc6d6f48e67f3f87196..947569cfae6e22e447d40af2a61e4c1d4ebf55ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
 		
 
     <unboundid-ldapsdk.version>4.0.6</unboundid-ldapsdk.version>
-		<mockito.version>1.10.19</mockito.version>
+		<mockito.version>2.21.0</mockito.version>
 	</properties>
 
 	<repositories>
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
index 88123f3eb0aa07c4d974be95ad187f77a333a395..41bbb39bfae3d94abdb71d174e5c0bde658f1ce7 100644
--- a/rest-api/pom.xml
+++ b/rest-api/pom.xml
@@ -99,7 +99,7 @@
 
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/service/pom.xml b/service/pom.xml
index d761cfe1e982c1619f04169fa1cb6ec6f2da4c8a..69b47c0311f080c8507031f030a0673ac16f2586 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -136,7 +136,7 @@
 <!-- mockito used for testing -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/web/pom.xml b/web/pom.xml
index d29ea2553fafb6c622236b01d6bbc8e9b0039242..3239c10ffeb75d78faa1a2e10fc74b950a1bfc6b 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -214,7 +214,7 @@
 <!-- mockito used for testing -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>