diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 3e2a691..3dc7776 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1124,7 +1124,8 @@
   unlet g:job
 endfunc
 
-func Test_terminal_focus_events()
+" Run this first, it fails when run after other tests.
+func Test_aa_terminal_focus_events()
   CheckNotGui
   CheckUnix
   CheckRunVimInTerminal
@@ -1137,8 +1138,6 @@
       set term=xterm ttymouse=xterm2
       au FocusLost * call setline(1, 'I am lost') | set nomod
       au FocusGained * call setline(1, 'I am back') | set nomod
-      " FIXME: sometimes this job hangs, exit after a couple of seconds
-      call timer_start(2000, {id -> execute('qall')})
   END
   call writefile(lines, 'XtermFocus')
   let buf = RunVimInTerminal('-S XtermFocus', #{rows: 6})
diff --git a/src/version.c b/src/version.c
index 30a71e1..3098c59 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3806,
+/**/
     3805,
 /**/
     3804,