diff --git a/Library/Homebrew/test/cask/cli/audit_spec.rb b/Library/Homebrew/test/cask/cmd/audit_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/audit_spec.rb
rename to Library/Homebrew/test/cask/cmd/audit_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/cat_spec.rb b/Library/Homebrew/test/cask/cmd/cat_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/cat_spec.rb
rename to Library/Homebrew/test/cask/cmd/cat_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/create_spec.rb b/Library/Homebrew/test/cask/cmd/create_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/create_spec.rb
rename to Library/Homebrew/test/cask/cmd/create_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/doctor_spec.rb b/Library/Homebrew/test/cask/cmd/doctor_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/doctor_spec.rb
rename to Library/Homebrew/test/cask/cmd/doctor_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/edit_spec.rb b/Library/Homebrew/test/cask/cmd/edit_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/edit_spec.rb
rename to Library/Homebrew/test/cask/cmd/edit_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/fetch_spec.rb b/Library/Homebrew/test/cask/cmd/fetch_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/fetch_spec.rb
rename to Library/Homebrew/test/cask/cmd/fetch_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/home_spec.rb b/Library/Homebrew/test/cask/cmd/home_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/home_spec.rb
rename to Library/Homebrew/test/cask/cmd/home_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/info_spec.rb
rename to Library/Homebrew/test/cask/cmd/info_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/install_spec.rb b/Library/Homebrew/test/cask/cmd/install_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/install_spec.rb
rename to Library/Homebrew/test/cask/cmd/install_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/internal_stanza_spec.rb b/Library/Homebrew/test/cask/cmd/internal_stanza_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/internal_stanza_spec.rb
rename to Library/Homebrew/test/cask/cmd/internal_stanza_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/list_spec.rb b/Library/Homebrew/test/cask/cmd/list_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/list_spec.rb
rename to Library/Homebrew/test/cask/cmd/list_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/options_spec.rb b/Library/Homebrew/test/cask/cmd/options_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/options_spec.rb
rename to Library/Homebrew/test/cask/cmd/options_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/outdated_spec.rb b/Library/Homebrew/test/cask/cmd/outdated_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/outdated_spec.rb
rename to Library/Homebrew/test/cask/cmd/outdated_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/quarantine_spec.rb b/Library/Homebrew/test/cask/cmd/quarantine_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/quarantine_spec.rb
rename to Library/Homebrew/test/cask/cmd/quarantine_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/reinstall_spec.rb b/Library/Homebrew/test/cask/cmd/reinstall_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/reinstall_spec.rb
rename to Library/Homebrew/test/cask/cmd/reinstall_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/shared_examples/invalid_option.rb b/Library/Homebrew/test/cask/cmd/shared_examples/invalid_option.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/shared_examples/invalid_option.rb
rename to Library/Homebrew/test/cask/cmd/shared_examples/invalid_option.rb
diff --git a/Library/Homebrew/test/cask/cli/shared_examples/requires_cask_token.rb b/Library/Homebrew/test/cask/cmd/shared_examples/requires_cask_token.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/shared_examples/requires_cask_token.rb
rename to Library/Homebrew/test/cask/cmd/shared_examples/requires_cask_token.rb
diff --git a/Library/Homebrew/test/cask/cli/style_spec.rb b/Library/Homebrew/test/cask/cmd/style_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/style_spec.rb
rename to Library/Homebrew/test/cask/cmd/style_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/uninstall_spec.rb b/Library/Homebrew/test/cask/cmd/uninstall_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/uninstall_spec.rb
rename to Library/Homebrew/test/cask/cmd/uninstall_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/upgrade_spec.rb b/Library/Homebrew/test/cask/cmd/upgrade_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/upgrade_spec.rb
rename to Library/Homebrew/test/cask/cmd/upgrade_spec.rb
diff --git a/Library/Homebrew/test/cask/cli/zap_spec.rb b/Library/Homebrew/test/cask/cmd/zap_spec.rb
similarity index 100%
rename from Library/Homebrew/test/cask/cli/zap_spec.rb
rename to Library/Homebrew/test/cask/cmd/zap_spec.rb