diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1b2a269aa..a9285397c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -236,11 +236,13 @@ jobs:
       - name: Check style
         run: ant checkstyle
       
-      - name: Build
-        run: ant build
+      - name: Build and Test
+        if: needs.compute-version.outputs.doRelease == 'true'
+        run: ant -new-version-set build test
       
-      - name: Test
-        run: ant test
+      - name: Build and Test
+        if: needs.compute-version.outputs.doRelease != 'true'
+        run: ant build test
       
       - name: Set Java 21
         if: needs.compute-version.outputs.doRelease == 'true'