diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index 60636fd..bb42678 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -288,6 +288,12 @@
   return cmd
 endfunc
 
+" Return one when it looks like the tests are run with valgrind, which means
+" that everything is much slower.
+func RunningWithValgrind()
+  return GetVimCommand() =~ '\<valgrind\>'
+endfunc
+
 " Get the command to run Vim, with --clean instead of "-u NONE".
 func GetVimCommandClean()
   let cmd = GetVimCommand()
diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim
index 17d3616..b748a00 100644
--- a/src/testdir/test_debugger.vim
+++ b/src/testdir/test_debugger.vim
@@ -408,7 +408,7 @@
 
   # Start Vim in a terminal
   var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0})
-  call g:TermWait(buf)
+  call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50)
 
   # Despite the failure the functions are defined
   g:RunDbgCmd(buf, ':function g:EarlyFunc',
@@ -434,7 +434,7 @@
 
   # Start Vim in a terminal
   var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0})
-  call g:TermWait(buf)
+  call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50)
 
   g:RunDbgCmd(buf, ':call GetNum()',
      ['line 1: return 1  + 2  + 3'], {match: 'pattern'})
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 1dce160..67d29c5 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -374,7 +374,7 @@
     let ms = 1
     let min_time = 0.001
     let max_time = min_time * 10.0
-    if GetVimCommand() =~ 'valgrind.*--log-file='
+    if RunningWithValgrind()
       let max_time += 0.04  " this can be slow with valgrind
     endif
   endif
diff --git a/src/version.c b/src/version.c
index c945a2b..4678544 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5136,
+/**/
     5135,
 /**/
     5134,