diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim
index 98c9cfb..0f03731 100644
--- a/src/testdir/term_util.vim
+++ b/src/testdir/term_util.vim
@@ -141,6 +141,9 @@
 
   call assert_equal("running", term_getstatus(a:buf))
 
+  " Wait for all the pending updates to terminal to complete
+  call TermWait(a:buf)
+
   " CTRL-O : works both in Normal mode and Insert mode to start a command line.
   " In Command-line it's inserted, the CTRL-U removes it again.
   call term_sendkeys(a:buf, "\<C-O>:\<C-U>qa!\<cr>")
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index c6abb1b..cf3d6fc 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2393,7 +2393,6 @@
   call term_sendkeys(buf, ":autocmd User\<CR>")
   call TermWait(buf, 50)
   call term_sendkeys(buf, "G")
-  call TermWait(buf, 50)
 
   call StopVimInTerminal(buf)
 endfunc
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index e51803d..074ab15 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -375,7 +375,7 @@
   else
     let ms = 1
     let min_time = 0.001
-    let max_time = min_time * 10.0
+    let max_time = min_time * 15.0
     if RunningWithValgrind()
       let max_time += 0.04  " this can be slow with valgrind
     endif
diff --git a/src/version.c b/src/version.c
index 9c64a27..a66b588 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1118,
+/**/
     1117,
 /**/
     1116,