diff --git a/share/completions/apt.fish b/share/completions/apt.fish
index c58238e78..cb2e05e23 100644
--- a/share/completions/apt.fish
+++ b/share/completions/apt.fish
@@ -5,7 +5,7 @@ set -l pkg_subcmds install upgrade full-upgrade show search purge changelog poli
 set -l installed_pkg_subcmds remove
 set -l handle_file_pkg_subcmds install
 
-function __fish_apt_subcommand --no-scope-shadowing
+function __fish_apt_subcommand -V all_subcmds
     set -l subcommand $argv[1]
     set -e argv[1]
     complete -f -c apt -n "not __fish_seen_subcommand_from $all_subcmds" -a $subcommand $argv
diff --git a/share/completions/svn.fish b/share/completions/svn.fish
index 0da403c25..fcfb4b411 100644
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@@ -24,7 +24,7 @@ function __fish_complete_svn_diff --description 'Complete "svn diff" arguments'
 
 end
 
-function _svn_cmpl_ -d 'Make a completion for a subcommand' --no-scope-shadowing --argument-names subcommand
+function _svn_cmpl_ -d 'Make a completion for a subcommand' --argument-names subcommand
     set -e argv[1]
     complete -c svn -n "__fish_seen_subcommand_from $subcommand" $argv
 end