diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 3618989d..84f5f148 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -42,12 +42,12 @@ jobs:
           - name: "Ubuntu 20.04"
             runner: ubuntu-latest
             container: ubuntu2004
-          - name: "macOS 10.15"
-            runner: macos-10.15
-            container: osx
-          #- name: "macOS 11"
-          #  runner: macos-11
-          #  container: osx
+          - name: "macOS 11"
+            runner: macos-11
+            container: osx-11
+          - name: "macOS 12"
+            runner: macos-12
+            container: osx-12
     runs-on: ${{ matrix.runner }}
     continue-on-error: ${{ matrix.continue-on-error == true }}
     steps:
@@ -59,9 +59,9 @@ jobs:
           GITHUB_USER: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CONTAINER: ${{ matrix.container }}
-        run: if [[ ${CONTAINER} != "osx" ]]; then docker-compose build test-${CONTAINER} ; fi
+        run: if [[ !( "${CONTAINER}" =~ osx-* ) ]] ; then docker-compose build "test-${CONTAINER}" ; fi
       - name: Test ${{ matrix.name }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CONTAINER: ${{ matrix.container }}
-        run: if [[ ${CONTAINER} != "osx" ]]; then docker-compose run test-${CONTAINER}; else bash test/scripts/test_osx.sh ; fi
+        run: if [[ "${CONTAINER}" =~ osx-* ]]; then docker-compose run "test-${CONTAINER}" ; else bash test/scripts/test_osx.sh ; fi