diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index 3c6fe1c..01d741c 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -21,6 +21,8 @@
     let s:python = 'python'
   elseif has('win32')
     " Use Python Launcher for Windows (py.exe) if available.
+    " NOTE: if you get a "Python was not found" error, disable the Python
+    " shortcuts in "Windows menu / Settings / Manage App Execution Aliases".
     if executable('py.exe')
       let s:python = 'py.exe'
     elseif executable('python.exe')
diff --git a/src/testdir/test_function_lists.vim b/src/testdir/test_function_lists.vim
index fab3363..7bf8d4d 100644
--- a/src/testdir/test_function_lists.vim
+++ b/src/testdir/test_function_lists.vim
@@ -55,7 +55,12 @@
   " Verify that the ":help functions" list is complete and in ASCII order.
 
   enew!
-  read ../../runtime/doc/eval.txt
+  if filereadable('../../doc/eval.txt')
+    " unpacked MS-Windows zip archive
+    read ../../doc/eval.txt
+  else
+    read ../../runtime/doc/eval.txt
+  endif
   call search('\*functions\*$')
   call search('^USAGE')
   1,.d
@@ -75,7 +80,12 @@
   " Verify that the ":help function-list" list is complete.
 
   enew!
-  read ../../runtime/doc/usr_41.txt
+  if filereadable('../../doc/usr_41.txt')
+    " unpacked MS-Windows zip archive
+    read ../../doc/usr_41.txt
+  else
+    read ../../runtime/doc/usr_41.txt
+  endif
   call search('\*function-list\*$')
   1,.d
   call search('^==*$')
diff --git a/src/version.c b/src/version.c
index 0e6e301..435117d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2824,
+/**/
     2823,
 /**/
     2822,