diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index aff0918..d64e845 100644
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -217,6 +217,14 @@
   endif
 endfunc
 
+" Command to check for not running under valgrind
+command CheckNotValgrind call CheckNotValgrind()
+func CheckNotValgrind()
+  if RunningWithValgrind()
+    throw 'Skipped: does not work well with valgrind'
+  endif
+endfunc
+
 " Command to check for X11 based GUI
 command CheckX11BasedGui call CheckX11BasedGui()
 func CheckX11BasedGui()
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index a7a609b..d299ee3 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1793,9 +1793,7 @@
 
 func Test_job_stop_immediately()
   " With valgrind this causes spurious leak reports
-  if RunningWithValgrind()
-    return
-  endif
+  CheckNotValgrind
 
   let g:job = job_start([s:python, '-c', 'import time;time.sleep(10)'])
   try
diff --git a/src/testdir/test_exit.vim b/src/testdir/test_exit.vim
index c05374c..a7596e1 100644
--- a/src/testdir/test_exit.vim
+++ b/src/testdir/test_exit.vim
@@ -115,6 +115,7 @@
   CheckNotMSWindows
   " The early exit causes memory not to be freed somehow
   CheckNotAsan
+  CheckNotValgrind
 
   call writefile([":au VimLeave * call writefile(['l = ' .. v:exiting], 'Xtestout')", ":tabnew", "q:"], 'Xscript', 'b')
 
diff --git a/src/version.c b/src/version.c
index 9b2fd4e..0353e90 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5145,
+/**/
     5144,
 /**/
     5143,