diff --git a/client-http/src/test/scala/org/apache/livy/client/http/HttpClientSpec.scala b/client-http/src/test/scala/org/apache/livy/client/http/HttpClientSpec.scala
index 54ab56419..6bcb008b5 100644
--- a/client-http/src/test/scala/org/apache/livy/client/http/HttpClientSpec.scala
+++ b/client-http/src/test/scala/org/apache/livy/client/http/HttpClientSpec.scala
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest
 import scala.concurrent.{ExecutionContext, Future}
 
 import org.mockito.ArgumentCaptor
-import org.mockito.Matchers.{eq => meq, _}
+import org.mockito.ArgumentMatchers.{eq => meq, _}
 import org.mockito.Mockito._
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.funspec.AnyFunSpecLike
diff --git a/pom.xml b/pom.xml
index b54b8e69f..8c6f75180 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
          and metrics-healthchecks on 3.1.0 causes a NoClassDefFoundError for
          HealthCheckFilter at runtime (the class moved in Dropwizard 4.x). -->
     <metrics.version>4.2.19</metrics.version>
-    <mockito.version>1.10.19</mockito.version>
+    <mockito.version>3.4.6</mockito.version>
     <!-- Spark 4.1.2 depends on Netty 4.2.7 and calls the new 4.2-only
          `KQueueIoHandler`; pinning to a 4.1.x line here would let Livy's
          `netty-all` win and hide that class from Spark's classpath. -->
@@ -265,7 +265,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/scala-api/src/test/scala/org/apache/livy/scalaapi/ScalaJobHandleTest.scala b/scala-api/src/test/scala/org/apache/livy/scalaapi/ScalaJobHandleTest.scala
index d82282d63..a97d74c0f 100644
--- a/scala-api/src/test/scala/org/apache/livy/scalaapi/ScalaJobHandleTest.scala
+++ b/scala-api/src/test/scala/org/apache/livy/scalaapi/ScalaJobHandleTest.scala
@@ -24,7 +24,7 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import scala.language.postfixOps
 import scala.util.{Failure, Success}
 
-import org.mockito.Matchers._
+import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
 import org.scalatest.BeforeAndAfter
 import org.scalatest.concurrent.ScalaFutures
diff --git a/server/src/test/scala/org/apache/livy/server/batch/BatchSessionSpec.scala b/server/src/test/scala/org/apache/livy/server/batch/BatchSessionSpec.scala
index 57bfed3a1..e9734b22e 100644
--- a/server/src/test/scala/org/apache/livy/server/batch/BatchSessionSpec.scala
+++ b/server/src/test/scala/org/apache/livy/server/batch/BatchSessionSpec.scala
@@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit
 
 import scala.concurrent.duration.Duration
 
-import org.mockito.Matchers
-import org.mockito.Matchers.anyObject
+import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito._
 import org.scalatest.BeforeAndAfter
 import org.scalatest.funspec.AnyFunSpec
@@ -112,7 +112,7 @@ class BatchSessionSpec
       val expectedAppId = "APPID"
       batch.appIdKnown(expectedAppId)
       verify(sessionStore, atLeastOnce()).save(
-        Matchers.eq(BatchSession.RECOVERY_SESSION_TYPE), anyObject())
+        ArgumentMatchers.eq(BatchSession.RECOVERY_SESSION_TYPE), any())
       batch.appId shouldEqual Some(expectedAppId)
 
       val expectedAppInfo = AppInfo(Some("DRIVER LOG URL"), Some("SPARK UI URL"))
@@ -207,7 +207,7 @@ class BatchSessionSpec
 
       batch.appIdKnown("appId")
       verify(sessionStore, atLeastOnce()).save(
-        Matchers.eq(BatchSession.RECOVERY_SESSION_TYPE), anyObject())
+        ArgumentMatchers.eq(BatchSession.RECOVERY_SESSION_TYPE), any())
     }
 
     Seq[Option[String]](None, Some("Test Batch Session"), null)
diff --git a/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionServletSpec.scala b/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionServletSpec.scala
index 50360b053..01c6b96d4 100644
--- a/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionServletSpec.scala
+++ b/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionServletSpec.scala
@@ -26,7 +26,7 @@ import scala.concurrent.Future
 import scala.language.postfixOps
 
 import org.json4s.jackson.Json4sScalaModule
