diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml
index 4e2c103632..422a824851 100644
--- a/.github/workflows/ci-macvim.yaml
+++ b/.github/workflows/ci-macvim.yaml
@@ -380,6 +380,7 @@ jobs:
       - name: Test Vim (GUI)
         timeout-minutes: 25
         run: |
+          defaults delete org.vim.MacVim  # Clean up stale states left from MacVim tests
           make ${MAKE_BUILD_ARGS} -C src/testdir clean
           make ${MAKE_BUILD_ARGS} -C src testgui
 
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 0a2c792137..fdc97658a1 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -58,6 +58,9 @@ if has('gui_running')
   if has('gui_gtk')
     " to keep screendump size unchanged
     set guifont=Monospace\ 10
+  elseif has('gui_macvim')
+    " keep defaults consistent with other GUIs
+    set guioptions-=k
   endif
   set columns=80 lines=25
 endif