diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index fe4c99b1da..2b419f627e 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -942,7 +942,13 @@ is_na_patch() {
           test "$HUNK_NUM_FINAL" -ne 0 && return 1
         fi
         ;;
-      src/testdir/Make*.mak)
+      src/testdir/Makefile)
+        HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
+          '-IREDIR_TEST_TO_NULL = ' \
+          "$patch" -- "${file}")
+        test -n "$HUNKS" && return 1
+        ;;
+      src/testdir/Make_all.mak)
         HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
           '-I\stest8[67]\.out \\$' \
           "$patch" -- "${file}")
@@ -960,11 +966,14 @@ is_na_patch() {
           '-I^EXTERN char e_.*enddef' \
           '-I^EXTERN char e_.*vim9' \
           '-I^EXTERN char e_cannot_declare_.*variable_str' \
+          '-I^EXTERN char e_dictionary_not_set' \
+          '-I^EXTERN char e_dictnull' \
           '-I\sINIT\(= .+"E[0-9]+: (Abstract|Class|Enum|Interface|Type) ' \
           '-I\sINIT\(= .+"E[0-9]+: .*:def ' \
           '-I\sINIT\(= .+"E[0-9]+: .*enddef"' \
           '-I\sINIT\(= .+"E[0-9]+: .*[vV]im9' \
           '-I\sINIT\(= .+"E1016: Cannot declare .* variable: ' \
+          '-I\s+INIT\(= .+"E1103: Dictionary not set' \
           "$patch" -- "${file}" |
           grep '^@@ .* @@')
         if test -n "$HUNKS"; then
@@ -982,6 +991,7 @@ is_na_patch() {
           '-I#\s*define.*ex_ni$' \
           '-I[_.>]sc_version = ' \
           '-I[_.>]uf_script_ctx_version = ' \
+          '-I = skip_type\(.+\);$' \
           "$patch" -- "${file}" |
           grep '^@@ .* @@')
         if test -n "$HUNKS"; then
diff --git a/scripts/vim_na_files.txt b/scripts/vim_na_files.txt
index bacb78ab51..566b85339f 100644
--- a/scripts/vim_na_files.txt
+++ b/scripts/vim_na_files.txt
@@ -98,6 +98,8 @@ src/terminal.c
 src/termlib.c
 src/testdir/Make_amiga.mak
 src/testdir/Make_dos.mak
+src/testdir/Make_ming.mak
+src/testdir/Make_mvc.mak
 src/testdir/crash/heap_overflow3
 src/testdir/lsan-suppress.txt
 src/testdir/samples/terminal_max_combining_chars.txt