diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index 208d4d966e..ce52578919 100644
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -98,6 +98,9 @@ func Test_missing_dir()
   split bar/x.txt
   only
 
+  " Delete the buffer so that swap file is removed before we try to delete the
+  " directory.  That fails on MS-Windows.
+  %bdelete!
   set directory&
   call delete('Xswapdir', 'rf')
 endfunc
diff --git a/src/version.c b/src/version.c
index af289037c9..9891796328 100644
--- a/src/version.c
+++ b/src/version.c
@@ -783,6 +783,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    830,
 /**/
     829,
 /**/