diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 3f197ca3d3..39110bbf66 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1632,6 +1632,9 @@ endfunc
 
 func Test_setbufvar_keep_window_title()
   CheckRunVimInTerminal
+  if !has('title') || empty(&t_ts)
+    throw "Skipped: can't get/set title"
+  endif
 
   let lines =<< trim END
       edit Xa.txt
diff --git a/src/version.c b/src/version.c
index 4c263aee42..5be0473898 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 */
+/**/
+    4210,
 /**/
     4209,
 /**/