diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index 1f835b8..cdf9fd3 100644
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -100,15 +100,20 @@
   if !executable('cat')
     return
   endif
-  new
-  call setline(1, range(1, 20))
-  4,$fold
-  %foldopen
-  10,$fold
-  %foldopen
-  " This filter command should not have an effect
-  1,8! cat
-  call feedkeys('5ggzdzMGdd', 'xt')
-  call assert_equal(['1', '2', '3', '4', '5', '6', '7', '8', '9'], getline(1, '$'))
-  bwipe!
+  for type in ['manual', 'marker']
+    exe 'set foldmethod=' . type
+    new
+    call setline(1, range(1, 20))
+    4,$fold
+    %foldopen
+    10,$fold
+    %foldopen
+    " This filter command should not have an effect
+    1,8! cat
+    call feedkeys('5ggzdzMGdd', 'xt')
+    call assert_equal(['1', '2', '3', '4', '5', '6', '7', '8', '9'], getline(1, '$'))
+
+    bwipe!
+    set foldmethod&
+  endfor
 endfunc
diff --git a/src/version.c b/src/version.c
index cc69b3c..39c6b4e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    407,
+/**/
     406,
 /**/
     405,