diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f88be2d958a..233441ab04c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        java: [ 17, 11, 8 ]
+        java: [ 17, 11 ]
         experimental: [ false ]
         # Only test on macos and windows with a single recent JDK to avoid a
         # combinatorial explosion of test configurations.
@@ -63,10 +63,10 @@ jobs:
     steps:
       - name: 'Check out repository'
         uses: actions/checkout@v2
-      - name: 'Set up JDK 8'
+      - name: 'Set up JDK 11'
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'zulu'
           cache: 'maven'
           server-id: ossrh
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/Inliner.java b/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/Inliner.java
index 066b86cb6cd..3cc5677603f 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/Inliner.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/Inliner.java
@@ -147,7 +147,7 @@ private Description match(
       ExpressionTree receiver,
       VisitorState state) {
     Optional<InlineMeData> inlineMe = InlineMeData.createFromSymbol(symbol);
-    if (!inlineMe.isPresent()) {
+    if (inlineMe.isEmpty()) {
       return Description.NO_MATCH;
     }