diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index bbcec3a245..3a32f4582b 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -248,6 +248,7 @@ let s:flaky = [
       \ 'Test_close_and_exit_cb()',
       \ 'Test_collapse_buffers()',
       \ 'Test_communicate()',
+      \ 'Test_cwd()',
       \ 'Test_exit_callback_interval()',
       \ 'Test_nb_basic()',
       \ 'Test_oneshot()',
diff --git a/src/version.c b/src/version.c
index 4b43e49029..d4631ced10 100644
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1640,
 /**/
     1639,
 /**/