diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1c2cf5b..050fc6c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,23 +18,29 @@ jobs:
             cpu: i386
           - os: macos
             cpu: amd64
+          - os: macos
+            cpu: arm64
           - os: windows
             cpu: amd64
-          - os: windows
-            cpu: i386
         branch: [version-1-6, version-2-0, devel]
         include:
           - target:
               os: linux
-            builder: ubuntu-20.04
+            builder: ubuntu-latest
             shell: bash
           - target:
               os: macos
-            builder: macos-12
+              cpu: amd64
+            builder: macos-13
+            shell: bash
+          - target:
+              os: macos
+              cpu: arm64
+            builder: macos-latest
             shell: bash
           - target:
               os: windows
-            builder: windows-2019
+            builder: windows-latest
             shell: msys2 {0}
 
     defaults:
@@ -117,6 +123,8 @@ jobs:
         run: |
           if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
             PLATFORM=x64
+          elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
+            PLATFORM=arm64
           else
             PLATFORM=x86
           fi
diff --git a/kzg4844.nimble b/kzg4844.nimble
index 3571d65..ac28964 100644
--- a/kzg4844.nimble
+++ b/kzg4844.nimble
@@ -20,15 +20,19 @@ requires "nim >= 1.6.0"
 requires "stew >= 0.1.0"
 requires "unittest2"
 
+let cfg =
+  " --outdir:build -f -c --hints:off" &
+  " --styleCheck:usages --styleCheck:error --skipParentCfg" &
+  " -d:release -d:kzgExternalBlstNoSha256 -d:kzgExternalBlst"
+
 # Helper functions
 proc test(args, path: string) =
   if not dirExists "build":
     mkDir "build"
-  exec "nim " & getEnv("TEST_LANG", "c") & " " & getEnv("NIMFLAGS") & " " & args &
-    " --outdir:build -f -c --hints:off --warnings:off" &
-    " --styleCheck:usages --styleCheck:error --skipParentCfg " & path
+  exec "nim " & getEnv("TEST_LANG", "c") & " " & getEnv("NIMFLAGS") & " " &
+    cfg & " " & args & " " & path
 
 task test, "Run all tests":
-  test "-d:release -d:kzgExternalBlstNoSha256 -d:kzgExternalBlst", "tests/test_all"
+  test "--mm:refc", "tests/test_all"
   if (NimMajor, NimMinor) > (1, 6):
-    test "-d:release -d:kzgExternalBlstNoSha256 -d:kzgExternalBlst --mm:refc", "tests/test_all"
+    test "--mm:orc", "tests/test_all"