2 files changed, 24 insertions, 21 deletions
diff --git a/src/nvim/testdir/test_swap.vim b/src/nvim/testdir/test_swap.vim
index 394771effd..3db438cf4b 100644
--- a/src/nvim/testdir/test_swap.vim
+++ b/src/nvim/testdir/test_swap.vim
@@ -60,29 +60,31 @@ func Test_swap_group()
     throw 'Skipped: need at least two groups, got ' . string(groups)
   endif
 
-  call delete('Xtest')
-  split Xtest
-  call setline(1, 'just some text')
-  wq
-  if system('ls -l Xtest') !~ ' ' . groups[0] . ' \d'
-    throw 'Skipped: test file does not have the first group'
-  else
-    silent !chmod 640 Xtest
-    call system('chgrp ' . groups[1] . ' Xtest')
-    if system('ls -l Xtest') !~ ' ' . groups[1] . ' \d'
-      throw 'Skipped: cannot set second group on test file'
+  try
+    call delete('Xtest')
+    split Xtest
+    call setline(1, 'just some text')
+    wq
+    if system('ls -l Xtest') !~ ' ' . groups[0] . ' \d'
+      throw 'Skipped: test file does not have the first group'
     else
-      split Xtest
-      let swapname = substitute(execute('swapname'), '[[:space:]]', '', 'g')
-      call assert_match('Xtest', swapname)
-      " Group of swapfile must now match original file.
-      call assert_match(' ' . groups[1] . ' \d', system('ls -l ' . swapname))
-
-      bwipe!
+      silent !chmod 640 Xtest
+      call system('chgrp ' . groups[1] . ' Xtest')
+      if system('ls -l Xtest') !~ ' ' . groups[1] . ' \d'
+	throw 'Skipped: cannot set second group on test file'
+      else
+	split Xtest
+	let swapname = substitute(execute('swapname'), '[[:space:]]', '', 'g')
+	call assert_match('Xtest', swapname)
+	" Group of swapfile must now match original file.
+	call assert_match(' ' . groups[1] . ' \d', system('ls -l ' . swapname))
+
+	bwipe!
+      endif
     endif
-  endif
-
-  call delete('Xtest')
+  finally
+    call delete('Xtest')
+  endtry
 endfunc
 
 func Test_missing_dir()
diff --git a/src/nvim/testdir/test_undo.vim b/src/nvim/testdir/test_undo.vim
index 9729ca9f57..beb44f9699 100644
--- a/src/nvim/testdir/test_undo.vim
+++ b/src/nvim/testdir/test_undo.vim
@@ -242,6 +242,7 @@ func Test_undojoin()
 endfunc
 
 func Test_undo_write()
+  call delete('Xtest')
   split Xtest
   call feedkeys("ione one one\<Esc>", 'xt')
   w!