-import org.mockito.Matchers._
+import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito.when
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
diff --git a/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala b/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala
index 7bdaf0156..592bc194a 100644
--- a/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala
+++ b/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionSpec.scala
@@ -26,8 +26,8 @@ import scala.language.postfixOps
 import org.apache.spark.launcher.SparkLauncher
 import org.json4s.{DefaultFormats, Extraction, JValue}
 import org.json4s.jackson.JsonMethods.parse
-import org.mockito.{Matchers => MockitoMatchers}
-import org.mockito.Matchers._
+import org.mockito.{ArgumentMatchers => MockitoMatchers}
+import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito.{atLeastOnce, verify, when}
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.concurrent.Eventually._
@@ -178,7 +178,7 @@ class InteractiveSessionSpec extends AnyFunSpec
       session.appInfo shouldEqual expectedAppInfo
 
       verify(sessionStore, atLeastOnce()).save(
-        MockitoMatchers.eq(InteractiveSession.RECOVERY_SESSION_TYPE), anyObject())
+        MockitoMatchers.eq(InteractiveSession.RECOVERY_SESSION_TYPE), any())
 
       session.state should (be(SessionState.Starting) or be(SessionState.Idle))
     }
@@ -299,7 +299,7 @@ class InteractiveSessionSpec extends AnyFunSpec
 
       s.appIdKnown("appId")
       verify(sessionStore, atLeastOnce()).save(
-        MockitoMatchers.eq(InteractiveSession.RECOVERY_SESSION_TYPE), anyObject())
+        MockitoMatchers.eq(InteractiveSession.RECOVERY_SESSION_TYPE), any())
     }
 
     it("should recover sessions with no name") {
@@ -318,7 +318,7 @@ class InteractiveSessionSpec extends AnyFunSpec
 
       s.appIdKnown("appId")
       verify(sessionStore, atLeastOnce()).save(
-        MockitoMatchers.eq(InteractiveSession.RECOVERY_SESSION_TYPE), anyObject())
+        MockitoMatchers.eq(InteractiveSession.RECOVERY_SESSION_TYPE), any())
     }
 
     it("should recover session to dead state if rscDriverUri is unknown") {
diff --git a/server/src/test/scala/org/apache/livy/server/recovery/FileSystemStateStoreSpec.scala b/server/src/test/scala/org/apache/livy/server/recovery/FileSystemStateStoreSpec.scala
index cbedb1e6e..f5d56c8c8 100644
--- a/server/src/test/scala/org/apache/livy/server/recovery/FileSystemStateStoreSpec.scala
+++ b/server/src/test/scala/org/apache/livy/server/recovery/FileSystemStateStoreSpec.scala
@@ -24,11 +24,9 @@ import org.apache.hadoop.fs._
 import org.apache.hadoop.fs.Options.{CreateOpts, Rename}
 import org.apache.hadoop.fs.permission.FsPermission
 import org.apache.hadoop.hdfs.DistributedFileSystem
-import org.hamcrest.Description
 import org.mockito.ArgumentMatcher
-import org.mockito.Matchers.{any, anyInt, argThat, eq => equal}
+import org.mockito.ArgumentMatchers.{any, anyInt, argThat, eq => equal}
 import org.mockito.Mockito.{atLeastOnce, spy, verify, when}
-import org.mockito.internal.matchers.Equals
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
 import org.scalatest.funspec.AnyFunSpec
@@ -40,11 +38,7 @@ import org.apache.livy.{LivyBaseUnitTestSuite, LivyConf}
 class FileSystemStateStoreSpec extends AnyFunSpec with LivyBaseUnitTestSuite {
   describe("FileSystemStateStore") {
     def pathEq(wantedPath: String): Path = argThat(new ArgumentMatcher[Path] {
-      private val matcher = new Equals(wantedPath)
-
-      override def matches(path: Any): Boolean = matcher.matches(path.toString)
-
-      override def describeTo(d: Description): Unit = { matcher.describeTo(d) }
+      override def matches(path: Path): Boolean = path.toString == wantedPath
     })
 
     def makeConf(): LivyConf = {
diff --git a/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala b/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala
index ab2f5167d..c6b3ad0df 100644
--- a/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala
+++ b/server/src/test/scala/org/apache/livy/utils/SparkYarnAppSpec.scala
@@ -31,7 +31,7 @@ import org.apache.hadoop.yarn.client.api.YarnClient
 import org.apache.hadoop.yarn.exceptions.ApplicationAttemptNotFoundException
 import org.apache.hadoop.yarn.util.ConverterUtils
 import org.mockito.ArgumentCaptor
-import org.mockito.Matchers.any
+import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer