diff --git a/pom.xml b/pom.xml
index 98e6d3e626..b33c6b4337 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,15 +210,30 @@
         <groupId>org.apache.maven.plugins</groupId>
         <version>${version.plugin.surefire}</version>
         <artifactId>maven-surefire-plugin</artifactId>
+        <!-- 13-Feb-2025, tatu: Try to make JaCoCo work -->
+        <dependencies>
+          <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-surefire-provider</artifactId>
+            <version>1.3.2</version>
+          </dependency>
+        </dependencies>
         <configuration>
           <!-- Needed by some of the tests -->
           <argLine>--add-opens=java.base/java.util=tools.jackson.databind
           </argLine>
+          <!-- 13-Feb-2025, tatu: Try to make JaCoCo work -->
+          <forkCount>1</forkCount> <!-- Use single JVM -->
+          <reuseForks>true</reuseForks>
+
           <!-- 26-Nov-2019, tatu: moar parallelism! Per-class basis, safe, efficient enough
                   ... although not 100% sure this makes much difference TBH
             -->
-          <threadCount>4</threadCount>
+          <!-- 13-Feb-2025, tatu: Seems to make no difference, remove -->
+          <!--
+          <threadCount>1</threadCount>
           <parallel>classes</parallel>
+            -->
         </configuration>
       </plugin>
 
@@ -238,13 +253,17 @@
         <artifactId>jacoco-maven-plugin</artifactId>
         <executions>
           <execution>
+            <id>prepare-agent</id>
             <goals>
               <goal>prepare-agent</goal>
             </goals>
           </execution>
           <execution>
             <id>report</id>
-            <phase>test</phase>
+            <!-- 13-Feb-2025, tatu: was "test" in 2.x but for some reason JDK 17
+                needs this
+              -->
+            <phase>verify</phase>
             <goals>
               <goal>report</goal>
             </goals>