diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index fe02d889c..7530bb9d5 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -336,6 +336,7 @@ let s:flaky_tests = [
       \ 'Test_repeat_many()',
       \ 'Test_repeat_three()',
       \ 'Test_server_crash()',
+      \ 'Test_stop_all_in_callback()',
       \ 'Test_terminal_ansicolors_default()',
       \ 'Test_terminal_ansicolors_func()',
       \ 'Test_terminal_ansicolors_global()',
diff --git a/src/version.c b/src/version.c
index 38290c6b6..e497399d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1854,
 /**/
     1853,
 /**/