diff --git a/shell-completion/hledger-completion.bash b/shell-completion/hledger-completion.bash
index fb5f55105..aaae936e5 100644
--- a/shell-completion/hledger-completion.bash
+++ b/shell-completion/hledger-completion.bash
@@ -84,12 +84,15 @@ _hledger_completion_function() {
 
     # Subcommand specific
     case $subcommand in
-        files|test) return 0 ;;
         help)
             compopt -o nosort +o filenames
             _hledger_compreply "$(compgen -W "$(hledger help | tail -n 1)" -- "$cur")"
             return 0
             ;;
+        # These do not expect or support any query arguments
+        commodities|check-dupes|files|import|print-unique|test)
+            return 0
+            ;;
     esac
 
     # Offer query filters and accounts for the rest
diff --git a/shell-completion/hledger-completion.bash.m4 b/shell-completion/hledger-completion.bash.m4
index 06de7ce71..b77a9421d 100644
--- a/shell-completion/hledger-completion.bash.m4
+++ b/shell-completion/hledger-completion.bash.m4
@@ -84,12 +84,15 @@ _hledger_completion_function() {
 
     # Subcommand specific
     case $subcommand in
-        files|test) return 0 ;;
         help)
             compopt -o nosort +o filenames
             _hledger_compreply "$(compgen -W "$(hledger help | tail -n 1)" -- "$cur")"
             return 0
             ;;
+        # These do not expect or support any query arguments
+        commodities|check-dupes|files|import|print-unique|test)
+            return 0
+            ;;
     esac
 
     # Offer query filters and accounts for the rest