diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index 37e3a10..b053260 100644
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -50,6 +50,15 @@
   endtry
 
   let name = 'XVIMCLIPBOARD'
+
+  " Make sure a previous server has exited
+  try
+    call remote_send(name, ":qa!\<CR>")
+    call WaitFor('serverlist() !~ "' . name . '"')
+  catch /E241:/
+  endtry
+  call assert_notmatch(name, serverlist())
+
   let cmd .= ' --servername ' . name
   let g:job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
   call WaitFor('job_status(g:job) == "run"')
@@ -76,6 +85,7 @@
   call assert_equal('yes', remote_expr(name, "@*", "", 2))
 
   " Check that the *-register of this vim instance is changed as expected.
+  call WaitFor('@* == "yes"')
   call assert_equal('yes', @*)
 
   if has('unix') && has('gui') && !has('gui_running')
diff --git a/src/version.c b/src/version.c
index 8f59546..3c7c967 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    632,
+/**/
     631,
 /**/
     630,