3 files changed, 11 insertions, 10 deletions
diff --git a/test/functional/lua/buffer_updates_spec.lua b/test/functional/lua/buffer_updates_spec.lua
index 2cd3123dcd..04f4f89472 100644
--- a/test/functional/lua/buffer_updates_spec.lua
+++ b/test/functional/lua/buffer_updates_spec.lua
@@ -1,6 +1,6 @@
 -- Test suite for testing interactions with API bindings
 local helpers = require('test.functional.helpers')(after_each)
-local lfs = require('lfs')
+local luv = require('luv')
 
 local command = helpers.command
 local meths = helpers.meths
@@ -754,7 +754,8 @@ describe('lua: nvim_buf_attach on_bytes', function()
       write_file("Xtest-reload", dedent [[
         old line 1
         old line 2]])
-      lfs.touch("Xtest-reload", os.time() - 10)
+      local atime = os.time() - 10
+      luv.fs_utime("Xtest-reload", atime, atime)
       command "e Xtest-reload"
       command "set autoread"
 
diff --git a/test/functional/lua/fs_spec.lua b/test/functional/lua/fs_spec.lua
index da60b5c13b..aeb2e5d9a6 100644
--- a/test/functional/lua/fs_spec.lua
+++ b/test/functional/lua/fs_spec.lua
@@ -1,5 +1,4 @@
 local helpers = require('test.functional.helpers')(after_each)
-local lfs = require('lfs')
 
 local clear = helpers.clear
 local exec_lua = helpers.exec_lua
@@ -11,6 +10,7 @@ local test_build_dir = helpers.test_build_dir
 local test_source_path = helpers.test_source_path
 local nvim_prog = helpers.nvim_prog
 local is_os = helpers.is_os
+local mkdir = helpers.mkdir
 
 local nvim_prog_basename = is_os('win') and 'nvim.exe' or 'nvim'
 
@@ -133,10 +133,10 @@ describe('vim.fs', function()
 
   describe('dir()', function()
     before_each(function()
-      lfs.mkdir('testd')
-      lfs.mkdir('testd/a')
-      lfs.mkdir('testd/a/b')
-      lfs.mkdir('testd/a/b/c')
+      mkdir('testd')
+      mkdir('testd/a')
+      mkdir('testd/a/b')
+      mkdir('testd/a/b/c')
     end)
 
     after_each(function()
diff --git a/test/functional/lua/watch_spec.lua b/test/functional/lua/watch_spec.lua
index 554480c2b3..bbcfd27cde 100644
--- a/test/functional/lua/watch_spec.lua
+++ b/test/functional/lua/watch_spec.lua
@@ -3,7 +3,7 @@ local eq = helpers.eq
 local exec_lua = helpers.exec_lua
 local clear = helpers.clear
 local is_os = helpers.is_os
-local lfs = require('lfs')
+local mkdir = helpers.mkdir
 
 describe('vim._watch', function()
   before_each(function()
@@ -14,7 +14,7 @@ describe('vim._watch', function()
     it('detects file changes', function()
       local root_dir = helpers.tmpname()
       os.remove(root_dir)
-      lfs.mkdir(root_dir)
+      mkdir(root_dir)
 
       local result = exec_lua(
         [[
@@ -102,7 +102,7 @@ describe('vim._watch', function()
     it('detects file changes', function()
       local root_dir = helpers.tmpname()
       os.remove(root_dir)
-      lfs.mkdir(root_dir)
+      mkdir(root_dir)
 
       local result = exec_lua(
         [[