diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 5f2e8870a1..8aa9428f2a 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -228,12 +228,13 @@ func Test_client_server_stopinsert()
   " When using valgrind it takes much longer.
   call WaitForAssert({-> assert_match(name, serverlist())})
 
-  call remote_expr(name, 'execute("stopinsert")')
+  call remote_send(name, "\<C-\>\<C-N>")
 
+  " Wait for the mode to change to Normal ('n')
   call WaitForAssert({-> assert_equal('n', name->remote_expr("mode(1)"))})
-  cal WaitForAssert({-> assert_equal('13', name->remote_expr("col('.')"))})
+  call WaitForAssert({-> assert_equal('13', name->remote_expr("col('.')"))})
 
-  eval name->remote_send(":qa!\<CR>")
+  call remote_send(name, "\<C-\>\<C-N>:qa!\<CR>")
   try
     call WaitForAssert({-> assert_equal("dead", job_status(job))})
   finally
diff --git a/src/version.c b/src/version.c
index 1aeec3e40b..d001aa53fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    85,
 /**/
     84,
 /**/