3 files changed, 22 insertions, 2 deletions
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim
index 72cfea96c6..d8e2d1d718 100644
--- a/src/nvim/testdir/shared.vim
+++ b/src/nvim/testdir/shared.vim
@@ -1,5 +1,21 @@
 " Functions shared by several tests.
 
+" {Nvim}
+" Filepath captured from output may be truncated, like this:
+"   /home/va...estdir/Xtest-tmpdir/nvimxbXN4i/10
+" Get last 2 segments, then combine with $TMPDIR.
+func! Fix_truncated_tmpfile(fname)
+  " sanity check
+  if $TMPDIR ==# ''
+    throw '$TMPDIR is empty'
+  endif
+  if a:fname !~# $TMPDIR
+    throw '$TMPDIR not in fname: '.a:fname
+  endif
+  let last2segments = matchstr(a:fname, '[\/][^\/]\+[\/][^\/]\+$')
+  return $TMPDIR.last2segments
+endfunc
+
 " Get the name of the Python executable.
 " Also keeps it in s:python.
 func PythonProg()
diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim
index 4747d5704d..8635daa7ad 100644
--- a/src/nvim/testdir/test_normal.vim
+++ b/src/nvim/testdir/test_normal.vim
@@ -1,5 +1,7 @@
 " Test for various Normal mode commands
 
+source shared.vim
+
 func! Setup_NewWindow()
   10new
   call setline(1, range(1,100))
@@ -1069,10 +1071,10 @@ func! Test_normal18_z_fold()
 endfunc
 
 func! Test_normal19_z_spell()
-  throw "skipped: Nvim 'spell' requires download"
   if !has("spell") || !has('syntax')
     return
   endif
+  " let $TMPDIR=fnamemodify($TMPDIR, ':.')
   new
   call append(0, ['1 good', '2 goood', '3 goood'])
   set spell spellfile=./Xspellfile.add spelllang=en
@@ -1119,7 +1121,9 @@ func! Test_normal19_z_spell()
   " Test for zG
   let a=execute('unsilent norm! V$zG')
   call assert_match("Word '2 goood' added to .*", a)
+  set shortmess=
   let fname=matchstr(a, 'to\s\+\zs\f\+$')
+  let fname=Fix_truncated_tmpfile(fname)
   let cnt=readfile(fname)
   call assert_equal('2 goood', cnt[0])
 
diff --git a/src/nvim/testdir/test_spell.vim b/src/nvim/testdir/test_spell.vim
index 66be5c2441..0688d615e7 100644
--- a/src/nvim/testdir/test_spell.vim
+++ b/src/nvim/testdir/test_spell.vim
@@ -1,7 +1,7 @@
 " Test spell checking
 " TODO: move test58 tests here
 
-if v:true
+if !has('spell')
   finish
 endif