diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs
index 17632fc770e..d1a42d1ae71 100644
--- a/crates/cargo-test-support/src/lib.rs
+++ b/crates/cargo-test-support/src/lib.rs
@@ -75,10 +75,10 @@ pub mod tools;
 pub mod prelude {
     pub use crate::cargo_test;
     pub use crate::paths::CargoPathExt;
-    pub use crate::ArgLine;
-    pub use crate::CargoCommand;
-    pub use crate::ChannelChanger;
-    pub use crate::TestEnv;
+    pub use crate::ArgLineCommandExt;
+    pub use crate::CargoCommandExt;
+    pub use crate::ChannelChangerCommandExt;
+    pub use crate::TestEnvCommandExt;
     pub use snapbox::IntoData;
 }
 
@@ -1247,27 +1247,27 @@ fn _process(t: &OsStr) -> ProcessBuilder {
 }
 
 /// Enable nightly features for testing
-pub trait ChannelChanger {
+pub trait ChannelChangerCommandExt {
     /// The list of reasons should be why nightly cargo is needed. If it is
     /// because of an unstable feature put the name of the feature as the reason,
     /// e.g. `&["print-im-a-teapot"]`.
     fn masquerade_as_nightly_cargo(self, _reasons: &[&str]) -> Self;
 }
 
-impl ChannelChanger for &mut ProcessBuilder {
+impl ChannelChangerCommandExt for &mut ProcessBuilder {
     fn masquerade_as_nightly_cargo(self, _reasons: &[&str]) -> Self {
         self.env("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS", "nightly")
     }
 }
 
-impl ChannelChanger for snapbox::cmd::Command {
+impl ChannelChangerCommandExt for snapbox::cmd::Command {
     fn masquerade_as_nightly_cargo(self, _reasons: &[&str]) -> Self {
         self.env("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS", "nightly")
     }
 }
 
 /// Establish a process's test environment
-pub trait TestEnv: Sized {
+pub trait TestEnvCommandExt: Sized {
     fn test_env(mut self) -> Self {
         // In general just clear out all cargo-specific configuration already in the
         // environment. Our tests all assume a "default configuration" unless
@@ -1357,7 +1357,7 @@ pub trait TestEnv: Sized {
     fn env_remove(self, key: &str) -> Self;
 }
 
-impl TestEnv for &mut ProcessBuilder {
+impl TestEnvCommandExt for &mut ProcessBuilder {
     fn current_dir<S: AsRef<std::path::Path>>(self, path: S) -> Self {
         let path = path.as_ref();
         self.cwd(path)
@@ -1370,7 +1370,7 @@ impl TestEnv for &mut ProcessBuilder {
     }
 }
 
-impl TestEnv for snapbox::cmd::Command {
+impl TestEnvCommandExt for snapbox::cmd::Command {
     fn current_dir<S: AsRef<std::path::Path>>(self, path: S) -> Self {
         self.current_dir(path)
     }
@@ -1383,11 +1383,11 @@ impl TestEnv for snapbox::cmd::Command {
 }
 
 /// Test the cargo command
-pub trait CargoCommand {
+pub trait CargoCommandExt {
     fn cargo_ui() -> Self;
 }
 
-impl CargoCommand for snapbox::cmd::Command {
+impl CargoCommandExt for snapbox::cmd::Command {
     fn cargo_ui() -> Self {
         Self::new(cargo_exe())
             .with_assert(compare::assert_ui())
@@ -1397,7 +1397,7 @@ impl CargoCommand for snapbox::cmd::Command {
 }
 
 /// Add a list of arguments as a line
-pub trait ArgLine: Sized {
+pub trait ArgLineCommandExt: Sized {
     fn arg_line(mut self, s: &str) -> Self {
         for mut arg in s.split_whitespace() {
             if (arg.starts_with('"') && arg.ends_with('"'))
@@ -1415,13 +1415,13 @@ pub trait ArgLine: Sized {
     fn arg<S: AsRef<std::ffi::OsStr>>(self, s: S) -> Self;
 }
 
-impl ArgLine for &mut ProcessBuilder {
+impl ArgLineCommandExt for &mut ProcessBuilder {
     fn arg<S: AsRef<std::ffi::OsStr>>(self, s: S) -> Self {
         self.arg(s)
     }
 }
 
-impl ArgLine for snapbox::cmd::Command {
+impl ArgLineCommandExt for snapbox::cmd::Command {
     fn arg<S: AsRef<std::ffi::OsStr>>(self, s: S) -> Self {
         self.arg(s)
     }
diff --git a/tests/testsuite/cargo_bench/no_keep_going/mod.rs b/tests/testsuite/cargo_bench/no_keep_going/mod.rs
index 058fe8eb3ad..5426cc6b134 100644
--- a/tests/testsuite/cargo_bench/no_keep_going/mod.rs
+++ b/tests/testsuite/cargo_bench/no_keep_going/mod.rs
@@ -2,7 +2,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs
index 596364eec55..99dd923c014 100644
--- a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs
+++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs b/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs
index 727221d42e6..ddf2ba97ac2 100644
--- a/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs
index f59a989d672..696aeca70b8 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs
index f59a989d672..696aeca70b8 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs
index 837746e92e4..aa0e31f722a 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs
index f59a989d672..696aeca70b8 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs
index f59a989d672..696aeca70b8 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs
index f59a989d672..696aeca70b8 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs
index 727221d42e6..ddf2ba97ac2 100644
--- a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs
+++ b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/empty_name/mod.rs b/tests/testsuite/cargo_new/empty_name/mod.rs
index 62e401c996d..78eeb7ae9f0 100644
--- a/tests/testsuite/cargo_new/empty_name/mod.rs
+++ b/tests/testsuite/cargo_new/empty_name/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs
index f59a989d672..696aeca70b8 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs
index f59a989d672..696aeca70b8 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs
index b91ad86b633..8fd9b259216 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs
index 30d44a91a28..d4907c560dc 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs
index f59a989d672..696aeca70b8 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs
index a05ae9a48cd..14434b45c3d 100644
--- a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs
+++ b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs
index fa59936b5a6..bfc3b8a292d 100644
--- a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs
+++ b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/build/mod.rs b/tests/testsuite/cargo_remove/build/mod.rs
index b0704b56a71..46e7b94fa7f 100644
--- a/tests/testsuite/cargo_remove/build/mod.rs
+++ b/tests/testsuite/cargo_remove/build/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/dev/mod.rs b/tests/testsuite/cargo_remove/dev/mod.rs
index 21a45347bfb..8a0de7ebee3 100644
--- a/tests/testsuite/cargo_remove/dev/mod.rs
+++ b/tests/testsuite/cargo_remove/dev/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/dry_run/mod.rs b/tests/testsuite/cargo_remove/dry_run/mod.rs
index bc537fb41e4..19278d5869c 100644
--- a/tests/testsuite/cargo_remove/dry_run/mod.rs
+++ b/tests/testsuite/cargo_remove/dry_run/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs
index 8dac5069620..c90110b79a2 100644
--- a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/gc_patch/mod.rs b/tests/testsuite/cargo_remove/gc_patch/mod.rs
index c2a92071b03..8e19d068dc6 100644
--- a/tests/testsuite/cargo_remove/gc_patch/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_patch/mod.rs
@@ -6,7 +6,7 @@ use cargo_test_support::git;
 use cargo_test_support::prelude::*;
 use cargo_test_support::project;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 
 #[cargo_test]
 fn case() {
diff --git a/tests/testsuite/cargo_remove/gc_profile/mod.rs b/tests/testsuite/cargo_remove/gc_profile/mod.rs
index d4e57425fbe..1f6f963ae2f 100644
--- a/tests/testsuite/cargo_remove/gc_profile/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_profile/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/gc_replace/mod.rs b/tests/testsuite/cargo_remove/gc_replace/mod.rs
index e7c288ee4a3..f2a3cbae1d8 100644
--- a/tests/testsuite/cargo_remove/gc_replace/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_replace/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/invalid_arg/mod.rs b/tests/testsuite/cargo_remove/invalid_arg/mod.rs
index fdbb3049adf..28ba8ea36e8 100644
--- a/tests/testsuite/cargo_remove/invalid_arg/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_arg/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/invalid_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_dep/mod.rs
index f766c73c1ca..50eb967f2d4 100644
--- a/tests/testsuite/cargo_remove/invalid_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_dep/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/invalid_package/mod.rs b/tests/testsuite/cargo_remove/invalid_package/mod.rs
index b222921d971..a349d20ad74 100644
--- a/tests/testsuite/cargo_remove/invalid_package/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_package/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs
index 82c6389ea85..137a71c0be1 100644
--- a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/invalid_section/mod.rs b/tests/testsuite/cargo_remove/invalid_section/mod.rs
index 0dd84961c41..26a9c12dbf6 100644
--- a/tests/testsuite/cargo_remove/invalid_section/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_section/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs
index 47d8cdc1411..a61b3b47bab 100644
--- a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/invalid_target/mod.rs b/tests/testsuite/cargo_remove/invalid_target/mod.rs
index 522019b193d..c4f41d19e0a 100644
--- a/tests/testsuite/cargo_remove/invalid_target/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_target/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs
index e0433184201..2286e56ec57 100644
--- a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/multiple_deps/mod.rs b/tests/testsuite/cargo_remove/multiple_deps/mod.rs
index 6fa3cfb520b..5fc96eb4918 100644
--- a/tests/testsuite/cargo_remove/multiple_deps/mod.rs
+++ b/tests/testsuite/cargo_remove/multiple_deps/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/multiple_dev/mod.rs b/tests/testsuite/cargo_remove/multiple_dev/mod.rs
index 54252e4e907..e1594650f7e 100644
--- a/tests/testsuite/cargo_remove/multiple_dev/mod.rs
+++ b/tests/testsuite/cargo_remove/multiple_dev/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/no_arg/mod.rs b/tests/testsuite/cargo_remove/no_arg/mod.rs
index 87df427a5fd..70619f2dcac 100644
--- a/tests/testsuite/cargo_remove/no_arg/mod.rs
+++ b/tests/testsuite/cargo_remove/no_arg/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/offline/mod.rs b/tests/testsuite/cargo_remove/offline/mod.rs
index 921082b0628..48b3fc919c8 100644
--- a/tests/testsuite/cargo_remove/offline/mod.rs
+++ b/tests/testsuite/cargo_remove/offline/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs
index cc16de2d68f..493a60b5b64 100644
--- a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs
index 735af20d88b..21b758ceb81 100644
--- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/optional_feature/mod.rs b/tests/testsuite/cargo_remove/optional_feature/mod.rs
index e32b1391e36..30f3e337c65 100644
--- a/tests/testsuite/cargo_remove/optional_feature/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_feature/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/package/mod.rs b/tests/testsuite/cargo_remove/package/mod.rs
index 4712da23ad1..e3f26e7a54f 100644
--- a/tests/testsuite/cargo_remove/package/mod.rs
+++ b/tests/testsuite/cargo_remove/package/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/remove_basic/mod.rs b/tests/testsuite/cargo_remove/remove_basic/mod.rs
index ca492a6b59b..a1aebd4a886 100644
--- a/tests/testsuite/cargo_remove/remove_basic/mod.rs
+++ b/tests/testsuite/cargo_remove/remove_basic/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs
index 832444fa8a2..025b031c392 100644
--- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs
+++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/target/mod.rs b/tests/testsuite/cargo_remove/target/mod.rs
index 34f563c8cc8..3d971f8612b 100644
--- a/tests/testsuite/cargo_remove/target/mod.rs
+++ b/tests/testsuite/cargo_remove/target/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/target_build/mod.rs b/tests/testsuite/cargo_remove/target_build/mod.rs
index 10d8e4d2b6e..1f4d176ebf0 100644
--- a/tests/testsuite/cargo_remove/target_build/mod.rs
+++ b/tests/testsuite/cargo_remove/target_build/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/target_dev/mod.rs b/tests/testsuite/cargo_remove/target_dev/mod.rs
index 2bd5042af6f..168e5ef6c62 100644
--- a/tests/testsuite/cargo_remove/target_dev/mod.rs
+++ b/tests/testsuite/cargo_remove/target_dev/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/update_lock_file/mod.rs b/tests/testsuite/cargo_remove/update_lock_file/mod.rs
index 9607be6da97..b5aa3b96b7e 100644
--- a/tests/testsuite/cargo_remove/update_lock_file/mod.rs
+++ b/tests/testsuite/cargo_remove/update_lock_file/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/workspace/mod.rs b/tests/testsuite/cargo_remove/workspace/mod.rs
index 9e8e1aa29db..4d4610fdb34 100644
--- a/tests/testsuite/cargo_remove/workspace/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
index 9e8e1aa29db..4d4610fdb34 100644
--- a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs
index 9e8e1aa29db..4d4610fdb34 100644
--- a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs
@@ -3,7 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]
diff --git a/tests/testsuite/cargo_test/no_keep_going/mod.rs b/tests/testsuite/cargo_test/no_keep_going/mod.rs
index bb5731427f8..330e3690b10 100644
--- a/tests/testsuite/cargo_test/no_keep_going/mod.rs
+++ b/tests/testsuite/cargo_test/no_keep_going/mod.rs
@@ -2,7 +2,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
 use cargo_test_support::str;
-use cargo_test_support::CargoCommand;
+use cargo_test_support::CargoCommandExt;
 use cargo_test_support::Project;
 
 #[cargo_test]