diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index 895a96b127..8206193c4a 100644
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -864,7 +864,7 @@ func Test_fold_relative_move()
   set fdm=indent sw=2 wrap tw=80
 
   let content = [ '  foo', '  bar', '  baz',
-              \   repeat('x', 100),
+              \   repeat('x', &columns + 1),
               \   '  foo', '  bar', '  baz'
               \ ]
   call append(0, content)
diff --git a/src/version.c b/src/version.c
index 568756b397..55ce7133b6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2399,
 /**/
     2398,
 /**/