diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 57a6318cf5..b936b3eee4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -29,6 +29,13 @@ jobs:
         with:
             java-version: 8
 
+      # The miredot plugin's POM cannot be resolved by Maven 3.10+ (${toolsjar} is
+      # never set), so pin the last working Maven 3.9 release instead of the runner's.
+      - name: Set up Maven
+        run: |
+          curl -fsSL https://archive.apache.org/dist/maven/maven-3/3.9.16/binaries/apache-maven-3.9.16-bin.tar.gz | tar xz -C "$RUNNER_TEMP"
+          echo "$RUNNER_TEMP/apache-maven-3.9.16/bin" >> "$GITHUB_PATH"
+
       - name: Maven cache
         uses: actions/cache@v4
         with:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 5c029bac62..1686431af3 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -25,6 +25,13 @@ jobs:
         with:
           java-version: 8
 
+      # The miredot plugin's POM cannot be resolved by Maven 3.10+ (${toolsjar} is
+      # never set), so pin the last working Maven 3.9 release instead of the runner's.
+      - name: Set up Maven
+        run: |
+          curl -fsSL https://archive.apache.org/dist/maven/maven-3/3.9.16/binaries/apache-maven-3.9.16-bin.tar.gz | tar xz -C "$RUNNER_TEMP"
+          echo "$RUNNER_TEMP/apache-maven-3.9.16/bin" >> "$GITHUB_PATH"
+
       - name: Maven cache
         uses: actions/cache@v4
         with:
diff --git a/src/test/java/org/ohdsi/webapi/report/CDMResultsAnalysisRunnerTest.java b/src/test/java/org/ohdsi/webapi/report/CDMResultsAnalysisRunnerTest.java
index 90aad7c543..cb6d33a4ce 100644
--- a/src/test/java/org/ohdsi/webapi/report/CDMResultsAnalysisRunnerTest.java
+++ b/src/test/java/org/ohdsi/webapi/report/CDMResultsAnalysisRunnerTest.java
@@ -15,6 +15,7 @@
 import org.ohdsi.webapi.source.SourceDaimon;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementSetter;
 import org.springframework.jdbc.core.RowMapper;
 
 /**
@@ -47,7 +48,7 @@ public void setUp() {
     public void getDrilldown_propagatesQueryFailureInsteadOfReturningEmptyResult() {
 
         // Simulate a SQL failure during the drilldown (e.g. unreachable results schema)
-        when(jdbcTemplate.query(anyString(), any(), any(RowMapper.class)))
+        when(jdbcTemplate.query(anyString(), any(PreparedStatementSetter.class), any(RowMapper.class)))
                 .thenThrow(new DataAccessResourceFailureException("simulated SQL failure"));
 
         try {