diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index f036b4427e..1598beaaa0 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -108,6 +108,7 @@ Options:
 
 Commands:
   |:CheckHealth|
+  |:drop| is available on all platforms
   |:Man| is available by default, with many improvements such as completion
 
 Functions:
diff --git a/test/functional/shell/bang_filter_spec.lua b/test/functional/ex_cmds/bang_filter_spec.lua
similarity index 100%
rename from test/functional/shell/bang_filter_spec.lua
rename to test/functional/ex_cmds/bang_filter_spec.lua
diff --git a/test/functional/dict_notifications_spec.lua b/test/functional/ex_cmds/dict_notifications_spec.lua
similarity index 100%
rename from test/functional/dict_notifications_spec.lua
rename to test/functional/ex_cmds/dict_notifications_spec.lua
diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/ex_cmds/viml_system_spec.lua
similarity index 97%
rename from test/functional/shell/viml_system_spec.lua
rename to test/functional/ex_cmds/viml_system_spec.lua
index b8de7cc86f..b8f1f87f30 100644
--- a/test/functional/shell/viml_system_spec.lua
+++ b/test/functional/ex_cmds/viml_system_spec.lua
@@ -1,7 +1,3 @@
--- Specs for
--- - `system()`
--- - `systemlist()`
-
 local helpers = require('test.functional.helpers')(after_each)
 local eq, clear, eval, feed, nvim =
   helpers.eq, helpers.clear, helpers.eval, helpers.feed, helpers.nvim
@@ -120,12 +116,22 @@ describe('system()', function()
     it('returns the program output', function()
       eq("echoed", eval('system("echo -n echoed")'))
     end)
+    it('to backgrounded command does not crash', function()
+      -- This is indeterminate, just exercise the codepath.
+      eval('system("echo -n echoed &")')
+      eq(2, eval("1+1"))  -- Still alive?
+    end)
   end)
 
   describe('passing input', function()
     it('returns the program output', function()
       eq("input", eval('system("cat -", "input")'))
     end)
+    it('to backgrounded command does not crash', function()
+      -- This is indeterminate, just exercise the codepath.
+      eval('system("cat - &", "input")')
+      eq(2, eval("1+1"))  -- Still alive?
+    end)
   end)
 
   describe('passing a lot of input', function()