diff --git a/share/config.fish b/share/config.fish
index a3abb82f3..3d6ba2417 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -12,7 +12,7 @@ or set -g __fish_added_user_paths
 # Create the default command_not_found handler
 #
 function __fish_default_command_not_found_handler
-    printf "fish: Unknown command '%s'\n" (string escape -- $argv) >&2
+    printf "fish: Unknown command %s\n" (string escape -- "$argv") >&2
 end
 
 if status --is-interactive
diff --git a/tests/invocation/broken-config-continues.err b/tests/invocation/broken-config-continues.err
index d313eb7f7..5ab2906b6 100644
--- a/tests/invocation/broken-config-continues.err
+++ b/tests/invocation/broken-config-continues.err
@@ -1,4 +1,4 @@
-fish: Unknown command 'syntax-error'
+fish: Unknown command syntax-error
 $XDG_CONFIG_HOME/fish/config.fish (line 2): 
 syntax-error
 ^