diff --git a/src/testdir/test_mswin_event.vim b/src/testdir/test_mswin_event.vim
index 96d1247db6..101051748e 100644
--- a/src/testdir/test_mswin_event.vim
+++ b/src/testdir/test_mswin_event.vim
@@ -704,6 +704,10 @@ func Test_mswin_event_mouse()
   CheckMSWindows
   new
 
+  if !has('gui_running')
+    let g:test_is_flaky = 1
+  endif
+
   set mousemodel=extend
   call test_override('no_query_mouse', 1)
   call WaitForResponses()
diff --git a/src/version.c b/src/version.c
index 3be49ccbc3..bee5c589c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    540,
 /**/
     539,
 /**/