diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index c776ca57c..7532655a3 100644
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -111,16 +111,18 @@ func Test_swapinfo()
   let fname = s:swapname()
   call assert_match('Xswapinfo', fname)
 
+  " Check the tail appears in the list from swapfilelist().  The path depends
+  " on the system.
+  let tail = fnamemodify(fname, ":t")->fnameescape()
   let nr = 0
   for name in swapfilelist()
-    if name =~ '[\\/]' .. fname .. '$'
+    if name =~ tail .. '$'
       let nr += 1
     endif
   endfor
-  call assert_equal(1, nr)
+  call assert_equal(1, nr, 'not found in ' .. string(swapfilelist()))
 
   let info = fname->swapinfo()
-
   let ver = printf('VIM %d.%d', v:version / 100, v:version % 100)
   call assert_equal(ver, info.version)
 
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index a23bac3d3..5599754c7 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -5977,6 +5977,9 @@ endfunc
 
 " interrupt right before a catch is invoked in a script
 func Test_ignore_catch_after_intr_1()
+  " for unknown reasons this test sometimes fails on MS-Windows.
+  let g:test_is_flaky = 1
+
   XpathINIT
   let lines =<< trim [CODE]
     try
diff --git a/src/version.c b/src/version.c
index 4a15f431e..ce1aba06d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1008,
 /**/
     1007,
 /**/