diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1cc25d41..e84bea0f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -22,9 +22,14 @@ jobs:
       - run: "./gradlew test"
       - run: "./gradlew testEndToEnd"
       - run: "./gradlew testEndToEndSlow"
+      - run: "./gradlew build"
       - run: "./gradlew cyclonedxBom --no-configuration-cache"
       - run: "./gradlew publish"
         if: ${{ !contains(github.ref, 'dependabot') }}
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          path: gradle/aggregation/build/reports
       - uses: DependencyTrack/gh-upload-sbom@v3
         if: ${{ !contains(github.ref, 'dependabot') }}
         with:
diff --git a/gradle/aggregation/build.gradle.kts b/gradle/aggregation/build.gradle.kts
index 09809fd9..3cd5f26d 100644
--- a/gradle/aggregation/build.gradle.kts
+++ b/gradle/aggregation/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("org.example.gradle.report.code-coverage")
     id("org.example.gradle.report.plugin-analysis")
     id("org.example.gradle.report.sbom")
+    id("org.example.gradle.report.test")
 }
 
 dependencies {
diff --git a/gradle/plugins/src/main/kotlin/org.example.gradle.report.code-coverage.gradle.kts b/gradle/plugins/src/main/kotlin/org.example.gradle.report.code-coverage.gradle.kts
index ce0981dc..113c553c 100644
--- a/gradle/plugins/src/main/kotlin/org.example.gradle.report.code-coverage.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/org.example.gradle.report.code-coverage.gradle.kts
@@ -11,12 +11,3 @@ tasks.check {
     // Generate report when running 'check'
     dependsOn(tasks.testCodeCoverageReport)
 }
-
-// Clear tasks group 'build' from clutter for a clean set of tasks to be used in daily work
-tasks.buildDependents { setGroup(null) }
-
-tasks.buildNeeded { setGroup(null) }
-
-tasks.jar { setGroup(null) }
-
-sourceSets.all { tasks.named(classesTaskName) { group = null } }
diff --git a/gradle/plugins/src/main/kotlin/org.example.gradle.report.test.gradle.kts b/gradle/plugins/src/main/kotlin/org.example.gradle.report.test.gradle.kts
new file mode 100644
index 00000000..40f21eba
--- /dev/null
+++ b/gradle/plugins/src/main/kotlin/org.example.gradle.report.test.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    id("org.gradle.java")
+    id("org.gradle.test-report-aggregation")
+    id("org.example.gradle.base.dependency-rules")
+    id("org.example.gradle.base.lifecycle")
+}
+
+tasks.check {
+    // Generate report when running 'check'
+    dependsOn(tasks.testAggregateTestReport)
+}
+
+// Clear tasks group 'build' from clutter for a clean set of tasks to be used in daily work
+tasks.buildDependents { setGroup(null) }
+
+tasks.buildNeeded { setGroup(null) }
+
+tasks.jar { setGroup(null) }
+
+sourceSets.all { tasks.named(classesTaskName) { group = null } }