diff --git a/test/functional/ex_cmds/trust_spec.lua b/test/functional/ex_cmds/trust_spec.lua
index ee823a6ce7..627d19b115 100644
--- a/test/functional/ex_cmds/trust_spec.lua
+++ b/test/functional/ex_cmds/trust_spec.lua
@@ -71,8 +71,7 @@ describe(':trust', function()
 
     command('edit ' .. empty_file)
     matches('^Allowed in trust database%: ".*' .. empty_file .. '"$', exec_capture('trust'))
-    local trust = t.read_file(fn.stdpath('state') .. pathsep .. 'trust')
-    eq(string.format('%s %s', hash, cwd .. pathsep .. empty_file), vim.trim(trust))
+    assert_trust_entry(('%s %s'):format(hash, osjoin(cwd, empty_file)))
   end)
 
   it('deny then trust then remove a file using current buffer', function()
diff --git a/test/functional/lua/secure_spec.lua b/test/functional/lua/secure_spec.lua
index 52a4ac9710..b8580d77a5 100644
--- a/test/functional/lua/secure_spec.lua
+++ b/test/functional/lua/secure_spec.lua
@@ -334,12 +334,11 @@ describe('vim.secure', function()
     it('trust an empty file using bufnr', function()
       local cwd = fn.getcwd()
       local hash = fn.sha256(assert(read_file(empty_file)))
-      local full_path = cwd .. pathsep .. empty_file
+      local full_path = osjoin(cwd, empty_file)
 
       command('edit ' .. empty_file)
       eq({ true, full_path }, exec_lua([[return {vim.secure.trust({action='allow', bufnr=0})}]]))
-      local trust = assert(read_file(stdpath('state') .. pathsep .. 'trust'))
-      eq(string.format('%s %s', hash, full_path), vim.trim(trust))
+      assert_trust_entry(('%s %s'):format(hash, full_path))
     end)
 
     it('deny then trust then remove a file using bufnr', function()
diff --git a/test/functional/plugin/lsp/util_spec.lua b/test/functional/plugin/lsp/util_spec.lua
index bf573f68ee..430a927805 100644
--- a/test/functional/plugin/lsp/util_spec.lua
+++ b/test/functional/plugin/lsp/util_spec.lua
@@ -1403,16 +1403,15 @@ describe('vim.lsp.util', function()
         feed('9i<CR><Esc>G4k')
         curbuf = api.nvim_get_current_buf()
       end)
-
       local var_name = 'lsp_floating_preview'
 
       it('clean bufvar after fclose', function()
         exec_lua(function()
           vim.lsp.util.open_floating_preview({ 'test' }, '', { height = 5, width = 2 })
         end)
-        eq(true, api.nvim_win_is_valid(api.nvim_buf_get_var(curbuf, var_name)))
+        eq(true, api.nvim_win_is_valid(api.nvim_buf_get_var(0, var_name)))
         command('fclose')
-        eq('Key not found: lsp_floating_preview', pcall_err(api.nvim_buf_get_var, curbuf, var_name))
+        eq('Key not found: lsp_floating_preview', pcall_err(api.nvim_buf_get_var, 0, var_name))
       end)
 
       it('clean bufvar after CursorMoved', function()
@@ -1424,7 +1423,7 @@ describe('vim.lsp.util', function()
           return result
         end)
         eq(true, result)
-        eq('Key not found: lsp_floating_preview', pcall_err(api.nvim_buf_get_var, curbuf, var_name))
+        eq('Key not found: lsp_floating_preview', pcall_err(api.nvim_buf_get_var, 0, var_name))
       end)
     end)