diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 395de52..bb9cdc7 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2493,6 +2493,7 @@
   call term_sendkeys(buf, ":call OpenTerm(1)\<CR>")
   call TermWait(buf, 150)
   call term_sendkeys(buf, ":set hlsearch\<CR>")
+  call TermWait(buf, 100)
   call term_sendkeys(buf, "/edit\<CR>")
   call VerifyScreenDump(buf, 'Test_terminal_popup_3', {})
  
@@ -2517,7 +2518,7 @@
 
   call TermWait(buf, 50)
   call term_sendkeys(buf, ":q\<CR>")
-  call TermWait(buf, 100)  " wait for terminal to vanish
+  call TermWait(buf, 150)  " wait for terminal to vanish
 
   call StopVimInTerminal(buf)
   call delete('Xtext')
@@ -2704,8 +2705,7 @@
   call term_sendkeys(buf, "i")
   for i in range(len(keys))
     call term_sendkeys(buf, "\<C-U>\<C-K>" .. keys[i])
-    call term_wait(buf)
-    call assert_equal(output[i], term_getline(buf, 1))
+    call WaitForAssert({-> assert_equal(output[i], term_getline(buf, 1))})
   endfor
 
   let keypad_keys = ["\<k0>", "\<k1>", "\<k2>", "\<k3>", "\<k4>", "\<k5>",
@@ -2720,13 +2720,11 @@
       continue
     endif
     call term_sendkeys(buf, "\<C-U>" .. keypad_keys[i])
-    call term_wait(buf)
-    call assert_equal(keypad_output[i], term_getline(buf, 1))
+    call WaitForAssert({-> assert_equal(keypad_output[i], term_getline(buf, 1))})
   endfor
 
   call feedkeys("\<C-U>\<kEnter>\<BS>one\<C-W>.two", 'xt')
-  call term_wait(buf)
-  call assert_equal('two', term_getline(buf, 1))
+  call WaitForAssert({-> assert_equal('two', term_getline(buf, 1))})
 
   call StopVimInTerminal(buf)
 endfunc
diff --git a/src/version.c b/src/version.c
index 9e8ba92..3bd0ec4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    811,
+/**/
     810,
 /**/
     809,