diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 17e916b421..4e62456486 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['8', '11', '17', '21', '24'] 
+        java_version: ['8', '11', '17', '21', '25'] 
         os: ['ubuntu-24.04']
         include:
           - java_version: '8'
diff --git a/pom.xml b/pom.xml
index 0d30198d72..c1f67c337e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
     <version.android.sdk.signature>0.12.0</version.android.sdk.signature>
 
     <version.bytebuddy>1.15.10</version.bytebuddy>
-    <version.mockito>4.11.0</version.mockito>
+    <version.mockito>5.20.0</version.mockito>
 
     <!-- 07-Apr-2025, tatu: For some reason, release fails due to missing
            jacoco... so disable for now
@@ -79,8 +79,8 @@
 
   <dependencyManagement>
     <dependencies>
-      <!-- We need to specify later Bytebuddy version because Mockito 4.11.0 depends on earlier
-           Bytebuddy which does not support JDK 21, since 2.17-->
+      <!-- 25-Sep-2025, tatu: Not sure if and why this is needed...
+        -->
       <dependency>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>
@@ -154,12 +154,6 @@
       <version>${version.mockito}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${version.mockito}</version>
-      <scope>test</scope>
-    </dependency>
 
     <!-- Dependencies for testing "type pollution", see:
          https://github.com/FasterXML/jackson-databind/pull/4848