diff --git a/Jenkinsfile b/Jenkinsfile
index 04c68823bea7..c1d77277589b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,14 +62,14 @@ pipeline {
           steps {
             timeout( time: 180, unit: 'MINUTES' ) {
               checkout scm
-              mavenBuild( "jdk17", "clean install -Dspotbugs.skip=true", "maven3") // javadoc:javadoc
+              mavenBuild( "jdk17", "clean install io.github.olamy.maven.plugins:jacoco-aggregator-maven-plugin:report-aggregate-all", "maven3") // javadoc:javadoc
               recordIssues id: "analysis-jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true,
                             tools: [mavenConsole(), java(), javaDoc()],
                             skipPublishingChecks: true, skipBlames: true
               recordCoverage id: "coverage-jdk17", name: "Coverage jdk17",
-                             tools: [[parser: 'JACOCO'], [parser: 'JUNIT', pattern: '**/target/surefire-reports/**/TEST*.xml,**/target/invoker-reports/TEST*.xml']],
-                             sourceCodeRetention: 'MODIFIED',
-                             sourceDirectories: [[path: 'src/main/java'], [path: 'target/generated-sources/ee8']]
+                             tools: [[parser: 'JACOCO',pattern: 'target/site/jacoco-aggregate/jacoco.xml'],
+                                     [parser: 'JUNIT', pattern: '**/target/surefire-reports/**/TEST*.xml,**/target/invoker-reports/TEST*.xml']],
+                            sourceCodeRetention: 'NEVER' //MODIFIED
             }
           }
         }
diff --git a/pom.xml b/pom.xml
index e4f57a4b839e..a9c66121fb5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1337,6 +1337,11 @@
           <artifactId>njord</artifactId>
           <version>${njord.version}</version>
         </plugin>
+        <plugin>
+          <groupId>io.github.olamy.maven.plugins</groupId>
+          <artifactId>jacoco-aggregator-maven-plugin</artifactId>
+          <version>1.0.2</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
@@ -1580,6 +1585,7 @@
               <jetty.unixdomain.dir>${jetty.unixdomain.dir}</jetty.unixdomain.dir>
               <jetty.testtracker.log>${jetty.testtracker.log}</jetty.testtracker.log>
               <pax.exam.debug.remote>${pax.exam.debug.remote}</pax.exam.debug.remote>
+              <distributionTest.args>${distributionTest.args}</distributionTest.args>
             </systemPropertyVariables>
             <!-- The LC_ALL env variable must have some UTF variant otherwise creating and/or reading files with non-ascii names doesn't work -->
             <environmentVariables>
@@ -1791,6 +1797,35 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>io.github.olamy.maven.plugins</groupId>
+        <artifactId>jacoco-aggregator-maven-plugin</artifactId>
+        <version>1.0.2</version>
+        <configuration>
+          <excludes>
+            <exclude>**/org/eclipse/jetty/ant/**</exclude>
+            <exclude>**/com/oracle/**</exclude>
+            <exclude>**/javax/**</exclude>
+            <exclude>*/org/eclipse/jetty/maven/its/**</exclude>
+            <!-- example code / documentation -->
+            <exclude>**/org/eclipse/jetty/embedded/**</exclude>
+            <exclude>**/org/eclipse/jetty/asyncrest/**</exclude>
+            <exclude>**/org/eclipse/jetty/demo/**</exclude>
+            <exclude>**/org/eclipse/jdt/**</exclude>
+            <exclude>**/jmh**/**</exclude>
+            <exclude>**/org/eclipse/jetty/docs/programming/**</exclude>
+            <exclude>**/org/eclipse/jetty/osgi/**</exclude>
+            <!-- test classes -->
+            <exclude>**/org/eclipse/jetty/tests/**</exclude>
+            <exclude>**/org/eclipse/jetty/test/**</exclude>
+            <exclude>**/jakarta/xml/**</exclude>
+            <exclude>**/org/apache/**</exclude>
+            <exclude>**/org/slf4j/**</exclude>
+            <exclude>**/org/objectweb/**</exclude>
+            <exclude>**/**Benchmark**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -1989,22 +2024,26 @@
         <artifactId>jacoco-maven-plugin</artifactId>
         <configuration>
           <excludes>
-            <!-- build tools -->
             <exclude>**/org/eclipse/jetty/ant/**</exclude>
+            <exclude>**/com/oracle/**</exclude>
+            <exclude>**/javax/**</exclude>
             <exclude>*/org/eclipse/jetty/maven/its/**</exclude>
             <!-- example code / documentation -->
             <exclude>**/org/eclipse/jetty/embedded/**</exclude>
             <exclude>**/org/eclipse/jetty/asyncrest/**</exclude>
             <exclude>**/org/eclipse/jetty/demo/**</exclude>
-            <!-- special environments / late integrations -->
-            <exclude>**/org/eclipse/jetty/gcloud/**</exclude>
-            <exclude>**/org/eclipse/jetty/infinispan/**</exclude>
+            <exclude>**/org/eclipse/jdt/**</exclude>
+            <exclude>**/jmh**/**</exclude>
+            <exclude>**/org/eclipse/jetty/docs/programming/**</exclude>
             <exclude>**/org/eclipse/jetty/osgi/**</exclude>
-            <exclude>**/org/eclipse/jetty/spring/**</exclude>
-            <exclude>**/org/eclipse/jetty/http/spi/**</exclude>
             <!-- test classes -->
             <exclude>**/org/eclipse/jetty/tests/**</exclude>
             <exclude>**/org/eclipse/jetty/test/**</exclude>
+            <exclude>**/jakarta/xml/**</exclude>
+            <exclude>**/org/apache/**</exclude>
+            <exclude>**/org/slf4j/**</exclude>
+            <exclude>**/org/objectweb/**</exclude>
+            <exclude>**/**Benchmark**</exclude>
           </excludes>
         </configuration>
         <executions>
@@ -2015,6 +2054,17 @@
             </goals>
             <phase>initialize</phase>
           </execution>
+          <execution>
+            <id>jacoco-setup-distribution-tests</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <phase>initialize</phase>
+            <configuration>
+              <!-- Enable recording of coverage during execution of distribution tests -->
+              <propertyName>distributionTest.args</propertyName>
+            </configuration>
+          </execution>
           <execution>
             <id>jacoco-setup-m-invoker-p</id>
             <goals>
diff --git a/tests/jetty-testers/src/main/java/org/eclipse/jetty/tests/testers/JettyHomeTester.java b/tests/jetty-testers/src/main/java/org/eclipse/jetty/tests/testers/JettyHomeTester.java
index aed6dd03b4c1..b674c9fbd4f1 100644
--- a/tests/jetty-testers/src/main/java/org/eclipse/jetty/tests/testers/JettyHomeTester.java
+++ b/tests/jetty-testers/src/main/java/org/eclipse/jetty/tests/testers/JettyHomeTester.java
@@ -145,6 +145,13 @@ public JettyHomeTester.Run start(List<String> jvmArgs, List<String> args) throws
         int debugPort = Integer.getInteger("distribution.debug.port", 0);
         if (debugPort > 0)
             commands.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:" + debugPort);
+
+        String disTestArgs = System.getProperty("distributionTest.args");
+        if (StringUtils.isNotBlank(disTestArgs))
+        {
+            commands.add(disTestArgs);
+        }
+
         commands.add("-jar");
         commands.add(config.jettyHome.toAbsolutePath() + "/start.jar");