diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index b7f9229..20488ef 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -315,56 +315,28 @@
 " Names of flaky tests.
 let s:flaky_tests = [
       \ 'Test_autocmd_SafeState()',
-      \ 'Test_call()',
-      \ 'Test_channel_handler()',
       \ 'Test_client_server()',
       \ 'Test_close_and_exit_cb()',
-      \ 'Test_close_callback()',
-      \ 'Test_close_handle()',
-      \ 'Test_close_lambda()',
       \ 'Test_close_output_buffer()',
-      \ 'Test_close_partial()',
       \ 'Test_collapse_buffers()',
-      \ 'Test_communicate()',
       \ 'Test_cwd()',
       \ 'Test_diff_screen()',
-      \ 'Test_exit_callback()',
       \ 'Test_exit_callback_interval()',
       \ 'Test_map_timeout_with_timer_interrupt()',
       \ 'Test_nb_basic()',
-      \ 'Test_open_delay()',
       \ 'Test_out_cb()',
       \ 'Test_pipe_through_sort_all()',
       \ 'Test_pipe_through_sort_some()',
       \ 'Test_popup_and_window_resize()',
       \ 'Test_quoteplus()',
       \ 'Test_quotestar()',
-      \ 'Test_raw_one_time_callback()',
       \ 'Test_reltime()',
-      \ 'Test_server_crash()',
       \ 'Test_state()',
-      \ 'Test_terminal_ansicolors_default()',
-      \ 'Test_terminal_ansicolors_func()',
-      \ 'Test_terminal_ansicolors_global()',
       \ 'Test_terminal_composing_unicode()',
       \ 'Test_terminal_does_not_truncate_last_newlines()',
-      \ 'Test_terminal_env()',
-      \ 'Test_terminal_hide_buffer()',
-      \ 'Test_terminal_make_change()',
       \ 'Test_terminal_no_cmd()',
       \ '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_minimum()',
-      \ 'Test_terminal_termwinsize_option_fixed()',
-      \ 'Test_terminal_termwinsize_option_zero()',
-      \ 'Test_terminal_tmap()',
-      \ 'Test_terminal_wall()',
-      \ 'Test_terminal_wipe_buffer()',
-      \ 'Test_terminal_wqall()',
       \ 'Test_termwinscroll()',
       \ 'Test_timer_oneshot()',
       \ 'Test_timer_paused()',
@@ -372,11 +344,7 @@
       \ 'Test_timer_repeat_three()',
       \ 'Test_timer_stop_all_in_callback()',
       \ 'Test_timer_stop_in_callback()',
-      \ 'Test_two_channels()',
-      \ 'Test_unlet_handle()',
       \ 'Test_timer_with_partial_callback()',
-      \ 'Test_zero_reply()',
-      \ 'Test_zz1_terminal_in_gui()',
       \ ]
 
 " Locate Test_ functions and execute them.
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index a820be5..abc27d5 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -23,6 +23,9 @@
 " Run "testfunc" after starting the server and stop the server afterwards.
 func s:run_server(testfunc, ...)
   call RunServer('test_channel.py', a:testfunc, a:000)
+
+  " communicating with a server can be flaky
+  let g:test_is_flaky = 1
 endfunc
 
 " Return a list of open files.
@@ -415,6 +418,8 @@
 " Test that trying to connect to a non-existing port fails quickly.
 func Test_connect_waittime()
   CheckFunction reltimefloat
+  " this is timing sensitive
+  let g:test_is_flaky = 1
 
   call ch_log('Test_connect_waittime()')
   let start = reltime()
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index e99ab7f..c922bea 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -17,6 +17,7 @@
   else
     let buf = term_start(&shell, a:options)
   endif
+  let g:test_is_flaky = 1
 
   let termlist = term_list()
   call assert_equal(1, len(termlist))
diff --git a/src/version.c b/src/version.c
index 13c384f..19b1be4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    414,
+/**/
     413,
 /**/
     412,