diff --git a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts
index be908aaae8..3943bc21bb 100644
--- a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -87,6 +87,9 @@ tasks {
         // cognitive load is dubious.
         disable("YodaCondition")
 
+        // Text blocks are not supported in java 8
+        disable("StringConcatToTextBlock")
+
         if ((name.contains("Jmh") || name.contains("Test") || project.name.contains("testing-internal")) && !project.name.equals("custom-checks")) {
           // Allow underscore in test-type method names
           disable("MemberName")
diff --git a/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadocTest.java b/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadocTest.java
index ae26844ca7..34fbc46b6b 100644
--- a/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadocTest.java
+++ b/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadocTest.java
@@ -11,14 +11,48 @@ import org.junit.jupiter.api.Test;
 class OtelInternalJavadocTest {
 
   @Test
-  void test() {
-    doTest("internal/InternalJavadocPositiveCases.java");
-    doTest("internal/InternalJavadocNegativeCases.java");
+  void positiveCases() {
+    CompilationTestHelper.newInstance(OtelInternalJavadoc.class, OtelInternalJavadocTest.class)
+        .addSourceLines(
+            "internal/InternalJavadocPositiveCases.java",
+            "/*",
+            " * Copyright The OpenTelemetry Authors",
+            " * SPDX-License-Identifier: Apache-2.0",
+            " */",
+            "package io.opentelemetry.gradle.customchecks.internal;",
+            "// BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers",
+            "public class InternalJavadocPositiveCases {",
+            "  // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers",
+            "  public static class One {}",
+            "  /** Doesn't have the disclaimer. */",
+            "  // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers",
+            "  public static class Two {}",
+            "}")
+        .doTest();
   }
 
-  private static void doTest(String path) {
+  @Test
+  void negativeCases() {
     CompilationTestHelper.newInstance(OtelInternalJavadoc.class, OtelInternalJavadocTest.class)
-        .addSourceFile(path)
+        .addSourceLines(
+            "internal/InternalJavadocNegativeCases.java",
+            "/*",
+            " * Copyright The OpenTelemetry Authors",
+            " * SPDX-License-Identifier: Apache-2.0",
+            " */",
+            "package io.opentelemetry.gradle.customchecks.internal;",
+            "/**",
+            " * This class is internal and is hence not for public use. Its APIs are unstable and can change at",
+            " * any time.",
+            " */",
+            "public class InternalJavadocNegativeCases {",
+            "  /**",
+            "   * This class is internal and is hence not for public use. Its APIs are unstable and can change at",
+            "   * any time.",
+            "   */",
+            "  public static class One {}",
+            "  static class Two {}",
+            "}")
         .doTest();
   }
 }
diff --git a/custom-checks/src/test/resources/io/opentelemetry/gradle/customchecks/internal/InternalJavadocNegativeCases.java b/custom-checks/src/test/resources/io/opentelemetry/gradle/customchecks/internal/InternalJavadocNegativeCases.java
deleted file mode 100644
index 973c13aa2a..0000000000
--- a/custom-checks/src/test/resources/io/opentelemetry/gradle/customchecks/internal/InternalJavadocNegativeCases.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.gradle.customchecks.internal;
-
-/**
- * This class is internal and is hence not for public use. Its APIs are unstable and can change at
- * any time.
- */
-public class InternalJavadocNegativeCases {
-
-  /**
-   * This class is internal and is hence not for public use. Its APIs are unstable and can change at
-   * any time.
-   */
-  public static class One {}
-
-  static class Two {}
-}
diff --git a/custom-checks/src/test/resources/io/opentelemetry/gradle/customchecks/internal/InternalJavadocPositiveCases.java b/custom-checks/src/test/resources/io/opentelemetry/gradle/customchecks/internal/InternalJavadocPositiveCases.java
deleted file mode 100644
index f7a3042e4d..0000000000
--- a/custom-checks/src/test/resources/io/opentelemetry/gradle/customchecks/internal/InternalJavadocPositiveCases.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.gradle.customchecks.internal;
-
-// BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers
-public class InternalJavadocPositiveCases {
-
-  // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers
-  public static class One {}
-
-  /** Doesn't have the disclaimer. */
-  // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers
-  public static class Two {}
-}
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 6d51ec0973..d345672013 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -28,7 +28,7 @@ val DEPENDENCY_BOMS = listOf(
 )
 
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.36.0"
+val errorProneVersion = "2.37.0"
 val jmhVersion = "1.37"
 // Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
 val mockitoVersion = "4.11.0"