2 files changed, 8 insertions, 12 deletions
diff --git a/test/functional/shada/helpers.lua b/test/functional/shada/helpers.lua
index b8d0352862..d8ffdaf753 100644
--- a/test/functional/shada/helpers.lua
+++ b/test/functional/shada/helpers.lua
@@ -3,8 +3,6 @@ local meths = helpers.meths
 local write_file = helpers.write_file
 local concat_tables = helpers.concat_tables
 
-local mpack = require('mpack')
-
 local tmpname = helpers.tmpname()
 
 --   o={
@@ -64,7 +62,7 @@ local read_shada_file = function(fname)
   local fd = io.open(fname, 'r')
   local mstring = fd:read('*a')
   fd:close()
-  local unpack = mpack.Unpacker()
+  local unpack = vim.mpack.Unpacker()
   local ret = {}
   local cur, val
   local i = 0
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index 9e3d2f7a58..4b52c1835b 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -6,11 +6,9 @@ local write_file, spawn, set_session, nvim_prog, exc_exec =
 local is_os = helpers.is_os
 local skip = helpers.skip
 
-local luv = require('luv')
+local uv = vim.uv
 local paths = require('test.cmakeconfig.paths')
 
-local mpack = require('mpack')
-
 local shada_helpers = require('test.functional.shada.helpers')
 local reset, clear, get_shada_rw =
   shada_helpers.reset, shada_helpers.clear, shada_helpers.get_shada_rw
@@ -26,7 +24,7 @@ describe('ShaDa support code', function()
   after_each(function()
     clear()
     clean()
-    luv.fs_rmdir(dirname)
+    uv.fs_rmdir(dirname)
   end)
 
   it('preserves `s` item size limit with unknown entries', function()
@@ -87,7 +85,7 @@ describe('ShaDa support code', function()
       wshada('Some text file')
       eq(0, exc_exec('wshada! ' .. shada_fname))
       eq(1, read_shada_file(shada_fname)[1].type)
-      eq(nil, luv.fs_stat(shada_fname .. '.tmp.a'))
+      eq(nil, uv.fs_stat(shada_fname .. '.tmp.a'))
     end
   )
 
@@ -148,11 +146,11 @@ describe('ShaDa support code', function()
     wshada(s .. table.concat(msgpack, e .. s) .. e)
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
-    local typ = mpack.decode(s)
+    local typ = vim.mpack.decode(s)
     for _, v in ipairs(read_shada_file(shada_fname)) do
       if v.type == typ then
         found = found + 1
-        eq(mpack.decode(msgpack[found]), v.timestamp)
+        eq(vim.mpack.decode(msgpack[found]), v.timestamp)
       end
     end
     eq(#msgpack, found)
@@ -279,8 +277,8 @@ describe('ShaDa support code', function()
       true
     )
     session:close()
-    eq(nil, luv.fs_stat('NONE'))
-    eq(nil, luv.fs_stat('NONE.tmp.a'))
+    eq(nil, uv.fs_stat('NONE'))
+    eq(nil, uv.fs_stat('NONE.tmp.a'))
   end)
 
   it('does not read NONE file', function()