diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 811af13..02840de 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -42,7 +42,7 @@
   call remote_foreground(name)
 
   call remote_send(name, ":let testvar = 'yes'\<CR>")
-  call WaitFor('remote_expr("' . name . '", "testvar", "", 1) == "yes"')
+  call WaitFor('remote_expr("' . name . '", "exists(\"testvar\") ? testvar : \"\"", "", 1) == "yes"')
   call assert_equal('yes', remote_expr(name, "testvar", "", 2))
 
   if has('unix') && has('gui') && !has('gui_running')
diff --git a/src/version.c b/src/version.c
index e14c2fe..552de77 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1251,
+/**/
     1250,
 /**/
     1249,