diff --git a/containers/pax-exam-container-native/pom.xml b/containers/pax-exam-container-native/pom.xml
index 832a45182..1528c3481 100644
--- a/containers/pax-exam-container-native/pom.xml
+++ b/containers/pax-exam-container-native/pom.xml
@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/containers/pax-exam-container-native/src/test/java/org/ops4j/pax/exam/nat/internal/NativeContainerTest.java b/containers/pax-exam-container-native/src/test/java/org/ops4j/pax/exam/nat/internal/NativeContainerTest.java
index 893f1e33a..924154a7d 100644
--- a/containers/pax-exam-container-native/src/test/java/org/ops4j/pax/exam/nat/internal/NativeContainerTest.java
+++ b/containers/pax-exam-container-native/src/test/java/org/ops4j/pax/exam/nat/internal/NativeContainerTest.java
@@ -20,15 +20,14 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
-import java.util.Map;
 
 import org.junit.Test;
-import org.mockito.Matchers;
 import org.ops4j.pax.exam.ExamSystem;
 import org.osgi.framework.launch.Framework;
 import org.osgi.framework.launch.FrameworkFactory;
@@ -51,7 +50,7 @@ public void emptySetup() throws IOException {
     public void starting() throws IOException {
         FrameworkFactory ff = mock(FrameworkFactory.class);
         Framework fw = mock(Framework.class);
-        when(ff.newFramework(Matchers.<Map<String, String>> anyObject())).thenReturn(fw);
+        when(ff.newFramework(any())).thenReturn(fw);
         ExamSystem system = mock(ExamSystem.class);
 
         NativeTestContainer container = new NativeTestContainer(system, ff);
diff --git a/core/pax-exam-container-rbc/pom.xml b/core/pax-exam-container-rbc/pom.xml
index 9f715d128..a09a02f26 100644
--- a/core/pax-exam-container-rbc/pom.xml
+++ b/core/pax-exam-container-rbc/pom.xml
@@ -64,7 +64,7 @@
 	    </dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
     </dependencies>
diff --git a/core/pax-exam-container-rbc/src/test/java/org/ops4j/pax/exam/rbc/internal/RemoteBundleContextImplTest.java b/core/pax-exam-container-rbc/src/test/java/org/ops4j/pax/exam/rbc/internal/RemoteBundleContextImplTest.java
index 4ab8d27a5..9cb0835ac 100644
--- a/core/pax-exam-container-rbc/src/test/java/org/ops4j/pax/exam/rbc/internal/RemoteBundleContextImplTest.java
+++ b/core/pax-exam-container-rbc/src/test/java/org/ops4j/pax/exam/rbc/internal/RemoteBundleContextImplTest.java
@@ -1,7 +1,7 @@
 package org.ops4j.pax.exam.rbc.internal;
 
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.contains;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.contains;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
diff --git a/core/pax-exam-invoker-junit/pom.xml b/core/pax-exam-invoker-junit/pom.xml
index 704bc1e00..6799959ba 100644
--- a/core/pax-exam-invoker-junit/pom.xml
+++ b/core/pax-exam-invoker-junit/pom.xml
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/core/pax-exam-invoker-junit/src/test/java/org/ops4j/pax/exam/invoker/junit/internal/DelegatingTest.java b/core/pax-exam-invoker-junit/src/test/java/org/ops4j/pax/exam/invoker/junit/internal/DelegatingTest.java
index f075b6363..a1f4d69f2 100644
--- a/core/pax-exam-invoker-junit/src/test/java/org/ops4j/pax/exam/invoker/junit/internal/DelegatingTest.java
+++ b/core/pax-exam-invoker-junit/src/test/java/org/ops4j/pax/exam/invoker/junit/internal/DelegatingTest.java
@@ -19,7 +19,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.isNotNull;
+import static org.mockito.ArgumentMatchers.isNotNull;
 import static org.mockito.Mockito.verify;
 
 import org.junit.Test;
@@ -29,7 +29,7 @@
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.ops4j.pax.exam.util.Injector;
 import org.osgi.framework.BundleContext;
 
diff --git a/core/pax-exam-spi/pom.xml b/core/pax-exam-spi/pom.xml
index be123d6fc..1d10adefe 100644
--- a/core/pax-exam-spi/pom.xml
+++ b/core/pax-exam-spi/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/pax-exam-spi/src/test/java/org/ops4j/pax/exam/spi/war/WarBuilderTest.java b/core/pax-exam-spi/src/test/java/org/ops4j/pax/exam/spi/war/WarBuilderTest.java
index c57556dcd..0cdacd8b7 100644
--- a/core/pax-exam-spi/src/test/java/org/ops4j/pax/exam/spi/war/WarBuilderTest.java
+++ b/core/pax-exam-spi/src/test/java/org/ops4j/pax/exam/spi/war/WarBuilderTest.java
@@ -3,7 +3,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.CoreOptions.warProbe;
 import static org.ops4j.pax.exam.spi.Probes.builder;
@@ -38,6 +38,8 @@ public class WarBuilderTest {
     private File tempDir;
     private ZipFile war;
     
+    private static final String MOCKITO_VERSION = "5.8.0"; // needs to match dependency in project
+
     @BeforeClass
     public static void setUp() throws IOException {
         File pomProperties = new File("target/classes/META-INF/maven/org.ops4j.pax.exam/pax-exam-spi/pom.properties");
@@ -118,7 +120,7 @@ public void buildWarWithOverlayFromMaven() throws MalformedURLException, IOExcep
     public void buildWarAutoClassPath() throws MalformedURLException, IOException {
         war = localCopy(warProbe().classPathDefaultExcludes());
         assertThat(war.getEntry("WEB-INF/beans.xml"), is(notNullValue()));
-        assertThat(war.getEntry("WEB-INF/lib/mockito-all-1.9.5.jar"), is(notNullValue()));
+        assertThat(war.getEntry(String.format("WEB-INF/lib/mockito-core-%s.jar", MOCKITO_VERSION)), is(notNullValue()));
         String entry = String.format("WEB-INF/lib/tinybundles-%s.jar", Info.getPaxTinybundlesVersion());
         assertThat(war.getEntry(entry), is(nullValue()));
     }
diff --git a/itest/osgi/src/it/regression-multi/pom.xml b/itest/osgi/src/it/regression-multi/pom.xml
index 6ed5a8d58..10127bd9c 100644
--- a/itest/osgi/src/it/regression-multi/pom.xml
+++ b/itest/osgi/src/it/regression-multi/pom.xml
@@ -132,7 +132,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/itest/osgi/src/it/regression-plumbing/pom.xml b/itest/osgi/src/it/regression-plumbing/pom.xml
index 09140105e..2b6e7cd1b 100644
--- a/itest/osgi/src/it/regression-plumbing/pom.xml
+++ b/itest/osgi/src/it/regression-plumbing/pom.xml
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/itest/osgi/src/it/regression-testng-perclass/pom.xml b/itest/osgi/src/it/regression-testng-perclass/pom.xml
index f36e444d5..d9bfa0ed3 100644
--- a/itest/osgi/src/it/regression-testng-perclass/pom.xml
+++ b/itest/osgi/src/it/regression-testng-perclass/pom.xml
@@ -75,7 +75,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/itest/osgi/src/it/regression-testng/pom.xml b/itest/osgi/src/it/regression-testng/pom.xml
index 1e4051d78..3a0b404e2 100644
--- a/itest/osgi/src/it/regression-testng/pom.xml
+++ b/itest/osgi/src/it/regression-testng/pom.xml
@@ -68,7 +68,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/pom/pom.xml b/pom/pom.xml
index 5b59b71da..1dccd0843 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -26,7 +26,6 @@
         <dependency.junit.version>4.13.2</dependency.junit.version>
         <dependency.openwebbeans.version>2.0.27</dependency.openwebbeans.version>
         <dependency.osgicore.version>8.0.0</dependency.osgicore.version>
-        <dependency.mockito.version>1.9.5</dependency.mockito.version>
         <dependency.asm.version>3.0</dependency.asm.version>
         <dependency.atinject.version>1.2</dependency.atinject.version>
         <dependency.deltaspike.version>1.9.6</dependency.deltaspike.version>
@@ -239,8 +238,8 @@
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
-                <version>${dependency.mockito.version}</version>
+                <artifactId>mockito-core</artifactId>
+                <version>5.8.0</version>
                 <scope>test</scope>
             </dependency>
             <!-- URL Handlers are runtime artifacts. -->