diff --git a/share/completions/!.fish b/share/completions/!.fish
new file mode 100644
index 000000000..034c615a6
--- /dev/null
+++ b/share/completions/!.fish
@@ -0,0 +1 @@
+complete ! --wraps not
diff --git a/share/completions/[.fish b/share/completions/[.fish
new file mode 100644
index 000000000..f9978132b
--- /dev/null
+++ b/share/completions/[.fish
@@ -0,0 +1 @@
+complete [ --wraps test
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 50bd5d891..43fb2a6c4 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -128,14 +128,6 @@ end" >$__fish_config_dir/config.fish
         complete -x -p "/etc/init.d/*" -a reload --description 'Reload service configuration'
     end
 
-    #
-    # We want to show our completions for the [ (test) builtin, but
-    # we don't want to create a [.fish. test.fish will not be loaded until
-    # the user tries [ interactively.
-    #
-    complete -c [ --wraps test
-    complete -c ! --wraps not
-
     #
     # Only a few builtins take filenames; initialize the rest with no file completions
     #