diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 4dcda85..02eeb6b 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -430,8 +430,9 @@
     let names = system('net user')
     if names =~ 'Administrator'
       " Trying completion of  :e ~A  should complete to Administrator.
+      " There could be other names starting with "A" before Administrator.
       call feedkeys(':e ~A' . "\<c-a>\<c-B>\"\<cr>", 'tx')
-      call assert_match('^"e \~Administrator', @:)
+      call assert_match('^"e \~.*Administrator', @:)
     endif
   endif
 endfunc
diff --git a/src/version.c b/src/version.c
index 31bf378..dac3c62 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    836,
+/**/
     835,
 /**/
     834,