diff --git a/.github/workflows/arrow-flight-tests.yml b/.github/workflows/arrow-flight-tests.yml
index 3c9582c790bbe..e9b43faec6dd9 100644
--- a/.github/workflows/arrow-flight-tests.yml
+++ b/.github/workflows/arrow-flight-tests.yml
@@ -19,12 +19,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        java: [ 8, 17.0.13 ]
         modules:
           - ":presto-base-arrow-flight"  # Only run tests for the `presto-base-arrow-flight` module
 
     timeout-minutes: 80
     concurrency:
-      group: ${{ github.workflow }}-test-${{ matrix.modules }}-${{ github.event.pull_request.number }}
+      group: ${{ github.workflow }}-test-${{ matrix.modules }}-${{ github.event.pull_request.number }}-${{ matrix.java }}
       cancel-in-progress: true
 
     steps:
@@ -37,7 +38,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: ${{ matrix.java }}
           cache: 'maven'
       - name: Download nodejs to maven cache
         run: .github/bin/download_nodejs
diff --git a/presto-base-arrow-flight/pom.xml b/presto-base-arrow-flight/pom.xml
index 693f753ee0c0b..2f46d3f56098c 100644
--- a/presto-base-arrow-flight/pom.xml
+++ b/presto-base-arrow-flight/pom.xml
@@ -14,6 +14,7 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <air.test.jvm.additional-arguments>-Xss10M</air.test.jvm.additional-arguments>
     </properties>
 
     <dependencies>
@@ -214,13 +215,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Xss10M</argLine>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -262,6 +256,7 @@
             </activation>
             <properties>
                 <air.test.jvm.additional-arguments>
+                    -Xss10M
                     --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED
                 </air.test.jvm.additional-arguments>
             </properties>