diff --git a/.build-jdk17 b/.build-jdk17
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b957b071..10338025d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 17, 21, 25 ]
     name: jdk-${{ matrix.java }}
     steps:
       - uses: actions/checkout@v3
@@ -16,9 +16,19 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: ${{ matrix.java }}
+          # The JDK listed last will be the default and what Maven runs with
+          # https://github.com/marketplace/actions/setup-java-jdk#install-multiple-jdks
+          java-version: |
+            ${{ matrix.java }}
+            25
           cache: "maven"
       - name: "Build"
-        run: mvn --batch-mode -no-transfer-progress -V verify
+        run: |
+          mvn \
+            --batch-mode \
+            -no-transfer-progress \
+            -V \
+            -Dproject.build.jdk.version=${{ matrix.java }} \
+            verify
         env:
           JDK_JAVA_OPTIONS: --add-opens=java.base/java.lang=ALL-UNNAMED
diff --git a/pom.xml b/pom.xml
index 5bd94e37f..98aec544c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.hubspot</groupId>
     <artifactId>basepom</artifactId>
-    <version>63.4</version>
+    <version>65.1</version>
   </parent>
 
   <groupId>com.hubspot.jinjava</groupId>
@@ -17,12 +17,12 @@
 
   <properties>
     <project.build.targetJdk>17</project.build.targetJdk>
-    <project.build.releaseJdk>17</project.build.releaseJdk>
 
     <dep.plugin.jacoco.version>0.8.3</dep.plugin.jacoco.version>
     <dep.plugin.javadoc.version>3.0.1</dep.plugin.javadoc.version>
     <dep.hubspot-immutables.version>1.9</dep.hubspot-immutables.version>
     <dep.algebra.version>1.5</dep.algebra.version>
+    <dep.mockito.version>5.20.0</dep.mockito.version>
 
 
     <basepom.test.add.opens>
@@ -181,6 +181,10 @@
       <groupId>ch.obermuhlner</groupId>
       <artifactId>big-math</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -336,6 +340,18 @@
           <argLine>@{argLine} ${basepom.test.add.opens}</argLine>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.immutables</groupId>
+              <artifactId>value</artifactId>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
     </plugins>
   </build>