diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/vim/health/health.lua
similarity index 100%
rename from runtime/lua/nvim/health.lua
rename to runtime/lua/vim/health/health.lua
diff --git a/runtime/lua/provider/clipboard/health.lua b/runtime/lua/vim/provider/clipboard/health.lua
similarity index 100%
rename from runtime/lua/provider/clipboard/health.lua
rename to runtime/lua/vim/provider/clipboard/health.lua
diff --git a/runtime/lua/provider/node/health.lua b/runtime/lua/vim/provider/node/health.lua
similarity index 100%
rename from runtime/lua/provider/node/health.lua
rename to runtime/lua/vim/provider/node/health.lua
diff --git a/runtime/lua/provider/perl/health.lua b/runtime/lua/vim/provider/perl/health.lua
similarity index 100%
rename from runtime/lua/provider/perl/health.lua
rename to runtime/lua/vim/provider/perl/health.lua
diff --git a/runtime/lua/provider/python/health.lua b/runtime/lua/vim/provider/python/health.lua
similarity index 100%
rename from runtime/lua/provider/python/health.lua
rename to runtime/lua/vim/provider/python/health.lua
diff --git a/runtime/lua/provider/ruby/health.lua b/runtime/lua/vim/provider/ruby/health.lua
similarity index 100%
rename from runtime/lua/provider/ruby/health.lua
rename to runtime/lua/vim/provider/ruby/health.lua
diff --git a/test/functional/plugin/health_spec.lua b/test/functional/plugin/health_spec.lua
index 78cffd07fb..327b5759c7 100644
--- a/test/functional/plugin/health_spec.lua
+++ b/test/functional/plugin/health_spec.lua
@@ -5,7 +5,7 @@ local Screen = require('test.functional.ui.screen')
 local clear = n.clear
 local curbuf_contents = n.curbuf_contents
 local command = n.command
-local eq, neq, matches = t.eq, t.neq, t.matches
+local eq, matches = t.eq, t.matches
 local getcompletion = n.fn.getcompletion
 local insert = n.insert
 local exec_lua = n.exec_lua
@@ -36,16 +36,15 @@ describe(':checkhealth', function()
     clear()
     -- Do this after startup, otherwise it just breaks $VIMRUNTIME.
     command("let $VIM='zub'")
-    command('checkhealth nvim')
+    command('checkhealth vim.health')
     matches('ERROR $VIM .* zub', curbuf_contents())
   end)
 
   it('completions can be listed via getcompletion()', function()
     clear()
-    eq('nvim', getcompletion('nvim', 'checkhealth')[1])
-    eq('provider.clipboard', getcompletion('prov', 'checkhealth')[1])
+    eq('vim.health', getcompletion('vim', 'checkhealth')[1])
+    eq('vim.provider.clipboard', getcompletion('vim.prov', 'checkhealth')[1])
     eq('vim.lsp', getcompletion('vim.ls', 'checkhealth')[1])
-    neq('vim', getcompletion('^vim', 'checkhealth')[1]) -- should not complete vim.health
   end)
 
   it('completion checks for vim.health._complete() return type #28456', function()