diff --git a/test/all.py b/test/all.py
index 44a0371..f416135 100755
--- a/test/all.py
+++ b/test/all.py
@@ -36,6 +36,8 @@
     Prerequisites()
 
     test_cmd = ["nvim", "-l", "run-tests.lua", ".", "--no-keep-going"]
+    # Use the following command to see neovim screen
+    # test_cmd = ["python", "nvim.py", "+luafile main.lua"]
     print(f"Run `{' '.join(test_cmd)}`")
     res = subprocess.run(test_cmd)
     if res.returncode != 0:
diff --git a/utils/testenv_darwin.py b/utils/testenv_darwin.py
index 734e7bd..82fb33d 100644
--- a/utils/testenv_darwin.py
+++ b/utils/testenv_darwin.py
@@ -1,4 +1,5 @@
 import os
+import platform
 import subprocess
 import urllib.request
 
@@ -16,14 +17,17 @@ def __init__(self, url: str):
 
         subprocess.run('pip install --user six', shell=True, check=True)
 
-        urllib.request.urlretrieve(f"{url}/nvim-macos.tar.gz",
-                                   "nvim-macos.tar.gz")
+        # Macos may be running on arm64
+        machine = platform.machine()
+
+        urllib.request.urlretrieve(f"{url}/nvim-macos-{machine}.tar.gz",
+                                   f"nvim-macos-{machine}.tar.gz")
         subprocess.run(
-            r'''
-tar -xf nvim-macos.tar.gz
+            f'''
+tar -xf nvim-macos-{machine}.tar.gz
 cat >"$HOME/bin/nvim" <<EOF
 #!/bin/bash
-$(pwd)/nvim-macos/bin/nvim "\$@"
+$(pwd)/nvim-macos-{machine}/bin/nvim "\\$@"
 EOF
 chmod +x "$HOME/bin/nvim"
             ''',