diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fca481b3e3..51fc5948e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         java: [ 11, 17, 21 ]
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macOS-13, macOS-latest]
     steps:
       - name: Checkout Java Client
         uses: actions/checkout@v3
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
index f2e1f3d08a..90c8693157 100644
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -7,8 +7,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 8, 11, 17, 21 ]
-        os: [ubuntu-latest, windows-latest, macOS-13]
+        java: [ 11, 17, 21 ]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - name: Checkout Java Client
         uses: actions/checkout@v3
@@ -21,17 +21,30 @@ jobs:
           cache: 'gradle'
 
       - name: Run Unit Test
-        if: ${{ matrix.java != 8 }}
         run: ./gradlew clean unitTest
+  
+  test-java8:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-13]
+    steps:
+      - name: Checkout Java Client
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 8 (Runtime)
+        uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: temurin
+          cache: gradle
 
-      - name: Set up JDK 11
+      - name: Set up JDK 11 (Tools)
         uses: actions/setup-java@v3
-        if: ${{ matrix.java == 8 }}
         with:
           java-version: 11
-          distribution: 'temurin'
-          cache: 'gradle'
+          distribution: temurin
+          cache: gradle
 
       - name: Run Unit Test
-        if: ${{ matrix.java == 8 }}
         run: ./gradlew clean unitTest -D"runtime.java=8"