diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 878d3436a5..4f39d875d9 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1667,6 +1667,7 @@ func Test_state()
   let lines =<< trim END
 	call setline(1, ['one', 'two', 'three'])
 	map ;; gg
+	set complete=.
 	func RunTimer()
 	  call timer_start(10, {id -> execute('let g:state = state()') .. execute('let g:mode = mode()')})
 	endfunc
@@ -1694,9 +1695,9 @@ func Test_state()
   call term_sendkeys(buf, getstate)
   call WaitForAssert({-> assert_match('state: mSc; mode: n', term_getline(buf, 6))}, 1000)
 
-  " Insert mode completion
+  " Insert mode completion (bit slower on Mac)
   call term_sendkeys(buf, ":call RunTimer()\<CR>Got\<C-N>")
-  call term_wait(buf, 50)
+  call term_wait(buf, 200)
   call term_sendkeys(buf, "\<Esc>")
   call term_sendkeys(buf, getstate)
   call WaitForAssert({-> assert_match('state: aSc; mode: i', term_getline(buf, 6))}, 1000)
diff --git a/src/version.c b/src/version.c
index 20a028515b..28660efcc0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2099,
 /**/
     2098,
 /**/