diff --git a/src/testdir/test_autochdir.vim b/src/testdir/test_autochdir.vim
index c85cc19..e7a6885 100644
--- a/src/testdir/test_autochdir.vim
+++ b/src/testdir/test_autochdir.vim
@@ -43,12 +43,12 @@
   finally
     set noacd
     call chdir(cwd)
-    call delete('Xa', 'rf')
-    call delete('Xb', 'rf')
-    call delete('Xc', 'rf')
     bwipe! aaa.txt
     bwipe! bbb.txt
     bwipe! ccc.txt
+    call delete('Xa', 'rf')
+    call delete('Xb', 'rf')
+    call delete('Xc', 'rf')
   endtry
 endfunc
 
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 887093c..614c097 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -2041,6 +2041,10 @@
 
 " Check that when DEC mouse codes are recognized a special key is handled.
 func Test_ignore_dec_mouse()
+  silent !infocmp gnome >/dev/null 2>&1
+  if v:shell_error != 0
+    throw 'Skipped: gnome entry missing in the terminfo db'
+  endif
 
   new
   let save_mouse = &mouse