diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 2c22498..fe17abb 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -274,15 +274,23 @@
 
 " Names of flaky tests.
 let s:flaky = [
+      \ 'Test_call()',
+      \ 'Test_channel_handler()',
       \ 'Test_client_server()',
       \ 'Test_close_and_exit_cb()',
+      \ 'Test_close_callback()',
+      \ 'Test_close_handle()',
+      \ 'Test_close_lambda()',
+      \ 'Test_close_partial()',
       \ 'Test_collapse_buffers()',
       \ 'Test_communicate()',
       \ 'Test_cwd()',
       \ 'Test_diff_screen()',
+      \ 'Test_exit_callback()',
       \ 'Test_exit_callback_interval()',
       \ 'Test_nb_basic()',
       \ 'Test_oneshot()',
+      \ 'Test_open_delay()',
       \ 'Test_out_cb()',
       \ 'Test_paused()',
       \ 'Test_pipe_through_sort_all()',
@@ -290,13 +298,35 @@
       \ 'Test_popup_and_window_resize()',
       \ 'Test_quoteplus()',
       \ 'Test_quotestar()',
+      \ 'Test_raw_one_time_callback()',
       \ 'Test_reltime()',
       \ 'Test_repeat_three()',
+      \ 'Test_server_crash()',
+      \ 'Test_terminal_ansicolors_default()',
+      \ 'Test_terminal_ansicolors_func()',
+      \ 'Test_terminal_ansicolors_global()',
       \ 'Test_terminal_composing_unicode()',
+      \ 'Test_terminal_env()',
+      \ 'Test_terminal_hide_buffer()',
+      \ 'Test_terminal_make_change()',
       \ 'Test_terminal_noblock()',
       \ 'Test_terminal_redir_file()',
+      \ 'Test_terminal_response_to_control_sequence()',
+      \ 'Test_terminal_scrollback()',
+      \ 'Test_terminal_split_quit()',
+      \ 'Test_terminal_termwinkey()',
+      \ 'Test_terminal_termwinsize_mininmum()',
+      \ 'Test_terminal_termwinsize_option_fixed()',
+      \ 'Test_terminal_termwinsize_option_zero()',
       \ 'Test_terminal_tmap()',
+      \ 'Test_terminal_wall()',
+      \ 'Test_terminal_wipe_buffer()',
+      \ 'Test_terminal_wqall()',
+      \ 'Test_two_channels()',
+      \ 'Test_unlet_handle()',
       \ 'Test_with_partial_callback()',
+      \ 'Test_zero_reply()',
+      \ 'Test_zz1_terminal_in_gui()',
       \ ]
 
 " Locate Test_ functions and execute them.
diff --git a/src/version.c b/src/version.c
index ebea70f..878891e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    530,
+/**/
     529,
 /**/
     528,