diff --git a/src/testdir/test_shortpathname.vim b/src/testdir/test_shortpathname.vim
index 59646308e..59361ca28 100644
--- a/src/testdir/test_shortpathname.vim
+++ b/src/testdir/test_shortpathname.vim
@@ -78,6 +78,7 @@ func Test_ColonEight()
 endfunc
 
 func Test_ColonEight_MultiByte()
+  let g:test_is_flaky = 1
   let dir = 'Xtest'
 
   let file = dir . '/日本語のファイル.txt'
diff --git a/src/version.c b/src/version.c
index e805e2c54..50a34c8c7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    470,
 /**/
     469,
 /**/