diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 502fa3d..0365138 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,8 +10,19 @@ jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os:
+          - ubuntu-20.04
+          - ubuntu-22.04
+          - ubuntu-24.04
+          - ubuntu-latest
+          - macos-12
+          - macos-13
+          - macos-13-xlarge
+          - macos-14
+          - macos-14-xlarge
+          - macos-latest
         node-version:
           - 18.x
           - 20.x
@@ -34,9 +45,9 @@ jobs:
             **/node_modules
             .rdf-test-suite-cache
             .rdf-test-suite-ldf-cache
-          key: ${{ runner.os }}-test-modules-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ runner.node-version }}-test-modules-${{ hashFiles('**/package-lock.json') }}
       - name: Install dependencies
-        run: npm install
+        run: npm install --verbose
       - name: Run tests
         run: npm run test
       - name: Run bin
diff --git a/binding.gyp b/binding.gyp
index 3003f32..450d3e7 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -38,6 +38,7 @@
       ],
       "defines": [
         "HAVE_CDS",
+        "_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION",
       ],
       "cflags!":    [ "-fno-rtti", "-fno-exceptions" ],
       "cflags_cc!": [ "-fno-rtti", "-fno-exceptions" ],
@@ -46,7 +47,8 @@
         "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
         "OTHER_CFLAGS": [
           "-stdlib=libc++",
-          "-Wno-register"
+          "-Wno-register",
+          "-std=c++17",
         ],
       },
     },