diff --git a/.cirrus.yml b/.cirrus.yml
index 27930b77..84bcc12a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -22,7 +22,7 @@ linux_task:
     matrix:
         - name: linux_clang
           container:
-              image: silkeh/clang:10
+              image: silkeh/clang:11
           env:
               CXX: clang++
         - name: linux_gcc
@@ -39,9 +39,12 @@ macos_task:
         - name: macos_clang
           clang_script: brew install llvm@11
           env:
-              CXX: /usr/local/opt/llvm@11/bin/clang++
+              CXX: /opt/homebrew/opt/llvm@11/bin/clang++
         - name: macos_gcc
-          gcc_script: brew install gcc@10
+          gcc_script:
+            - /usr/sbin/softwareupdate --install-rosetta --agree-to-license
+            - arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+            - arch -x86_64 /usr/local/bin/brew install gcc@10
           env:
               CXX: g++-10
     test_script: make -j4 test
diff --git a/test/regression/0-mouse-during-insert/script b/test/regression/0-mouse-during-insert/script
index aaf225ce..5ce30601 100644
--- a/test/regression/0-mouse-during-insert/script
+++ b/test/regression/0-mouse-during-insert/script
@@ -9,3 +9,4 @@ sleep .1
 ui_in '{ "jsonrpc": "2.0", "method": "mouse_release", "params": [ "left", 0, 4 ] }'
 sleep .1
 ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "c<esc>" ] }'
+sleep .1
diff --git a/test/regression/4843-trim-front-split-glyph/enabled b/test/regression/4843-trim-front-split-glyph/enabled
new file mode 100755
index 00000000..cb6be3fc
--- /dev/null
+++ b/test/regression/4843-trim-front-split-glyph/enabled
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ $(echo -n "⌛" | wc -m) = '1' ] && locale | grep LC_CTYPE | grep -qi 'utf-*8'