diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 94231ff6c3..d4ea494a3e 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -21,16 +21,16 @@ jobs:
             epVersion: 2.4.0
           - os: macos-latest
             java: 11
-            epVersion: 2.12.0
+            epVersion: 2.13.1
           - os: ubuntu-latest
             java: 11
-            epVersion: 2.12.0
+            epVersion: 2.13.1
           - os: windows-latest
             java: 11
-            epVersion: 2.12.0
+            epVersion: 2.13.1
           - os: ubuntu-latest
             java: 17
-            epVersion: 2.12.0
+            epVersion: 2.13.1
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -70,7 +70,7 @@ jobs:
         with:
           arguments: coveralls
         continue-on-error: true
-        if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.12.0' && github.repository == 'uber/NullAway'
+        if: runner.os == 'Linux' && matrix.java == '11' && matrix.epVersion == '2.13.1' && github.repository == 'uber/NullAway'
       - name: Check that Git tree is clean after build and test
         run: ./.buildscript/check_git_clean.sh
   publish_snapshot:
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 4c771189ff..50521e62d1 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -19,7 +19,7 @@ import org.gradle.util.VersionNumber
 // The oldest version of Error Prone that we support running on
 def oldestErrorProneVersion = "2.4.0"
 // Latest released Error Prone version that we've tested with
-def latestErrorProneVersion = "2.12.0"
+def latestErrorProneVersion = "2.13.1"
 // Default to using latest tested Error Prone version, except on Java 8, where 2.10.0 is the last version
 // that works
 def defaultErrorProneVersion =  JavaVersion.current() >= JavaVersion.VERSION_11 ? latestErrorProneVersion : "2.10.0"
@@ -106,7 +106,7 @@ def test = [
     rxjava2                 : "io.reactivex.rxjava2:rxjava:2.1.2",
     commonsLang3            : "org.apache.commons:commons-lang3:3.8.1",
     commonsLang             : "commons-lang:commons-lang:2.6",
-    lombok                  : "org.projectlombok:lombok:1.18.12",
+    lombok                  : "org.projectlombok:lombok:1.18.22",
     springBeans             : "org.springframework:spring-beans:5.3.7",
     springContext           : "org.springframework:spring-context:5.3.7",
     grpcCore                : "io.grpc:grpc-core:1.15.1", // Should upgrade, but this matches our guava version
diff --git a/test-java-lib-lombok/build.gradle b/test-java-lib-lombok/build.gradle
index 71b76c2223..8e8d7c5a94 100644
--- a/test-java-lib-lombok/build.gradle
+++ b/test-java-lib-lombok/build.gradle
@@ -37,10 +37,13 @@ tasks.withType(JavaCompile) {
   if (!name.toLowerCase().contains("test")) {
     options.errorprone {
       check("NullAway", CheckSeverity.ERROR)
-      check("UnusedVariable", CheckSeverity.OFF) // We are not the only checker that fails on Lombok
-      check("MissingBraces", CheckSeverity.OFF) // We are not the only checker that fails on Lombok
       option("NullAway:AnnotatedPackages", "com.uber")
       option("NullAway:UnannotatedSubPackages", "com.uber.lib.unannotated")
+      if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+          // false positive warnings, only on Java 8
+          check("MissingSummary", CheckSeverity.OFF)
+          check("SameNameButDifferent", CheckSeverity.OFF)
+      }
     }
   }
   if (JavaVersion.current().java9Compatible) {
diff --git a/test-java-lib-lombok/src/main/java/com/uber/lombok/LombokDTO.java b/test-java-lib-lombok/src/main/java/com/uber/lombok/LombokDTO.java
index 0455c6e078..37bedb4c14 100644
--- a/test-java-lib-lombok/src/main/java/com/uber/lombok/LombokDTO.java
+++ b/test-java-lib-lombok/src/main/java/com/uber/lombok/LombokDTO.java
@@ -28,10 +28,7 @@
 
 @Builder
 @Data
-@SuppressWarnings({
-  "SameNameButDifferent" /* crashes with EP 2.6.0 */,
-  "InlineMeInliner" /* crashes with EP 2.7.1 */
-})
+@SuppressWarnings({"MissingBraces" /* false positive warnings */})
 public class LombokDTO {
   // Note: Lombok generates a constructor directly into this class that initializes this field, so
   // NullAway does not