diff --git a/changelog/@unreleased/pr-2364.v2.yml b/changelog/@unreleased/pr-2364.v2.yml
new file mode 100644
index 000000000..5132d84c3
--- /dev/null
+++ b/changelog/@unreleased/pr-2364.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Make task initialization lazier in the `junit-reports` plugin.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2364
diff --git a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsPlugin.java b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsPlugin.java
index 70076e8db..846745566 100644
--- a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsPlugin.java
+++ b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsPlugin.java
@@ -43,12 +43,12 @@ public void apply(Project project) {
                     .fileProvider(junitPath(rootExt.getReportsDirectory(), test.getPath()));
         });
 
-        project.getTasks().withType(Checkstyle.class, checkstyle -> {
+        project.getTasks().withType(Checkstyle.class).configureEach(checkstyle -> {
             ext.registerTask(
                     checkstyle.getName(), XmlReportFailuresSupplier.create(checkstyle, new CheckstyleReportHandler()));
         });
 
-        project.getTasks().withType(JavaCompile.class, javac -> {
+        project.getTasks().withType(JavaCompile.class).configureEach(javac -> {
             ext.registerTask(javac.getName(), JavacFailuresSupplier.create(javac));
         });