diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 7936227eb..4a48aed91 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -129,7 +129,7 @@ func Test_client_server()
 
     " Edit files in separate tab pages
     call system(cmd .. ' --remote-tab Xfile1 Xfile2 Xfile3')
-    call assert_equal('3', remote_expr(name, 'tabpagenr("$")'))
+    call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))})
     call assert_equal('Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])'))
     eval name->remote_send(":%bw!\<CR>")
 
diff --git a/src/version.c b/src/version.c
index aaa1dc352..2eadd1304 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    534,
 /**/
     533,
 /**/