diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index e0af6732a..30b3e2ebf 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -222,7 +222,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
+            <version>4.6.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java
index e38000599..6c38214eb 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java
@@ -27,8 +27,8 @@
 package org.alfresco.repo.search.impl.lucene.analysis;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -50,8 +50,8 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Retrofitted tests for the {@link MLAnalayser} class. These
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java
index 87968bb54..b4f817729 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java
@@ -35,7 +35,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.IOException;
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java
index 1de135a26..fdd765632 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java
@@ -30,8 +30,6 @@ import static java.util.Arrays.stream;
 import static java.util.stream.IntStream.range;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.when;
 import static org.alfresco.solr.AlfrescoSolrUtils.randomPositiveInteger;
 import static org.alfresco.solr.AlfrescoSolrUtils.randomShardCountGreaterThanOne;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java
index 69ec1f7c0..fd0bea182 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java
@@ -27,10 +27,8 @@
 package org.alfresco.solr.tracker;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -60,8 +58,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ModelTrackerIT
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java
index 0146e5a79..53291b484 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java
@@ -32,8 +32,8 @@ import static org.mockito.Mockito.when;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index c2441337f..687bd2177 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
+            <version>4.6.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>