1 files changed, 3 insertions, 4 deletions
diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua
index 91e115aedf..8d212c1375 100644
--- a/test/functional/shell/viml_system_spec.lua
+++ b/test/functional/shell/viml_system_spec.lua
@@ -10,6 +10,7 @@ local eq, clear, eval, feed, nvim =
 local function create_file_with_nuls(name)
   return function()
     feed('ipart1<C-V>000part2<C-V>000part3<ESC>:w '..name..'<CR>')
+    eval('1')  -- wait for the file to be created
   end
 end
 
@@ -21,11 +22,9 @@ end
 
 -- Some tests require the xclip program and a x server.
 local xclip = nil
-do 
+do
   if os.getenv('DISPLAY') then
-    local proc = io.popen('which xclip') 
-    xclip = proc:read()
-    proc:close()
+    xclip = (os.execute('command -v xclip > /dev/null 2>&1') == 0)
   end
 end