diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index 2df0d6f242..0986bf9b1c 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -1324,22 +1324,31 @@ func! Test_edit_rightleft()
 endfunc
 
 func Test_edit_complete_very_long_name()
-  if !has('unix') || has('mac')
+  if !has('unix')
     " Long directory names only work on Unix.
     return
   endif
+
+  let dirname = getcwd() . "/Xdir"
+  let longdirname = dirname . repeat('/' . repeat('d', 255), 4)
+  try
+    call mkdir(longdirname, 'p')
+  catch /E739:/
+    " Long directory name probably not supported.
+    call delete(dirname, 'rf')
+    return
+  endtry
+
   " Try to get the Vim window position before setting 'columns'.
   let winposx = getwinposx()
   let winposy = getwinposy()
   let save_columns = &columns
+  " Need at least about 1100 columns to reproduce the problem.
   set columns=2000
   call assert_equal(2000, &columns)
   set noswapfile
 
-  let dirname = getcwd() . "/Xdir"
-  let longdirname = dirname . repeat('/' . repeat('d', 255), 4)
   let longfilename = longdirname . '/' . repeat('a', 255)
-  call mkdir(longdirname, 'p')
   call writefile(['Totum', 'Table'], longfilename)
   new
   exe "next Xfile " . longfilename
diff --git a/src/version.c b/src/version.c
index 9db3ea007c..4d386eebcf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    545,
 /**/
     544,
 /**/