diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 348bdafda1..0d8cc2123b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [8, 11, 15]
+        java: [8, 11, 15, 17]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [8, 11, 15]
+        java: [8, 11, 15, 17]
       fail-fast: false
       max-parallel: 4
     name: Bazel Test JDK ${{ matrix.java }}, ${{ matrix.os }}
diff --git a/extensions/servlet/pom.xml b/extensions/servlet/pom.xml
index 3b3e31bc49..b89fdbe51a 100644
--- a/extensions/servlet/pom.xml
+++ b/extensions/servlet/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>3.0</version>
+      <version>3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>