4 files changed, 26 insertions, 3 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index e2bc28d374..0d79bef3bf 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -411,6 +411,24 @@ func RunTheTest(test)
   endif
 endfunc
 
+function Delete_Xtest_Files()
+  for file in glob('X*', v:false, v:true)
+    if file ==? 'XfakeHOME'
+      " Clean up files created by setup.vim
+      call delete('XfakeHOME', 'rf')
+      continue
+    endif
+    " call add(v:errors, file .. " exists when it shouldn't, trying to delete it!")
+    call delete(file)
+    if !empty(glob(file, v:false, v:true))
+      " call add(v:errors, file .. " still exists after trying to delete it!")
+      if has('unix')
+        call system('rm -rf  ' .. file)
+      endif
+    endif
+  endfor
+endfunc
+
 func AfterTheTest(func_name)
   if len(v:errors) > 0
     if match(s:may_fail_list, '^' .. a:func_name) >= 0
@@ -439,13 +457,11 @@ endfunc
 " This function can be called by a test if it wants to abort testing.
 func FinishTesting()
   call AfterTheTest('')
+  call Delete_Xtest_Files()
 
   " Don't write viminfo on exit.
   set viminfo=
 
-  " Clean up files created by setup.vim
-  call delete('XfakeHOME', 'rf')
-
   if s:fail == 0 && s:fail_expected == 0
     " Success, create the .res file so that make knows it's done.
     exe 'split ' . fnamemodify(g:testname, ':r') . '.res'
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index aa291821ec..5485e144fb 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -973,6 +973,7 @@ func Test_mksession_foldopt()
   close
   %bwipe
   set sessionoptions&
+  call delete('Xtest_mks.out')
 endfunc
 
 " Test for mksession with "help" but not "options" in 'sessionoptions'
@@ -1105,6 +1106,7 @@ func Test_mksession_shortmess_with_A()
   set shortmess&
   set sessionoptions&
   call delete('Xtestsession')
+  call delete('Xtestfile')
 endfunc
 
 " Test for mksession with 'compatible' option
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index da263f4558..bb6fca3acf 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -309,6 +309,7 @@ func Test_terminal_rename_buffer()
   call assert_equal('bar', bufname())
   call assert_match('bar.*finished', execute('ls'))
   exe 'bwipe! ' .. buf
+  call delete('Xtext')
 endfunc
 
 func s:Nasty_exit_cb(job, st)
@@ -1045,6 +1046,8 @@ func Test_terminal_redir_file()
     call WaitForAssert({-> assert_equal('dead', job_status(g:job))})
     bwipe
   endif
+
+  call delete('Xtext')
 endfunc
 
 func TerminalTmap(remap)
diff --git a/src/version.c b/src/version.c
index e5b4844855..f2e714ca44 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1679,
+/**/
     1678,
 /**/
     1677,