diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index d9177e0..0d53a75 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -307,6 +307,7 @@
 
 " Names of flaky tests.
 let s:flaky_tests = [
+      \ 'Test_autocmd_SafeState()',
       \ 'Test_call()',
       \ 'Test_channel_handler()',
       \ 'Test_client_server()',
diff --git a/src/version.c b/src/version.c
index 6f8107c..2b1438c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2074,
+/**/
     2073,
 /**/
     2072,