diff --git a/.evergreen/compile-unix.sh b/.evergreen/compile-unix.sh
index 9cad0c333b7..9f9fb9dad95 100755
--- a/.evergreen/compile-unix.sh
+++ b/.evergreen/compile-unix.sh
@@ -195,6 +195,10 @@ case "$CC" in
    ;;
 esac
 
+if [ "darwin" = "$OS" -a "arm64" = "$MARCH" ]; then
+   CONFIGURE_FLAGS="$CONFIGURE_FLAGS -DCMAKE_OSX_ARCHITECTURES=arm64"
+fi
+
 CONFIGURE_FLAGS="$CONFIGURE_FLAGS $EXTRA_CONFIGURE_FLAGS"
 export MONGOC_TEST_FUTURE_TIMEOUT_MS=30000
 export MONGOC_TEST_SKIP_LIVE=on
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 93b41dc4415..6ccd74f2bb3 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -27502,3 +27502,10 @@ buildvariants:
   - debug-compile-nosasl-openssl
   - debug-compile-nosasl-nossl
   - .versioned-api
+- name: macos_m1
+  display_name: macOS m1 (Apple LLVM)
+  expansions:
+    CC: clang
+  run_on: macos-1100-arm64
+  tasks:
+  - debug-compile-sasl-darwinssl
diff --git a/build/evergreen_config_lib/variants.py b/build/evergreen_config_lib/variants.py
index ebba301a4df..640f183bb7e 100644
--- a/build/evergreen_config_lib/variants.py
+++ b/build/evergreen_config_lib/variants.py
@@ -671,5 +671,10 @@ def days(n):
         ['debug-compile-nosasl-openssl',
          'debug-compile-nosasl-nossl',
          '.versioned-api'],
-        {})
+        {}),
+    Variant('macos_m1',
+        'macOS m1 (Apple LLVM)',
+        'macos-1100-arm64',
+        ['debug-compile-sasl-darwinssl'],
+        {'CC': 'clang'}),
 ]
diff --git a/src/libmongoc/tests/test-mongoc-stream-tls.c b/src/libmongoc/tests/test-mongoc-stream-tls.c
index 37af3e0736f..3895de499ca 100644
--- a/src/libmongoc/tests/test-mongoc-stream-tls.c
+++ b/src/libmongoc/tests/test-mongoc-stream-tls.c
@@ -418,7 +418,11 @@ test_stream_tls_install (TestSuite *suite)
 {
 #if !defined(MONGOC_ENABLE_SSL_SECURE_CHANNEL) && \
    !defined(MONGOC_ENABLE_SSL_LIBRESSL)
+
+   /* Disable /TLS/commonName on macOS due to CDRIVER-4256. */
+#if !defined(MONGOC_ENABLE_SSL_SECURE_TRANSPORT)
    TestSuite_Add (suite, "/TLS/commonName", test_mongoc_tls_common_name);
+#endif
    TestSuite_Add (suite, "/TLS/altname", test_mongoc_tls_altname);
    TestSuite_Add (suite, "/TLS/basic", test_mongoc_tls_basic);
    TestSuite_Add (suite,