diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index ef311ed739..523bde86be 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -3220,11 +3220,11 @@ func Test_fuzzy_completion_bufname_fullpath()
   edit Xcmd/Xstate/Xfile.js
   cd Xcmd/Xstate
   enew
-  call feedkeys(":b CmdStateFile\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"b CmdStateFile', @:)
+  call feedkeys(":b cmdstatefile\<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"b cmdstatefile', @:)
   set wildoptions=fuzzy
-  call feedkeys(":b CmdStateFile\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"b CmdStateFile', @:)
+  call feedkeys(":b cmdstatefile\<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_match('Xcmd/Xstate/Xfile.js$', @:)
   cd -
   set wildoptions&
 endfunc
diff --git a/src/testdir/test_search_stat.vim b/src/testdir/test_search_stat.vim
index 38f71a2d5b..fa3ddec2db 100644
--- a/src/testdir/test_search_stat.vim
+++ b/src/testdir/test_search_stat.vim
@@ -492,6 +492,9 @@ endfunc
 func Test_search_stat_option()
   " Asan causes wrong results, because the search times out
   CheckNotAsan
+  " Mark the test as flaky as the search may still occasionally time out
+  let g:test_is_flaky = 1
+
   enew
   set shortmess-=S
   set maxsearchcount=999
diff --git a/src/version.c b/src/version.c
index 14178370ae..deae1c7bbd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1630,
 /**/
     1629,
 /**/