diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 1fadd5e..4856ae3 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -1430,9 +1430,12 @@
   %bw!
   %argdelete
   call delete('Xdir1', 'rf')
+
   " drop files in the command line. The GUI drop files adds the file names to
   " the low level input buffer. So need to use a cmdline map and feedkeys()
   " with 'Lx!' to process it in this function itself.
+  " This sometimes fails, e.g. when using valgrind.
+  let g:test_is_flaky = 1
   cnoremap <expr> <buffer> <F4> DropFilesInCmdLine()
   call feedkeys(":\"\<F4>\<CR>", 'xt')
   call feedkeys('k', 'Lx!')
diff --git a/src/version.c b/src/version.c
index afb61e0..280fcff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    295,
+/**/
     294,
 /**/
     293,