diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index c7028d2a6..c2260c7b7 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -153,12 +153,13 @@ endif
 
 " Names of flaky tests.
 let s:flaky = [
-      \ 'Test_reltime()',
-      \ 'Test_nb_basic()',
-      \ 'Test_communicate()',
       \ 'Test_close_and_exit_cb()',
+      \ 'Test_collapse_buffers()',
+      \ 'Test_communicate()',
+      \ 'Test_nb_basic()',
       \ 'Test_pipe_through_sort_all()',
       \ 'Test_pipe_through_sort_some()'
+      \ 'Test_reltime()',
       \ ]
 
 " Locate Test_ functions and execute them.
diff --git a/src/version.c b/src/version.c
index ef5ddaee2..6b0953fdf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    284,
 /**/
     283,
 /**/