diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
index fac97cc..034b15f 100644
--- a/.github/workflows/functional-test.yml
+++ b/.github/workflows/functional-test.yml
@@ -18,10 +18,16 @@ env:
 jobs:
   build:
 
+    # https://github.com/actions/runner-images/tree/main/images/macos
     strategy:
       matrix:
-        xcodeVersion: ['13.4', '14.2']
-        platform: ['macos-12']
+        include:
+        - xcodeVersion: '14.3.1'
+          platform: macos-13
+        - xcodeVersion: '15.4'
+          platform: macos-14
+        - xcodeVersion: '16.0'
+          platform: macos-15
       fail-fast: false
 
     runs-on: ${{ matrix.platform }}
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 1b8f6b8..067e4d5 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -48,15 +48,17 @@ jobs:
   analyze_wda:
     strategy:
       matrix:
-        os: [macos-12, macos-13, macos-14]
-        xcode_version: [13, 14, 15]
+        os: [macos-13, macos-14, macos-15]
+        xcode_version: [14, 15, 16]
         exclude:
+        - os: macos-15
+          xcode_version: 14
+        - os: macos-15
+          xcode_version: 15
         - os: macos-13
-          xcode_version: 13
+          xcode_version: 16
         - os: macos-14
-          xcode_version: 13
-        - os: macos-12
-          xcode_version: 15
+          xcode_version: 16
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3