diff --git a/.github/actions/test_macvim_artifacts/action.yml b/.github/actions/test_macvim_artifacts/action.yml
new file mode 100644
index 0000000000..e02eec625e
--- /dev/null
+++ b/.github/actions/test_macvim_artifacts/action.yml
@@ -0,0 +1,26 @@
+# This is a clone of test_artifacts for MacVim-specific files
+name: 'test_macvim_artifacts'
+description: "Upload failed MacVim test artifacts"
+runs:
+  using: "composite"
+  steps:
+    - name: Upload failed tests
+      uses: actions/upload-artifact@v4
+      with:
+        # Name of the artifact to upload.
+        name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-macvim-tests
+
+        # A file, directory or wildcard pattern that describes what
+        # to upload.
+        path: |
+         /Users/runner/Library/Developer/Xcode/DerivedData/MacVim-*/Logs/Test/*.xcresult
+        # The desired behavior if no files are found using the
+        # provided path.
+        if-no-files-found: ignore
+
+        # Duration after which artifact will expire in days. 0 means
+        # using repository settings.
+        retention-days: 0
+
+        # If true, an artifact with a matching name will be deleted
+        overwrite: true
diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml
index 33552476c8..4e2c103632 100644
--- a/.github/workflows/ci-macvim.yaml
+++ b/.github/workflows/ci-macvim.yaml
@@ -207,6 +207,7 @@ jobs:
           else
             CONFOPT+=(
               --disable-sparkle       # Disable Sparkle for testing that this flag builds and works
+              --enable-nls=no --enable-libsodium=no # Disable gettext and libsodium unless we built them ourselves for publish
             )
           fi
           if ${{ matrix.legacy == true }}; then
@@ -354,6 +355,10 @@ jobs:
         run: |
           make ${MAKE_BUILD_ARGS} -C src macvim-tests
 
+      - name: Upload failed MacVim test results
+        if: ${{ !cancelled() && failure() }}
+        uses: ./.github/actions/test_macvim_artifacts
+
       - name: Build Vim test binaries
         run: |
           # Build the unit test binaries first. With link-time-optimization they take some time to link. Running them