diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 39110bbf66..edd03e37c9 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1643,7 +1643,7 @@ func Test_setbufvar_keep_window_title()
   END
   call writefile(lines, 'Xsetbufvar')
   let buf = RunVimInTerminal('-S Xsetbufvar', {})
-  call assert_match('Xa.txt', term_gettitle(buf))
+  call WaitForAssert({-> assert_match('Xa.txt', term_gettitle(buf))}, 1000)
 
   call term_sendkeys(buf, "i\<F2>")
   call TermWait(buf)
diff --git a/src/version.c b/src/version.c
index 5be0473898..18d8fc79da 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4211,
 /**/
     4210,
 /**/