From 2e878a4c38b2d669035a03bcf479147ff4e11420 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 20 Feb 2024 13:05:16 -0600
Subject: [PATCH 1/2] test: Remove empty snapshots for help

---
 crates/cargo-test-support/src/lib.rs                    | 8 ++++----
 tests/testsuite/cargo/help/mod.rs                       | 3 ++-
 tests/testsuite/cargo/help/stderr.log                   | 0
 tests/testsuite/cargo/z_help/mod.rs                     | 3 ++-
 tests/testsuite/cargo/z_help/stderr.log                 | 0
 tests/testsuite/cargo_add/help/mod.rs                   | 3 ++-
 tests/testsuite/cargo_add/help/stderr.log               | 0
 tests/testsuite/cargo_add/quiet/mod.rs                  | 3 ++-
 tests/testsuite/cargo_add/quiet/stderr.log              | 0
 tests/testsuite/cargo_bench/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_bench/help/stderr.log             | 0
 tests/testsuite/cargo_build/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_build/help/stderr.log             | 0
 tests/testsuite/cargo_check/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_check/help/stderr.log             | 0
 tests/testsuite/cargo_clean/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_clean/help/stderr.log             | 0
 tests/testsuite/cargo_config/help/mod.rs                | 3 ++-
 tests/testsuite/cargo_config/help/stderr.log            | 0
 tests/testsuite/cargo_doc/help/mod.rs                   | 3 ++-
 tests/testsuite/cargo_doc/help/stderr.log               | 0
 tests/testsuite/cargo_fetch/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_fetch/help/stderr.log             | 0
 tests/testsuite/cargo_fix/help/mod.rs                   | 3 ++-
 tests/testsuite/cargo_fix/help/stderr.log               | 0
 tests/testsuite/cargo_generate_lockfile/help/mod.rs     | 3 ++-
 tests/testsuite/cargo_generate_lockfile/help/stderr.log | 0
 tests/testsuite/cargo_git_checkout/help/mod.rs          | 3 ++-
 tests/testsuite/cargo_git_checkout/help/stderr.log      | 0
 tests/testsuite/cargo_help/help/mod.rs                  | 3 ++-
 tests/testsuite/cargo_help/help/stderr.log              | 0
 tests/testsuite/cargo_init/help/mod.rs                  | 3 ++-
 tests/testsuite/cargo_init/help/stderr.log              | 0
 tests/testsuite/cargo_install/help/mod.rs               | 3 ++-
 tests/testsuite/cargo_install/help/stderr.log           | 0
 tests/testsuite/cargo_locate_project/help/mod.rs        | 3 ++-
 tests/testsuite/cargo_locate_project/help/stderr.log    | 0
 tests/testsuite/cargo_login/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_login/help/stderr.log             | 0
 tests/testsuite/cargo_logout/help/mod.rs                | 3 ++-
 tests/testsuite/cargo_logout/help/stderr.log            | 0
 tests/testsuite/cargo_metadata/help/mod.rs              | 3 ++-
 tests/testsuite/cargo_metadata/help/stderr.log          | 0
 tests/testsuite/cargo_new/help/mod.rs                   | 3 ++-
 tests/testsuite/cargo_new/help/stderr.log               | 0
 tests/testsuite/cargo_owner/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_owner/help/stderr.log             | 0
 tests/testsuite/cargo_package/help/mod.rs               | 3 ++-
 tests/testsuite/cargo_package/help/stderr.log           | 0
 tests/testsuite/cargo_pkgid/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_pkgid/help/stderr.log             | 0
 tests/testsuite/cargo_publish/help/mod.rs               | 3 ++-
 tests/testsuite/cargo_publish/help/stderr.log           | 0
 tests/testsuite/cargo_read_manifest/help/mod.rs         | 3 ++-
 tests/testsuite/cargo_read_manifest/help/stderr.log     | 0
 tests/testsuite/cargo_remove/help/mod.rs                | 3 ++-
 tests/testsuite/cargo_remove/help/stderr.log            | 0
 tests/testsuite/cargo_report/help/mod.rs                | 3 ++-
 tests/testsuite/cargo_report/help/stderr.log            | 0
 tests/testsuite/cargo_run/help/mod.rs                   | 3 ++-
 tests/testsuite/cargo_run/help/stderr.log               | 0
 tests/testsuite/cargo_rustc/help/mod.rs                 | 3 ++-
 tests/testsuite/cargo_rustc/help/stderr.log             | 0
 tests/testsuite/cargo_rustdoc/help/mod.rs               | 3 ++-
 tests/testsuite/cargo_rustdoc/help/stderr.log           | 0
 tests/testsuite/cargo_search/help/mod.rs                | 3 ++-
 tests/testsuite/cargo_search/help/stderr.log            | 0
 tests/testsuite/cargo_test/help/mod.rs                  | 3 ++-
 tests/testsuite/cargo_test/help/stderr.log              | 0
 tests/testsuite/cargo_tree/help/mod.rs                  | 3 ++-
 tests/testsuite/cargo_tree/help/stderr.log              | 0
 tests/testsuite/cargo_uninstall/help/mod.rs             | 3 ++-
 tests/testsuite/cargo_uninstall/help/stderr.log         | 0
 tests/testsuite/cargo_update/help/mod.rs                | 3 ++-
 tests/testsuite/cargo_update/help/stderr.log            | 0
 tests/testsuite/cargo_vendor/help/mod.rs                | 3 ++-
 tests/testsuite/cargo_vendor/help/stderr.log            | 0
 tests/testsuite/cargo_verify_project/help/mod.rs        | 3 ++-
 tests/testsuite/cargo_verify_project/help/stderr.log    | 0
 tests/testsuite/cargo_version/help/mod.rs               | 3 ++-
 tests/testsuite/cargo_version/help/stderr.log           | 0
 tests/testsuite/cargo_yank/help/mod.rs                  | 3 ++-
 tests/testsuite/cargo_yank/help/stderr.log              | 0
 83 files changed, 86 insertions(+), 45 deletions(-)
 delete mode 100644 tests/testsuite/cargo/help/stderr.log
 delete mode 100644 tests/testsuite/cargo/z_help/stderr.log
 delete mode 100644 tests/testsuite/cargo_add/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_add/quiet/stderr.log
 delete mode 100644 tests/testsuite/cargo_bench/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_build/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_check/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_clean/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_config/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_doc/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_fetch/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_fix/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_generate_lockfile/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_git_checkout/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_help/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_init/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_install/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_locate_project/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_login/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_logout/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_metadata/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_new/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_owner/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_package/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_pkgid/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_publish/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_read_manifest/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_remove/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_report/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_run/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_rustc/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_rustdoc/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_search/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_test/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_tree/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_uninstall/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_update/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_vendor/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_verify_project/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_version/help/stderr.log
 delete mode 100644 tests/testsuite/cargo_yank/help/stderr.log

diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs
index e334041a0..0fe3b96c3 100644
--- a/crates/cargo-test-support/src/lib.rs
+++ b/crates/cargo-test-support/src/lib.rs
@@ -13,7 +13,6 @@ use std::fs;
 use std::os;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Output};
-use std::str;
 use std::sync::OnceLock;
 use std::thread::JoinHandle;
 use std::time::{self, Duration};
@@ -36,6 +35,7 @@ macro_rules! t {
 
 pub use snapbox::file;
 pub use snapbox::path::current_dir;
+pub use snapbox::str;
 
 #[track_caller]
 pub fn panic_error(what: &str, err: impl Into<anyhow::Error>) -> ! {
@@ -972,8 +972,8 @@ impl Execs {
 
     fn match_output(&self, code: Option<i32>, stdout: &[u8], stderr: &[u8]) -> Result<()> {
         self.verify_checks_output(stdout, stderr);
-        let stdout = str::from_utf8(stdout).expect("stdout is not utf8");
-        let stderr = str::from_utf8(stderr).expect("stderr is not utf8");
+        let stdout = std::str::from_utf8(stdout).expect("stdout is not utf8");
+        let stderr = std::str::from_utf8(stderr).expect("stderr is not utf8");
         let cwd = self.get_cwd();
 
         match self.expect_exit_code {
@@ -1211,7 +1211,7 @@ pub trait TestEnv: Sized {
                     .exec_with_output()
                 {
                     Ok(output) => {
-                        let s = str::from_utf8(&output.stdout).expect("utf8").trim();
+                        let s = std::str::from_utf8(&output.stdout).expect("utf8").trim();
                         let mut p = PathBuf::from(s);
                         p.pop();
                         p
diff --git a/tests/testsuite/cargo/help/mod.rs b/tests/testsuite/cargo/help/mod.rs
index fcf53c959..e1ea0ae41 100644
--- a/tests/testsuite/cargo/help/mod.rs
+++ b/tests/testsuite/cargo/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -8,5 +9,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo/help/stderr.log b/tests/testsuite/cargo/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo/z_help/mod.rs b/tests/testsuite/cargo/z_help/mod.rs
index 43afd3853..8c7b2668f 100644
--- a/tests/testsuite/cargo/z_help/mod.rs
+++ b/tests/testsuite/cargo/z_help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo/z_help/stderr.log b/tests/testsuite/cargo/z_help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/help/mod.rs b/tests/testsuite/cargo_add/help/mod.rs
index 15f9a6a04..f7a9964ab 100644
--- a/tests/testsuite/cargo_add/help/mod.rs
+++ b/tests/testsuite/cargo_add/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_add/help/stderr.log b/tests/testsuite/cargo_add/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/quiet/mod.rs b/tests/testsuite/cargo_add/quiet/mod.rs
index c570aabd8..7c8f9fd3f 100644
--- a/tests/testsuite/cargo_add/quiet/mod.rs
+++ b/tests/testsuite/cargo_add/quiet/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -25,7 +26,7 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/testsuite/cargo_add/quiet/stderr.log b/tests/testsuite/cargo_add/quiet/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_bench/help/mod.rs b/tests/testsuite/cargo_bench/help/mod.rs
index 104399937..d2b1737bb 100644
--- a/tests/testsuite/cargo_bench/help/mod.rs
+++ b/tests/testsuite/cargo_bench/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_bench/help/stderr.log b/tests/testsuite/cargo_bench/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_build/help/mod.rs b/tests/testsuite/cargo_build/help/mod.rs
index d1271bf1f..127fe424f 100644
--- a/tests/testsuite/cargo_build/help/mod.rs
+++ b/tests/testsuite/cargo_build/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_build/help/stderr.log b/tests/testsuite/cargo_build/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_check/help/mod.rs b/tests/testsuite/cargo_check/help/mod.rs
index 32d87803f..16c690c41 100644
--- a/tests/testsuite/cargo_check/help/mod.rs
+++ b/tests/testsuite/cargo_check/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_check/help/stderr.log b/tests/testsuite/cargo_check/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_clean/help/mod.rs b/tests/testsuite/cargo_clean/help/mod.rs
index d4efe3c36..533dc1337 100644
--- a/tests/testsuite/cargo_clean/help/mod.rs
+++ b/tests/testsuite/cargo_clean/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_clean/help/stderr.log b/tests/testsuite/cargo_clean/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_config/help/mod.rs b/tests/testsuite/cargo_config/help/mod.rs
index 20bcef683..000a80d9d 100644
--- a/tests/testsuite/cargo_config/help/mod.rs
+++ b/tests/testsuite/cargo_config/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_config/help/stderr.log b/tests/testsuite/cargo_config/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_doc/help/mod.rs b/tests/testsuite/cargo_doc/help/mod.rs
index 4fc28adba..4c33ea6e9 100644
--- a/tests/testsuite/cargo_doc/help/mod.rs
+++ b/tests/testsuite/cargo_doc/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_doc/help/stderr.log b/tests/testsuite/cargo_doc/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_fetch/help/mod.rs b/tests/testsuite/cargo_fetch/help/mod.rs
index b0f8349f0..e44d202c7 100644
--- a/tests/testsuite/cargo_fetch/help/mod.rs
+++ b/tests/testsuite/cargo_fetch/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_fetch/help/stderr.log b/tests/testsuite/cargo_fetch/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_fix/help/mod.rs b/tests/testsuite/cargo_fix/help/mod.rs
index 2a43ad544..bd849d5fc 100644
--- a/tests/testsuite/cargo_fix/help/mod.rs
+++ b/tests/testsuite/cargo_fix/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_fix/help/stderr.log b/tests/testsuite/cargo_fix/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_generate_lockfile/help/mod.rs b/tests/testsuite/cargo_generate_lockfile/help/mod.rs
index c22fb622f..7e5d87d66 100644
--- a/tests/testsuite/cargo_generate_lockfile/help/mod.rs
+++ b/tests/testsuite/cargo_generate_lockfile/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_generate_lockfile/help/stderr.log b/tests/testsuite/cargo_generate_lockfile/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_git_checkout/help/mod.rs b/tests/testsuite/cargo_git_checkout/help/mod.rs
index a11c97870..07f387069 100644
--- a/tests/testsuite/cargo_git_checkout/help/mod.rs
+++ b/tests/testsuite/cargo_git_checkout/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_git_checkout/help/stderr.log b/tests/testsuite/cargo_git_checkout/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_help/help/mod.rs b/tests/testsuite/cargo_help/help/mod.rs
index ef54d25b3..a8640b73c 100644
--- a/tests/testsuite/cargo_help/help/mod.rs
+++ b/tests/testsuite/cargo_help/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_help/help/stderr.log b/tests/testsuite/cargo_help/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/help/mod.rs b/tests/testsuite/cargo_init/help/mod.rs
index 58febefe8..87eec6886 100644
--- a/tests/testsuite/cargo_init/help/mod.rs
+++ b/tests/testsuite/cargo_init/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_init/help/stderr.log b/tests/testsuite/cargo_init/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_install/help/mod.rs b/tests/testsuite/cargo_install/help/mod.rs
index 9700da015..9aa299efd 100644
--- a/tests/testsuite/cargo_install/help/mod.rs
+++ b/tests/testsuite/cargo_install/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_install/help/stderr.log b/tests/testsuite/cargo_install/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_locate_project/help/mod.rs b/tests/testsuite/cargo_locate_project/help/mod.rs
index a1abcdb24..7c9a7b39d 100644
--- a/tests/testsuite/cargo_locate_project/help/mod.rs
+++ b/tests/testsuite/cargo_locate_project/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_locate_project/help/stderr.log b/tests/testsuite/cargo_locate_project/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_login/help/mod.rs b/tests/testsuite/cargo_login/help/mod.rs
index d36f4551f..94dfbb4f6 100644
--- a/tests/testsuite/cargo_login/help/mod.rs
+++ b/tests/testsuite/cargo_login/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_login/help/stderr.log b/tests/testsuite/cargo_login/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_logout/help/mod.rs b/tests/testsuite/cargo_logout/help/mod.rs
index a141c3c7d..76c643a1f 100644
--- a/tests/testsuite/cargo_logout/help/mod.rs
+++ b/tests/testsuite/cargo_logout/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_logout/help/stderr.log b/tests/testsuite/cargo_logout/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_metadata/help/mod.rs b/tests/testsuite/cargo_metadata/help/mod.rs
index 04d2e13a4..fe43d3557 100644
--- a/tests/testsuite/cargo_metadata/help/mod.rs
+++ b/tests/testsuite/cargo_metadata/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_metadata/help/stderr.log b/tests/testsuite/cargo_metadata/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_new/help/mod.rs b/tests/testsuite/cargo_new/help/mod.rs
index 0804f3890..e28338262 100644
--- a/tests/testsuite/cargo_new/help/mod.rs
+++ b/tests/testsuite/cargo_new/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_new/help/stderr.log b/tests/testsuite/cargo_new/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_owner/help/mod.rs b/tests/testsuite/cargo_owner/help/mod.rs
index 69ff5c455..b5e090aa9 100644
--- a/tests/testsuite/cargo_owner/help/mod.rs
+++ b/tests/testsuite/cargo_owner/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_owner/help/stderr.log b/tests/testsuite/cargo_owner/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_package/help/mod.rs b/tests/testsuite/cargo_package/help/mod.rs
index 10d1730e3..d31216514 100644
--- a/tests/testsuite/cargo_package/help/mod.rs
+++ b/tests/testsuite/cargo_package/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_package/help/stderr.log b/tests/testsuite/cargo_package/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_pkgid/help/mod.rs b/tests/testsuite/cargo_pkgid/help/mod.rs
index 9dea28b56..a7d3dd412 100644
--- a/tests/testsuite/cargo_pkgid/help/mod.rs
+++ b/tests/testsuite/cargo_pkgid/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_pkgid/help/stderr.log b/tests/testsuite/cargo_pkgid/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_publish/help/mod.rs b/tests/testsuite/cargo_publish/help/mod.rs
index 57d090afa..82b05e5df 100644
--- a/tests/testsuite/cargo_publish/help/mod.rs
+++ b/tests/testsuite/cargo_publish/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_publish/help/stderr.log b/tests/testsuite/cargo_publish/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_read_manifest/help/mod.rs b/tests/testsuite/cargo_read_manifest/help/mod.rs
index ef18fa6b6..5f66aed3a 100644
--- a/tests/testsuite/cargo_read_manifest/help/mod.rs
+++ b/tests/testsuite/cargo_read_manifest/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_read_manifest/help/stderr.log b/tests/testsuite/cargo_read_manifest/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/help/mod.rs b/tests/testsuite/cargo_remove/help/mod.rs
index 6af5b4c3f..915b4cd5f 100644
--- a/tests/testsuite/cargo_remove/help/mod.rs
+++ b/tests/testsuite/cargo_remove/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_remove/help/stderr.log b/tests/testsuite/cargo_remove/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_report/help/mod.rs b/tests/testsuite/cargo_report/help/mod.rs
index 352216475..3318c1b3d 100644
--- a/tests/testsuite/cargo_report/help/mod.rs
+++ b/tests/testsuite/cargo_report/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_report/help/stderr.log b/tests/testsuite/cargo_report/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_run/help/mod.rs b/tests/testsuite/cargo_run/help/mod.rs
index fc2db8257..d7ce00600 100644
--- a/tests/testsuite/cargo_run/help/mod.rs
+++ b/tests/testsuite/cargo_run/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_run/help/stderr.log b/tests/testsuite/cargo_run/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_rustc/help/mod.rs b/tests/testsuite/cargo_rustc/help/mod.rs
index 9f95e5f10..921b48100 100644
--- a/tests/testsuite/cargo_rustc/help/mod.rs
+++ b/tests/testsuite/cargo_rustc/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_rustc/help/stderr.log b/tests/testsuite/cargo_rustc/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_rustdoc/help/mod.rs b/tests/testsuite/cargo_rustdoc/help/mod.rs
index bd6e2977e..78d61ae9b 100644
--- a/tests/testsuite/cargo_rustdoc/help/mod.rs
+++ b/tests/testsuite/cargo_rustdoc/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_rustdoc/help/stderr.log b/tests/testsuite/cargo_rustdoc/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_search/help/mod.rs b/tests/testsuite/cargo_search/help/mod.rs
index f8f78c52b..d25c9fb88 100644
--- a/tests/testsuite/cargo_search/help/mod.rs
+++ b/tests/testsuite/cargo_search/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_search/help/stderr.log b/tests/testsuite/cargo_search/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_test/help/mod.rs b/tests/testsuite/cargo_test/help/mod.rs
index 1a3cdf4ce..978abcd30 100644
--- a/tests/testsuite/cargo_test/help/mod.rs
+++ b/tests/testsuite/cargo_test/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_test/help/stderr.log b/tests/testsuite/cargo_test/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_tree/help/mod.rs b/tests/testsuite/cargo_tree/help/mod.rs
index d67582e6a..eed0a122c 100644
--- a/tests/testsuite/cargo_tree/help/mod.rs
+++ b/tests/testsuite/cargo_tree/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_tree/help/stderr.log b/tests/testsuite/cargo_tree/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_uninstall/help/mod.rs b/tests/testsuite/cargo_uninstall/help/mod.rs
index b32a378aa..0bcf73b78 100644
--- a/tests/testsuite/cargo_uninstall/help/mod.rs
+++ b/tests/testsuite/cargo_uninstall/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_uninstall/help/stderr.log b/tests/testsuite/cargo_uninstall/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_update/help/mod.rs b/tests/testsuite/cargo_update/help/mod.rs
index b3bc2146c..6b9872b20 100644
--- a/tests/testsuite/cargo_update/help/mod.rs
+++ b/tests/testsuite/cargo_update/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_update/help/stderr.log b/tests/testsuite/cargo_update/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_vendor/help/mod.rs b/tests/testsuite/cargo_vendor/help/mod.rs
index 1b4b53501..b31d90062 100644
--- a/tests/testsuite/cargo_vendor/help/mod.rs
+++ b/tests/testsuite/cargo_vendor/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_vendor/help/stderr.log b/tests/testsuite/cargo_vendor/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_verify_project/help/mod.rs b/tests/testsuite/cargo_verify_project/help/mod.rs
index b3f1ad689..0ba01a1a9 100644
--- a/tests/testsuite/cargo_verify_project/help/mod.rs
+++ b/tests/testsuite/cargo_verify_project/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_verify_project/help/stderr.log b/tests/testsuite/cargo_verify_project/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_version/help/mod.rs b/tests/testsuite/cargo_version/help/mod.rs
index 8520e0b0e..e1741364f 100644
--- a/tests/testsuite/cargo_version/help/mod.rs
+++ b/tests/testsuite/cargo_version/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_version/help/stderr.log b/tests/testsuite/cargo_version/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_yank/help/mod.rs b/tests/testsuite/cargo_yank/help/mod.rs
index 9ea87f287..c64e97731 100644
--- a/tests/testsuite/cargo_yank/help/mod.rs
+++ b/tests/testsuite/cargo_yank/help/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::file;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,5 +10,5 @@ fn case() {
         .assert()
         .success()
         .stdout_matches(file!["stdout.log"])
-        .stderr_matches(file!["stderr.log"]);
+        .stderr_matches(str![""]);
 }
diff --git a/tests/testsuite/cargo_yank/help/stderr.log b/tests/testsuite/cargo_yank/help/stderr.log
deleted file mode 100644
index e69de29bb..000000000

From ac453f1c376dc737ac27833457653f03072e39f7 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 20 Feb 2024 13:29:09 -0600
Subject: [PATCH 2/2] test: Remove empty snapshots for UI tests

---
 tests/testsuite/cargo_add/add_basic/mod.rs                     | 3 ++-
 tests/testsuite/cargo_add/add_basic/stdout.log                 | 0
 tests/testsuite/cargo_add/add_multiple/mod.rs                  | 3 ++-
 tests/testsuite/cargo_add/add_multiple/stdout.log              | 0
 tests/testsuite/cargo_add/add_normalized_name_external/mod.rs  | 3 ++-
 .../cargo_add/add_normalized_name_external/stdout.log          | 0
 tests/testsuite/cargo_add/add_toolchain/mod.rs                 | 3 ++-
 tests/testsuite/cargo_add/add_toolchain/stdout.log             | 0
 tests/testsuite/cargo_add/build/mod.rs                         | 3 ++-
 tests/testsuite/cargo_add/build/stdout.log                     | 0
 tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs | 3 ++-
 .../cargo_add/build_prefer_existing_version/stdout.log         | 0
 tests/testsuite/cargo_add/change_rename_target/mod.rs          | 3 ++-
 tests/testsuite/cargo_add/change_rename_target/stdout.log      | 0
 tests/testsuite/cargo_add/cyclic_features/mod.rs               | 3 ++-
 tests/testsuite/cargo_add/cyclic_features/stdout.log           | 0
 tests/testsuite/cargo_add/default_features/mod.rs              | 3 ++-
 tests/testsuite/cargo_add/default_features/stdout.log          | 0
 tests/testsuite/cargo_add/deprecated_default_features/mod.rs   | 3 ++-
 .../testsuite/cargo_add/deprecated_default_features/stdout.log | 0
 tests/testsuite/cargo_add/deprecated_section/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/deprecated_section/stdout.log        | 0
 tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs      | 3 ++-
 tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log  | 0
 .../cargo_add/detect_workspace_inherit_features/mod.rs         | 3 ++-
 .../cargo_add/detect_workspace_inherit_features/stdout.log     | 0
 .../cargo_add/detect_workspace_inherit_optional/mod.rs         | 3 ++-
 .../cargo_add/detect_workspace_inherit_optional/stdout.log     | 0
 .../testsuite/cargo_add/detect_workspace_inherit_public/mod.rs | 3 ++-
 .../cargo_add/detect_workspace_inherit_public/stdout.log       | 0
 tests/testsuite/cargo_add/dev/mod.rs                           | 3 ++-
 tests/testsuite/cargo_add/dev/stdout.log                       | 0
 tests/testsuite/cargo_add/dev_build_conflict/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/dev_build_conflict/stdout.log        | 0
 tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs   | 3 ++-
 .../testsuite/cargo_add/dev_prefer_existing_version/stdout.log | 0
 tests/testsuite/cargo_add/dry_run/mod.rs                       | 3 ++-
 tests/testsuite/cargo_add/dry_run/stdout.log                   | 0
 tests/testsuite/cargo_add/empty_dep_name/mod.rs                | 3 ++-
 tests/testsuite/cargo_add/empty_dep_name/stdout.log            | 0
 tests/testsuite/cargo_add/empty_dep_table/mod.rs               | 3 ++-
 tests/testsuite/cargo_add/empty_dep_table/stdout.log           | 0
 tests/testsuite/cargo_add/features/mod.rs                      | 3 ++-
 tests/testsuite/cargo_add/features/stdout.log                  | 0
 tests/testsuite/cargo_add/features_activated_over_limit/mod.rs | 3 ++-
 .../cargo_add/features_activated_over_limit/stdout.log         | 0
 .../testsuite/cargo_add/features_deactivated_over_limit/mod.rs | 3 ++-
 .../cargo_add/features_deactivated_over_limit/stdout.log       | 0
 tests/testsuite/cargo_add/features_empty/mod.rs                | 3 ++-
 tests/testsuite/cargo_add/features_empty/stdout.log            | 0
 tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs | 3 ++-
 .../cargo_add/features_multiple_occurrences/stdout.log         | 0
 tests/testsuite/cargo_add/features_preserve/mod.rs             | 3 ++-
 tests/testsuite/cargo_add/features_preserve/stdout.log         | 0
 tests/testsuite/cargo_add/features_spaced_values/mod.rs        | 3 ++-
 tests/testsuite/cargo_add/features_spaced_values/stdout.log    | 0
 tests/testsuite/cargo_add/features_unknown/mod.rs              | 3 ++-
 tests/testsuite/cargo_add/features_unknown/stdout.log          | 0
 tests/testsuite/cargo_add/features_unknown_no_features/mod.rs  | 3 ++-
 .../cargo_add/features_unknown_no_features/stdout.log          | 0
 tests/testsuite/cargo_add/git/mod.rs                           | 3 ++-
 tests/testsuite/cargo_add/git/stdout.log                       | 0
 tests/testsuite/cargo_add/git_branch/mod.rs                    | 3 ++-
 tests/testsuite/cargo_add/git_branch/stdout.log                | 0
 tests/testsuite/cargo_add/git_conflicts_namever/mod.rs         | 3 ++-
 tests/testsuite/cargo_add/git_conflicts_namever/stdout.log     | 0
 tests/testsuite/cargo_add/git_dev/mod.rs                       | 3 ++-
 tests/testsuite/cargo_add/git_dev/stdout.log                   | 0
 tests/testsuite/cargo_add/git_inferred_name/mod.rs             | 3 ++-
 tests/testsuite/cargo_add/git_inferred_name/stdout.log         | 0
 tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs    | 3 ++-
 .../testsuite/cargo_add/git_inferred_name_multiple/stdout.log  | 0
 tests/testsuite/cargo_add/git_multiple_names/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/git_multiple_names/stdout.log        | 0
 .../testsuite/cargo_add/git_multiple_packages_features/mod.rs  | 3 ++-
 .../cargo_add/git_multiple_packages_features/stdout.log        | 0
 tests/testsuite/cargo_add/git_normalized_name/mod.rs           | 3 ++-
 tests/testsuite/cargo_add/git_normalized_name/stdout.log       | 0
 tests/testsuite/cargo_add/git_registry/mod.rs                  | 3 ++-
 tests/testsuite/cargo_add/git_registry/stdout.log              | 0
 tests/testsuite/cargo_add/git_rev/mod.rs                       | 3 ++-
 tests/testsuite/cargo_add/git_rev/stdout.log                   | 0
 tests/testsuite/cargo_add/git_tag/mod.rs                       | 3 ++-
 tests/testsuite/cargo_add/git_tag/stdout.log                   | 0
 tests/testsuite/cargo_add/infer_prerelease/mod.rs              | 3 ++-
 tests/testsuite/cargo_add/infer_prerelease/stdout.log          | 0
 tests/testsuite/cargo_add/invalid_arg/mod.rs                   | 3 ++-
 tests/testsuite/cargo_add/invalid_arg/stdout.log               | 0
 tests/testsuite/cargo_add/invalid_git_name/mod.rs              | 3 ++-
 tests/testsuite/cargo_add/invalid_git_name/stdout.log          | 0
 .../testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs  | 3 ++-
 .../cargo_add/invalid_key_inherit_dependency/stdout.log        | 0
 .../cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs  | 3 ++-
 .../invalid_key_overwrite_inherit_dependency/stdout.log        | 0
 .../cargo_add/invalid_key_rename_inherit_dependency/mod.rs     | 3 ++-
 .../cargo_add/invalid_key_rename_inherit_dependency/stdout.log | 0
 tests/testsuite/cargo_add/invalid_manifest/mod.rs              | 3 ++-
 tests/testsuite/cargo_add/invalid_manifest/stdout.log          | 0
 tests/testsuite/cargo_add/invalid_name_external/mod.rs         | 3 ++-
 tests/testsuite/cargo_add/invalid_name_external/stdout.log     | 0
 tests/testsuite/cargo_add/invalid_path/mod.rs                  | 3 ++-
 tests/testsuite/cargo_add/invalid_path/stdout.log              | 0
 tests/testsuite/cargo_add/invalid_path_name/mod.rs             | 3 ++-
 tests/testsuite/cargo_add/invalid_path_name/stdout.log         | 0
 tests/testsuite/cargo_add/invalid_path_self/mod.rs             | 3 ++-
 tests/testsuite/cargo_add/invalid_path_self/stdout.log         | 0
 tests/testsuite/cargo_add/invalid_target_empty/mod.rs          | 3 ++-
 tests/testsuite/cargo_add/invalid_target_empty/stdout.log      | 0
 tests/testsuite/cargo_add/invalid_vers/mod.rs                  | 3 ++-
 tests/testsuite/cargo_add/invalid_vers/stdout.log              | 0
 tests/testsuite/cargo_add/list_features/mod.rs                 | 3 ++-
 tests/testsuite/cargo_add/list_features/stdout.log             | 0
 tests/testsuite/cargo_add/list_features_path/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/list_features_path/stdout.log        | 0
 tests/testsuite/cargo_add/list_features_path_no_default/mod.rs | 3 ++-
 .../cargo_add/list_features_path_no_default/stdout.log         | 0
 tests/testsuite/cargo_add/locked_changed/mod.rs                | 3 ++-
 tests/testsuite/cargo_add/locked_changed/stdout.log            | 0
 tests/testsuite/cargo_add/locked_unchanged/mod.rs              | 3 ++-
 tests/testsuite/cargo_add/locked_unchanged/stdout.log          | 0
 tests/testsuite/cargo_add/lockfile_updated/mod.rs              | 3 ++-
 tests/testsuite/cargo_add/lockfile_updated/stdout.log          | 0
 tests/testsuite/cargo_add/manifest_path_package/mod.rs         | 3 ++-
 tests/testsuite/cargo_add/manifest_path_package/stdout.log     | 0
 tests/testsuite/cargo_add/merge_activated_features/mod.rs      | 3 ++-
 tests/testsuite/cargo_add/merge_activated_features/stdout.log  | 0
 .../cargo_add/multiple_conflicts_with_features/mod.rs          | 3 ++-
 .../cargo_add/multiple_conflicts_with_features/stdout.log      | 0
 .../testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs  | 3 ++-
 .../cargo_add/multiple_conflicts_with_rename/stdout.log        | 0
 tests/testsuite/cargo_add/namever/mod.rs                       | 3 ++-
 tests/testsuite/cargo_add/namever/stdout.log                   | 0
 tests/testsuite/cargo_add/no_args/mod.rs                       | 3 ++-
 tests/testsuite/cargo_add/no_args/stdout.log                   | 0
 tests/testsuite/cargo_add/no_default_features/mod.rs           | 3 ++-
 tests/testsuite/cargo_add/no_default_features/stdout.log       | 0
 tests/testsuite/cargo_add/no_optional/mod.rs                   | 3 ++-
 tests/testsuite/cargo_add/no_optional/stdout.log               | 0
 tests/testsuite/cargo_add/no_public/mod.rs                     | 3 ++-
 tests/testsuite/cargo_add/no_public/stdout.log                 | 0
 tests/testsuite/cargo_add/offline_empty_cache/mod.rs           | 3 ++-
 tests/testsuite/cargo_add/offline_empty_cache/stdout.log       | 0
 tests/testsuite/cargo_add/optional/mod.rs                      | 3 ++-
 tests/testsuite/cargo_add/optional/stdout.log                  | 0
 tests/testsuite/cargo_add/overwrite_default_features/mod.rs    | 3 ++-
 .../testsuite/cargo_add/overwrite_default_features/stdout.log  | 0
 .../overwrite_default_features_with_no_default_features/mod.rs | 3 ++-
 .../stdout.log                                                 | 0
 tests/testsuite/cargo_add/overwrite_features/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/overwrite_features/stdout.log        | 0
 tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs       | 3 ++-
 tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log   | 0
 .../testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs | 3 ++-
 .../cargo_add/overwrite_inherit_features_noop/stdout.log       | 0
 tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs        | 3 ++-
 tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log    | 0
 .../testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs | 3 ++-
 .../cargo_add/overwrite_inherit_optional_noop/stdout.log       | 0
 tests/testsuite/cargo_add/overwrite_inline_features/mod.rs     | 3 ++-
 tests/testsuite/cargo_add/overwrite_inline_features/stdout.log | 0
 tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs       | 3 ++-
 tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log   | 0
 tests/testsuite/cargo_add/overwrite_name_noop/mod.rs           | 3 ++-
 tests/testsuite/cargo_add/overwrite_name_noop/stdout.log       | 0
 tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs | 3 ++-
 .../cargo_add/overwrite_no_default_features/stdout.log         | 0
 .../overwrite_no_default_features_with_default_features/mod.rs | 3 ++-
 .../stdout.log                                                 | 0
 tests/testsuite/cargo_add/overwrite_no_optional/mod.rs         | 3 ++-
 tests/testsuite/cargo_add/overwrite_no_optional/stdout.log     | 0
 .../cargo_add/overwrite_no_optional_with_optional/mod.rs       | 3 ++-
 .../cargo_add/overwrite_no_optional_with_optional/stdout.log   | 0
 tests/testsuite/cargo_add/overwrite_no_public/mod.rs           | 3 ++-
 tests/testsuite/cargo_add/overwrite_no_public/stdout.log       | 0
 .../testsuite/cargo_add/overwrite_no_public_with_public/mod.rs | 3 ++-
 .../cargo_add/overwrite_no_public_with_public/stdout.log       | 0
 tests/testsuite/cargo_add/overwrite_optional/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/overwrite_optional/stdout.log        | 0
 .../cargo_add/overwrite_optional_with_no_optional/mod.rs       | 3 ++-
 .../cargo_add/overwrite_optional_with_no_optional/stdout.log   | 0
 .../cargo_add/overwrite_optional_with_optional/mod.rs          | 3 ++-
 .../cargo_add/overwrite_optional_with_optional/stdout.log      | 0
 tests/testsuite/cargo_add/overwrite_path_noop/mod.rs           | 3 ++-
 tests/testsuite/cargo_add/overwrite_path_noop/stdout.log       | 0
 tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs   | 3 ++-
 .../testsuite/cargo_add/overwrite_path_with_version/stdout.log | 0
 .../cargo_add/overwrite_preserves_inline_table/mod.rs          | 3 ++-
 .../cargo_add/overwrite_preserves_inline_table/stdout.log      | 0
 tests/testsuite/cargo_add/overwrite_public/mod.rs              | 3 ++-
 tests/testsuite/cargo_add/overwrite_public/stdout.log          | 0
 .../testsuite/cargo_add/overwrite_public_with_no_public/mod.rs | 3 ++-
 .../cargo_add/overwrite_public_with_no_public/stdout.log       | 0
 .../testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs | 3 ++-
 .../cargo_add/overwrite_rename_with_no_rename/stdout.log       | 0
 tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs  | 3 ++-
 .../cargo_add/overwrite_rename_with_rename/stdout.log          | 0
 .../cargo_add/overwrite_rename_with_rename_noop/mod.rs         | 3 ++-
 .../cargo_add/overwrite_rename_with_rename_noop/stdout.log     | 0
 tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs    | 3 ++-
 .../testsuite/cargo_add/overwrite_version_with_git/stdout.log  | 0
 tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs   | 3 ++-
 .../testsuite/cargo_add/overwrite_version_with_path/stdout.log | 0
 tests/testsuite/cargo_add/overwrite_with_rename/mod.rs         | 3 ++-
 tests/testsuite/cargo_add/overwrite_with_rename/stdout.log     | 0
 tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs       | 3 ++-
 tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log   | 0
 .../cargo_add/overwrite_workspace_dep_features/mod.rs          | 3 ++-
 .../cargo_add/overwrite_workspace_dep_features/stdout.log      | 0
 tests/testsuite/cargo_add/path/mod.rs                          | 3 ++-
 tests/testsuite/cargo_add/path/stdout.log                      | 0
 tests/testsuite/cargo_add/path_dev/mod.rs                      | 3 ++-
 tests/testsuite/cargo_add/path_dev/stdout.log                  | 0
 tests/testsuite/cargo_add/path_inferred_name/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/path_inferred_name/stdout.log        | 0
 .../cargo_add/path_inferred_name_conflicts_full_feature/mod.rs | 3 ++-
 .../path_inferred_name_conflicts_full_feature/stdout.log       | 0
 tests/testsuite/cargo_add/path_normalized_name/mod.rs          | 3 ++-
 tests/testsuite/cargo_add/path_normalized_name/stdout.log      | 0
 tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs        | 3 ++-
 tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log    | 0
 tests/testsuite/cargo_add/preserve_features_table/mod.rs       | 3 ++-
 tests/testsuite/cargo_add/preserve_features_table/stdout.log   | 0
 tests/testsuite/cargo_add/preserve_sorted/mod.rs               | 3 ++-
 tests/testsuite/cargo_add/preserve_sorted/stdout.log           | 0
 tests/testsuite/cargo_add/preserve_unsorted/mod.rs             | 3 ++-
 tests/testsuite/cargo_add/preserve_unsorted/stdout.log         | 0
 tests/testsuite/cargo_add/public/mod.rs                        | 3 ++-
 tests/testsuite/cargo_add/public/stdout.log                    | 0
 tests/testsuite/cargo_add/quiet/mod.rs                         | 3 +--
 tests/testsuite/cargo_add/quiet/stdout.log                     | 0
 tests/testsuite/cargo_add/registry/mod.rs                      | 3 ++-
 tests/testsuite/cargo_add/registry/stdout.log                  | 0
 tests/testsuite/cargo_add/rename/mod.rs                        | 3 ++-
 tests/testsuite/cargo_add/rename/stdout.log                    | 0
 tests/testsuite/cargo_add/require_weak/mod.rs                  | 3 ++-
 tests/testsuite/cargo_add/require_weak/stdout.log              | 0
 tests/testsuite/cargo_add/rust_version_ignore/mod.rs           | 3 ++-
 tests/testsuite/cargo_add/rust_version_ignore/stdout.log       | 0
 tests/testsuite/cargo_add/rust_version_incompatible/mod.rs     | 3 ++-
 tests/testsuite/cargo_add/rust_version_incompatible/stdout.log | 0
 tests/testsuite/cargo_add/rust_version_latest/mod.rs           | 3 ++-
 tests/testsuite/cargo_add/rust_version_latest/stdout.log       | 0
 tests/testsuite/cargo_add/rust_version_older/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/rust_version_older/stdout.log        | 0
 tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs | 3 ++-
 .../cargo_add/sorted_table_with_dotted_item/stdout.log         | 0
 tests/testsuite/cargo_add/target/mod.rs                        | 3 ++-
 tests/testsuite/cargo_add/target/stdout.log                    | 0
 tests/testsuite/cargo_add/target_cfg/mod.rs                    | 3 ++-
 tests/testsuite/cargo_add/target_cfg/stdout.log                | 0
 tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs     | 3 ++-
 tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log | 0
 tests/testsuite/cargo_add/vers/mod.rs                          | 3 ++-
 tests/testsuite/cargo_add/vers/stdout.log                      | 0
 tests/testsuite/cargo_add/workspace_name/mod.rs                | 3 ++-
 tests/testsuite/cargo_add/workspace_name/stdout.log            | 0
 tests/testsuite/cargo_add/workspace_path/mod.rs                | 3 ++-
 tests/testsuite/cargo_add/workspace_path/stdout.log            | 0
 tests/testsuite/cargo_add/workspace_path_dev/mod.rs            | 3 ++-
 tests/testsuite/cargo_add/workspace_path_dev/stdout.log        | 0
 tests/testsuite/cargo_bench/no_keep_going/mod.rs               | 3 ++-
 tests/testsuite/cargo_bench/no_keep_going/stdout.log           | 0
 tests/testsuite/cargo_init/auto_git/mod.rs                     | 3 ++-
 tests/testsuite/cargo_init/auto_git/stdout.log                 | 0
 tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs  | 3 ++-
 .../cargo_init/bin_already_exists_explicit/stdout.log          | 0
 .../cargo_init/bin_already_exists_explicit_nosrc/mod.rs        | 3 ++-
 .../cargo_init/bin_already_exists_explicit_nosrc/stdout.log    | 0
 tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs  | 3 ++-
 .../cargo_init/bin_already_exists_implicit/stdout.log          | 0
 .../cargo_init/bin_already_exists_implicit_namenosrc/mod.rs    | 3 ++-
 .../bin_already_exists_implicit_namenosrc/stdout.log           | 0
 .../cargo_init/bin_already_exists_implicit_namesrc/mod.rs      | 3 ++-
 .../cargo_init/bin_already_exists_implicit_namesrc/stdout.log  | 0
 .../cargo_init/bin_already_exists_implicit_nosrc/mod.rs        | 3 ++-
 .../cargo_init/bin_already_exists_implicit_nosrc/stdout.log    | 0
 tests/testsuite/cargo_init/both_lib_and_bin/mod.rs             | 3 ++-
 tests/testsuite/cargo_init/both_lib_and_bin/stdout.log         | 0
 .../cant_create_library_when_both_binlib_present/mod.rs        | 3 ++-
 .../cant_create_library_when_both_binlib_present/stdout.log    | 0
 .../testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs | 3 ++-
 .../cargo_init/confused_by_multiple_lib_files/stdout.log       | 0
 .../cargo_init/creates_binary_when_both_binlib_present/mod.rs  | 3 ++-
 .../creates_binary_when_both_binlib_present/stdout.log         | 0
 .../creates_binary_when_instructed_and_has_lib_file/mod.rs     | 3 ++-
 .../creates_binary_when_instructed_and_has_lib_file/stdout.log | 0
 .../creates_library_when_instructed_and_has_bin_file/mod.rs    | 3 ++-
 .../stdout.log                                                 | 0
 tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs        | 3 ++-
 tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log    | 0
 tests/testsuite/cargo_init/formats_source/mod.rs               | 3 ++-
 tests/testsuite/cargo_init/formats_source/stdout.log           | 0
 tests/testsuite/cargo_init/fossil_autodetect/mod.rs            | 3 ++-
 tests/testsuite/cargo_init/fossil_autodetect/stdout.log        | 0
 tests/testsuite/cargo_init/git_autodetect/mod.rs               | 3 ++-
 tests/testsuite/cargo_init/git_autodetect/stdout.log           | 0
 .../cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs | 3 ++-
 .../git_ignore_exists_no_conflicting_entries/stdout.log        | 0
 .../cargo_init/ignores_failure_to_format_source/mod.rs         | 3 ++-
 .../cargo_init/ignores_failure_to_format_source/stdout.log     | 0
 tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs        | 3 ++-
 tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log    | 0
 tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs        | 3 ++-
 tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log    | 0
 .../cargo_init/inherit_workspace_package_table/mod.rs          | 3 ++-
 .../cargo_init/inherit_workspace_package_table/stdout.log      | 0
 tests/testsuite/cargo_init/invalid_dir_name/mod.rs             | 3 ++-
 tests/testsuite/cargo_init/invalid_dir_name/stdout.log         | 0
 tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs     | 3 ++-
 tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log | 0
 tests/testsuite/cargo_init/lib_already_exists_src/mod.rs       | 3 ++-
 tests/testsuite/cargo_init/lib_already_exists_src/stdout.log   | 0
 tests/testsuite/cargo_init/mercurial_autodetect/mod.rs         | 3 ++-
 tests/testsuite/cargo_init/mercurial_autodetect/stdout.log     | 0
 tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs  | 3 ++-
 .../cargo_init/multibin_project_name_clash/stdout.log          | 0
 tests/testsuite/cargo_init/no_filename/mod.rs                  | 3 ++-
 tests/testsuite/cargo_init/no_filename/stdout.log              | 0
 tests/testsuite/cargo_init/path_contains_separator/mod.rs      | 3 ++-
 tests/testsuite/cargo_init/path_contains_separator/stdout.log  | 0
 tests/testsuite/cargo_init/pijul_autodetect/mod.rs             | 3 ++-
 tests/testsuite/cargo_init/pijul_autodetect/stdout.log         | 0
 tests/testsuite/cargo_init/reserved_name/mod.rs                | 3 ++-
 tests/testsuite/cargo_init/reserved_name/stdout.log            | 0
 tests/testsuite/cargo_init/simple_bin/mod.rs                   | 3 ++-
 tests/testsuite/cargo_init/simple_bin/stdout.log               | 0
 tests/testsuite/cargo_init/simple_git/mod.rs                   | 3 ++-
 tests/testsuite/cargo_init/simple_git/stdout.log               | 0
 tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs     | 3 ++-
 tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log | 0
 tests/testsuite/cargo_init/simple_hg/mod.rs                    | 3 ++-
 tests/testsuite/cargo_init/simple_hg/stdout.log                | 0
 tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs      | 3 ++-
 tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log  | 0
 tests/testsuite/cargo_init/simple_lib/mod.rs                   | 3 ++-
 tests/testsuite/cargo_init/simple_lib/stdout.log               | 0
 tests/testsuite/cargo_init/unknown_flags/mod.rs                | 3 ++-
 tests/testsuite/cargo_init/unknown_flags/stdout.log            | 0
 tests/testsuite/cargo_init/with_argument/mod.rs                | 3 ++-
 tests/testsuite/cargo_init/with_argument/stdout.log            | 0
 tests/testsuite/cargo_init/workspace_add_member/mod.rs         | 3 ++-
 tests/testsuite/cargo_init/workspace_add_member/stdout.log     | 0
 tests/testsuite/cargo_new/add_members_to_non_workspace/mod.rs  | 3 ++-
 .../cargo_new/add_members_to_non_workspace/stdout.log          | 0
 .../add_members_to_workspace_format_previous_items/mod.rs      | 3 ++-
 .../add_members_to_workspace_format_previous_items/stdout.log  | 0
 .../cargo_new/add_members_to_workspace_format_sorted/mod.rs    | 3 ++-
 .../add_members_to_workspace_format_sorted/stdout.log          | 0
 .../add_members_to_workspace_with_absolute_package_path/mod.rs | 3 ++-
 .../stdout.log                                                 | 0
 .../add_members_to_workspace_with_empty_members/mod.rs         | 3 ++-
 .../add_members_to_workspace_with_empty_members/stdout.log     | 0
 .../add_members_to_workspace_with_exclude_list/mod.rs          | 3 ++-
 .../add_members_to_workspace_with_exclude_list/stdout.log      | 0
 .../add_members_to_workspace_with_members_glob/mod.rs          | 3 ++-
 .../add_members_to_workspace_with_members_glob/stdout.log      | 0
 .../cargo_new/add_members_to_workspace_without_members/mod.rs  | 3 ++-
 .../add_members_to_workspace_without_members/stdout.log        | 0
 tests/testsuite/cargo_new/empty_name/mod.rs                    | 3 ++-
 tests/testsuite/cargo_new/empty_name/stdout.log                | 0
 tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs       | 3 ++-
 tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log   | 0
 .../testsuite/cargo_new/inherit_workspace_package_table/mod.rs | 3 ++-
 .../cargo_new/inherit_workspace_package_table/stdout.log       | 0
 .../inherit_workspace_package_table_with_edition/mod.rs        | 3 ++-
 .../inherit_workspace_package_table_with_edition/stdout.log    | 0
 .../inherit_workspace_package_table_with_registry/mod.rs       | 3 ++-
 .../inherit_workspace_package_table_with_registry/stdout.log   | 0
 .../inherit_workspace_package_table_without_version/mod.rs     | 3 ++-
 .../inherit_workspace_package_table_without_version/stdout.log | 0
 .../not_inherit_workspace_package_table_if_not_members/mod.rs  | 3 ++-
 .../stdout.log                                                 | 0
 tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs         | 3 ++-
 tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log     | 0
 tests/testsuite/cargo_remove/build/mod.rs                      | 3 ++-
 tests/testsuite/cargo_remove/build/stdout.log                  | 0
 tests/testsuite/cargo_remove/dev/mod.rs                        | 3 ++-
 tests/testsuite/cargo_remove/dev/stdout.log                    | 0
 tests/testsuite/cargo_remove/dry_run/mod.rs                    | 3 ++-
 tests/testsuite/cargo_remove/dry_run/stdout.log                | 0
 tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs         | 3 ++-
 tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log     | 0
 tests/testsuite/cargo_remove/gc_patch/mod.rs                   | 3 ++-
 tests/testsuite/cargo_remove/gc_patch/stdout.log               | 0
 tests/testsuite/cargo_remove/gc_profile/mod.rs                 | 3 ++-
 tests/testsuite/cargo_remove/gc_profile/stdout.log             | 0
 tests/testsuite/cargo_remove/gc_replace/mod.rs                 | 3 ++-
 tests/testsuite/cargo_remove/gc_replace/stdout.log             | 0
 tests/testsuite/cargo_remove/invalid_arg/mod.rs                | 3 ++-
 tests/testsuite/cargo_remove/invalid_arg/stdout.log            | 0
 tests/testsuite/cargo_remove/invalid_dep/mod.rs                | 3 ++-
 tests/testsuite/cargo_remove/invalid_dep/stdout.log            | 0
 tests/testsuite/cargo_remove/invalid_package/mod.rs            | 3 ++-
 tests/testsuite/cargo_remove/invalid_package/stdout.log        | 0
 tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs   | 3 ++-
 .../testsuite/cargo_remove/invalid_package_multiple/stdout.log | 0
 tests/testsuite/cargo_remove/invalid_section/mod.rs            | 3 ++-
 tests/testsuite/cargo_remove/invalid_section/stdout.log        | 0
 tests/testsuite/cargo_remove/invalid_section_dep/mod.rs        | 3 ++-
 tests/testsuite/cargo_remove/invalid_section_dep/stdout.log    | 0
 tests/testsuite/cargo_remove/invalid_target/mod.rs             | 3 ++-
 tests/testsuite/cargo_remove/invalid_target/stdout.log         | 0
 tests/testsuite/cargo_remove/invalid_target_dep/mod.rs         | 3 ++-
 tests/testsuite/cargo_remove/invalid_target_dep/stdout.log     | 0
 tests/testsuite/cargo_remove/multiple_deps/mod.rs              | 3 ++-
 tests/testsuite/cargo_remove/multiple_deps/stdout.log          | 0
 tests/testsuite/cargo_remove/multiple_dev/mod.rs               | 3 ++-
 tests/testsuite/cargo_remove/multiple_dev/stdout.log           | 0
 tests/testsuite/cargo_remove/no_arg/mod.rs                     | 3 ++-
 tests/testsuite/cargo_remove/no_arg/stdout.log                 | 0
 tests/testsuite/cargo_remove/offline/mod.rs                    | 3 ++-
 tests/testsuite/cargo_remove/offline/stdout.log                | 0
 tests/testsuite/cargo_remove/optional_dep_feature/mod.rs       | 3 ++-
 tests/testsuite/cargo_remove/optional_dep_feature/stdout.log   | 0
 .../cargo_remove/optional_dep_feature_formatting/mod.rs        | 3 ++-
 .../cargo_remove/optional_dep_feature_formatting/stdout.log    | 0
 tests/testsuite/cargo_remove/optional_feature/mod.rs           | 3 ++-
 tests/testsuite/cargo_remove/optional_feature/stdout.log       | 0
 tests/testsuite/cargo_remove/package/mod.rs                    | 3 ++-
 tests/testsuite/cargo_remove/package/stdout.log                | 0
 tests/testsuite/cargo_remove/remove_basic/mod.rs               | 3 ++-
 tests/testsuite/cargo_remove/remove_basic/stdout.log           | 0
 tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs       | 3 ++-
 tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log   | 0
 tests/testsuite/cargo_remove/target/mod.rs                     | 3 ++-
 tests/testsuite/cargo_remove/target/stdout.log                 | 0
 tests/testsuite/cargo_remove/target_build/mod.rs               | 3 ++-
 tests/testsuite/cargo_remove/target_build/stdout.log           | 0
 tests/testsuite/cargo_remove/target_dev/mod.rs                 | 3 ++-
 tests/testsuite/cargo_remove/target_dev/stdout.log             | 0
 tests/testsuite/cargo_remove/update_lock_file/mod.rs           | 3 ++-
 tests/testsuite/cargo_remove/update_lock_file/stdout.log       | 0
 tests/testsuite/cargo_remove/workspace/mod.rs                  | 3 ++-
 tests/testsuite/cargo_remove/workspace/stdout.log              | 0
 tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs      | 3 ++-
 tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log  | 0
 tests/testsuite/cargo_remove/workspace_preserved/mod.rs        | 3 ++-
 tests/testsuite/cargo_remove/workspace_preserved/stdout.log    | 0
 tests/testsuite/cargo_test/no_keep_going/mod.rs                | 3 ++-
 tests/testsuite/cargo_test/no_keep_going/stdout.log            | 0
 tests/testsuite/cargo_update/toolchain_pkgname/mod.rs          | 3 ++-
 tests/testsuite/cargo_update/toolchain_pkgname/stdout.log      | 0
 442 files changed, 441 insertions(+), 222 deletions(-)
 delete mode 100644 tests/testsuite/cargo_add/add_basic/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/add_multiple/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/add_normalized_name_external/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/add_toolchain/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/build/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/change_rename_target/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/cyclic_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/default_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/deprecated_default_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/deprecated_section/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/dev/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/dev_build_conflict/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/dry_run/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/empty_dep_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/empty_dep_table/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features_activated_over_limit/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features_empty/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features_multiple_occurrences/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features_preserve/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features_spaced_values/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features_unknown/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/features_unknown_no_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_branch/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_conflicts_namever/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_dev/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_inferred_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_multiple_names/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_multiple_packages_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_normalized_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_registry/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_rev/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/git_tag/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/infer_prerelease/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_arg/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_git_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_manifest/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_name_external/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_path/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_path_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_path_self/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_target_empty/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/invalid_vers/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/list_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/list_features_path/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/list_features_path_no_default/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/locked_changed/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/locked_unchanged/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/lockfile_updated/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/manifest_path_package/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/merge_activated_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/namever/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/no_args/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/no_default_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/no_optional/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/no_public/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/offline_empty_cache/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/optional/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_default_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_inline_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_name_noop/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_no_optional/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_no_public/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_optional/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_path_noop/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_path_with_version/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_public/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_version_with_git/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_version_with_path/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_with_rename/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/path/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/path_dev/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/path_inferred_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/path_normalized_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/preserve_features_table/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/preserve_sorted/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/preserve_unsorted/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/public/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/quiet/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/registry/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/rename/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/require_weak/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/rust_version_ignore/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/rust_version_incompatible/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/rust_version_latest/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/rust_version_older/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/target/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/target_cfg/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/vers/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/workspace_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/workspace_path/stdout.log
 delete mode 100644 tests/testsuite/cargo_add/workspace_path_dev/stdout.log
 delete mode 100644 tests/testsuite/cargo_bench/no_keep_going/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/auto_git/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/both_lib_and_bin/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/formats_source/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/fossil_autodetect/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/git_autodetect/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/invalid_dir_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/lib_already_exists_src/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/mercurial_autodetect/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/no_filename/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/path_contains_separator/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/pijul_autodetect/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/reserved_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/simple_bin/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/simple_git/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/simple_hg/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/simple_lib/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/unknown_flags/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/with_argument/stdout.log
 delete mode 100644 tests/testsuite/cargo_init/workspace_add_member/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/empty_name/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.log
 delete mode 100644 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/build/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/dev/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/dry_run/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/gc_patch/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/gc_profile/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/gc_replace/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/invalid_arg/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/invalid_dep/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/invalid_package/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/invalid_package_multiple/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/invalid_section/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/invalid_section_dep/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/invalid_target/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/invalid_target_dep/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/multiple_deps/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/multiple_dev/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/no_arg/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/offline/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/optional_dep_feature/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/optional_feature/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/package/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/remove_basic/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/target/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/target_build/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/target_dev/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/update_lock_file/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/workspace/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log
 delete mode 100644 tests/testsuite/cargo_remove/workspace_preserved/stdout.log
 delete mode 100644 tests/testsuite/cargo_test/no_keep_going/stdout.log
 delete mode 100644 tests/testsuite/cargo_update/toolchain_pkgname/stdout.log

diff --git a/tests/testsuite/cargo_add/add_basic/mod.rs b/tests/testsuite/cargo_add/add_basic/mod.rs
index e7bf45e86..1e8c7dde2 100644
--- a/tests/testsuite/cargo_add/add_basic/mod.rs
+++ b/tests/testsuite/cargo_add/add_basic/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/add_basic/stdout.log b/tests/testsuite/cargo_add/add_basic/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/add_multiple/mod.rs b/tests/testsuite/cargo_add/add_multiple/mod.rs
index ffab903a6..cab3b4e4e 100644
--- a/tests/testsuite/cargo_add/add_multiple/mod.rs
+++ b/tests/testsuite/cargo_add/add_multiple/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/add_multiple/stdout.log b/tests/testsuite/cargo_add/add_multiple/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs
index c455e9d88..bf5c57922 100644
--- a/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs
+++ b/tests/testsuite/cargo_add/add_normalized_name_external/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -34,7 +35,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stdout.log b/tests/testsuite/cargo_add/add_normalized_name_external/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/add_toolchain/mod.rs b/tests/testsuite/cargo_add/add_toolchain/mod.rs
index 3be555f37..6b8aaf185 100644
--- a/tests/testsuite/cargo_add/add_toolchain/mod.rs
+++ b/tests/testsuite/cargo_add/add_toolchain/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/add_toolchain/stdout.log b/tests/testsuite/cargo_add/add_toolchain/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/build/mod.rs b/tests/testsuite/cargo_add/build/mod.rs
index 35ffd5674..2635db0d8 100644
--- a/tests/testsuite/cargo_add/build/mod.rs
+++ b/tests/testsuite/cargo_add/build/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/build/stdout.log b/tests/testsuite/cargo_add/build/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs
index 25462d5ec..7d8d4118a 100644
--- a/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs
+++ b/tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log b/tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/change_rename_target/mod.rs b/tests/testsuite/cargo_add/change_rename_target/mod.rs
index d6705379a..563b10997 100644
--- a/tests/testsuite/cargo_add/change_rename_target/mod.rs
+++ b/tests/testsuite/cargo_add/change_rename_target/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/change_rename_target/stdout.log b/tests/testsuite/cargo_add/change_rename_target/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/cyclic_features/mod.rs b/tests/testsuite/cargo_add/cyclic_features/mod.rs
index eeac50de5..d2d164274 100644
--- a/tests/testsuite/cargo_add/cyclic_features/mod.rs
+++ b/tests/testsuite/cargo_add/cyclic_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -23,7 +24,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/cyclic_features/stdout.log b/tests/testsuite/cargo_add/cyclic_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/default_features/mod.rs b/tests/testsuite/cargo_add/default_features/mod.rs
index 6994260ab..b05f081e3 100644
--- a/tests/testsuite/cargo_add/default_features/mod.rs
+++ b/tests/testsuite/cargo_add/default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/default_features/stdout.log b/tests/testsuite/cargo_add/default_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs
index 6baa89265..55f0434e9 100644
--- a/tests/testsuite/cargo_add/deprecated_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/deprecated_default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stdout.log b/tests/testsuite/cargo_add/deprecated_default_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/deprecated_section/mod.rs b/tests/testsuite/cargo_add/deprecated_section/mod.rs
index 6baa89265..55f0434e9 100644
--- a/tests/testsuite/cargo_add/deprecated_section/mod.rs
+++ b/tests/testsuite/cargo_add/deprecated_section/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/deprecated_section/stdout.log b/tests/testsuite/cargo_add/deprecated_section/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
index 60b454d32..cdaac6b9b 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
index 9cf13026c..d2df34c2d 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
index faac9b7fa..501d4dfe6 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs
index d920ddada..c474ffdc0 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/dev/mod.rs b/tests/testsuite/cargo_add/dev/mod.rs
index 7e1532a9b..bd395ef72 100644
--- a/tests/testsuite/cargo_add/dev/mod.rs
+++ b/tests/testsuite/cargo_add/dev/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/dev/stdout.log b/tests/testsuite/cargo_add/dev/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs
index f836e3015..bf672e61a 100644
--- a/tests/testsuite/cargo_add/dev_build_conflict/mod.rs
+++ b/tests/testsuite/cargo_add/dev_build_conflict/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/dev_build_conflict/stdout.log b/tests/testsuite/cargo_add/dev_build_conflict/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs
index e7a09805d..46ebd2cf5 100644
--- a/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs
+++ b/tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log b/tests/testsuite/cargo_add/dev_prefer_existing_version/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/dry_run/mod.rs b/tests/testsuite/cargo_add/dry_run/mod.rs
index 8afffdc2a..0100bc47a 100644
--- a/tests/testsuite/cargo_add/dry_run/mod.rs
+++ b/tests/testsuite/cargo_add/dry_run/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/dry_run/stdout.log b/tests/testsuite/cargo_add/dry_run/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/empty_dep_name/mod.rs b/tests/testsuite/cargo_add/empty_dep_name/mod.rs
index 0c7dd0daa..545ecd2da 100644
--- a/tests/testsuite/cargo_add/empty_dep_name/mod.rs
+++ b/tests/testsuite/cargo_add/empty_dep_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -17,7 +18,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/empty_dep_name/stdout.log b/tests/testsuite/cargo_add/empty_dep_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/empty_dep_table/mod.rs b/tests/testsuite/cargo_add/empty_dep_table/mod.rs
index f06d47cfb..10675dd2f 100644
--- a/tests/testsuite/cargo_add/empty_dep_table/mod.rs
+++ b/tests/testsuite/cargo_add/empty_dep_table/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/empty_dep_table/stdout.log b/tests/testsuite/cargo_add/empty_dep_table/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features/mod.rs b/tests/testsuite/cargo_add/features/mod.rs
index d3e485a56..79155d0fa 100644
--- a/tests/testsuite/cargo_add/features/mod.rs
+++ b/tests/testsuite/cargo_add/features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features/stdout.log b/tests/testsuite/cargo_add/features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs
index 689245de3..31ba1cdcb 100644
--- a/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs
+++ b/tests/testsuite/cargo_add/features_activated_over_limit/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 use itertools::Itertools;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stdout.log b/tests/testsuite/cargo_add/features_activated_over_limit/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs
index 287dce667..2cf3aab67 100644
--- a/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs
+++ b/tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 use itertools::Itertools;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.log b/tests/testsuite/cargo_add/features_deactivated_over_limit/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features_empty/mod.rs b/tests/testsuite/cargo_add/features_empty/mod.rs
index a18e1062b..7434bad89 100644
--- a/tests/testsuite/cargo_add/features_empty/mod.rs
+++ b/tests/testsuite/cargo_add/features_empty/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features_empty/stdout.log b/tests/testsuite/cargo_add/features_empty/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs
index 535944f2c..a5a66680e 100644
--- a/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs
+++ b/tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/stdout.log b/tests/testsuite/cargo_add/features_multiple_occurrences/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features_preserve/mod.rs b/tests/testsuite/cargo_add/features_preserve/mod.rs
index d06571d37..b9f3eb61b 100644
--- a/tests/testsuite/cargo_add/features_preserve/mod.rs
+++ b/tests/testsuite/cargo_add/features_preserve/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features_preserve/stdout.log b/tests/testsuite/cargo_add/features_preserve/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features_spaced_values/mod.rs b/tests/testsuite/cargo_add/features_spaced_values/mod.rs
index 7b31b535d..d1520a1b2 100644
--- a/tests/testsuite/cargo_add/features_spaced_values/mod.rs
+++ b/tests/testsuite/cargo_add/features_spaced_values/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features_spaced_values/stdout.log b/tests/testsuite/cargo_add/features_spaced_values/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features_unknown/mod.rs b/tests/testsuite/cargo_add/features_unknown/mod.rs
index 4f4dbc85a..d29f0514c 100644
--- a/tests/testsuite/cargo_add/features_unknown/mod.rs
+++ b/tests/testsuite/cargo_add/features_unknown/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features_unknown/stdout.log b/tests/testsuite/cargo_add/features_unknown/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs
index 25a62208e..c3b8ca118 100644
--- a/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs
+++ b/tests/testsuite/cargo_add/features_unknown_no_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/stdout.log b/tests/testsuite/cargo_add/features_unknown_no_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git/mod.rs b/tests/testsuite/cargo_add/git/mod.rs
index 8a4a6deeb..7460071a2 100644
--- a/tests/testsuite/cargo_add/git/mod.rs
+++ b/tests/testsuite/cargo_add/git/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -27,7 +28,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git/stdout.log b/tests/testsuite/cargo_add/git/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_branch/mod.rs b/tests/testsuite/cargo_add/git_branch/mod.rs
index 7eb022468..46f00a7d9 100644
--- a/tests/testsuite/cargo_add/git_branch/mod.rs
+++ b/tests/testsuite/cargo_add/git_branch/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_branch/stdout.log b/tests/testsuite/cargo_add/git_branch/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs
index fc71c56a6..515b66458 100644
--- a/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs
+++ b/tests/testsuite/cargo_add/git_conflicts_namever/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -33,7 +34,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/stdout.log b/tests/testsuite/cargo_add/git_conflicts_namever/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_dev/mod.rs b/tests/testsuite/cargo_add/git_dev/mod.rs
index 767101c47..2ad6a11e1 100644
--- a/tests/testsuite/cargo_add/git_dev/mod.rs
+++ b/tests/testsuite/cargo_add/git_dev/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -27,7 +28,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_dev/stdout.log b/tests/testsuite/cargo_add/git_dev/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_inferred_name/mod.rs b/tests/testsuite/cargo_add/git_inferred_name/mod.rs
index 430696537..ec2ae613c 100644
--- a/tests/testsuite/cargo_add/git_inferred_name/mod.rs
+++ b/tests/testsuite/cargo_add/git_inferred_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -27,7 +28,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_inferred_name/stdout.log b/tests/testsuite/cargo_add/git_inferred_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs
index 30254de72..5da681c07 100644
--- a/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs
+++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -67,7 +68,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.log b/tests/testsuite/cargo_add/git_inferred_name_multiple/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_multiple_names/mod.rs b/tests/testsuite/cargo_add/git_multiple_names/mod.rs
index 61f8cc987..2bf2668aa 100644
--- a/tests/testsuite/cargo_add/git_multiple_names/mod.rs
+++ b/tests/testsuite/cargo_add/git_multiple_names/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -45,7 +46,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_multiple_names/stdout.log b/tests/testsuite/cargo_add/git_multiple_names/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
index fe14f67b5..085c3b9e4 100644
--- a/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
+++ b/tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -56,7 +57,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stdout.log b/tests/testsuite/cargo_add/git_multiple_packages_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_normalized_name/mod.rs b/tests/testsuite/cargo_add/git_normalized_name/mod.rs
index f539f7986..bb4506536 100644
--- a/tests/testsuite/cargo_add/git_normalized_name/mod.rs
+++ b/tests/testsuite/cargo_add/git_normalized_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -27,7 +28,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure() // Fuzzy searching for paths isn't supported at this time
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_normalized_name/stdout.log b/tests/testsuite/cargo_add/git_normalized_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_registry/mod.rs b/tests/testsuite/cargo_add/git_registry/mod.rs
index 35c0d7b06..638927de2 100644
--- a/tests/testsuite/cargo_add/git_registry/mod.rs
+++ b/tests/testsuite/cargo_add/git_registry/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -46,7 +47,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_registry/stdout.log b/tests/testsuite/cargo_add/git_registry/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_rev/mod.rs b/tests/testsuite/cargo_add/git_rev/mod.rs
index ee3800239..5104a351d 100644
--- a/tests/testsuite/cargo_add/git_rev/mod.rs
+++ b/tests/testsuite/cargo_add/git_rev/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_rev/stdout.log b/tests/testsuite/cargo_add/git_rev/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/git_tag/mod.rs b/tests/testsuite/cargo_add/git_tag/mod.rs
index c3f504675..fcac9731e 100644
--- a/tests/testsuite/cargo_add/git_tag/mod.rs
+++ b/tests/testsuite/cargo_add/git_tag/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/git_tag/stdout.log b/tests/testsuite/cargo_add/git_tag/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/infer_prerelease/mod.rs b/tests/testsuite/cargo_add/infer_prerelease/mod.rs
index e36b8dd0b..b51be5125 100644
--- a/tests/testsuite/cargo_add/infer_prerelease/mod.rs
+++ b/tests/testsuite/cargo_add/infer_prerelease/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/infer_prerelease/stdout.log b/tests/testsuite/cargo_add/infer_prerelease/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_arg/mod.rs b/tests/testsuite/cargo_add/invalid_arg/mod.rs
index 45627df21..9aa5be327 100644
--- a/tests/testsuite/cargo_add/invalid_arg/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_arg/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_arg/stdout.log b/tests/testsuite/cargo_add/invalid_arg/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_git_name/mod.rs b/tests/testsuite/cargo_add/invalid_git_name/mod.rs
index e9b888d35..bf3dd1c29 100644
--- a/tests/testsuite/cargo_add/invalid_git_name/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_git_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -27,7 +28,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_git_name/stdout.log b/tests/testsuite/cargo_add/invalid_git_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
index 50acea2a6..d4a5f4bbf 100644
--- a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.log b/tests/testsuite/cargo_add/invalid_key_inherit_dependency/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
index 50acea2a6..d4a5f4bbf 100644
--- a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.log b/tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
index a56d7b5fc..2b34aeda2 100644
--- a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.log b/tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_manifest/mod.rs b/tests/testsuite/cargo_add/invalid_manifest/mod.rs
index 488f543d4..bbcbce397 100644
--- a/tests/testsuite/cargo_add/invalid_manifest/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_manifest/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_manifest/stdout.log b/tests/testsuite/cargo_add/invalid_manifest/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_name_external/mod.rs b/tests/testsuite/cargo_add/invalid_name_external/mod.rs
index 7fc0868f4..1213ce51e 100644
--- a/tests/testsuite/cargo_add/invalid_name_external/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_name_external/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_name_external/stdout.log b/tests/testsuite/cargo_add/invalid_name_external/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_path/mod.rs b/tests/testsuite/cargo_add/invalid_path/mod.rs
index 0b3a5ec8d..c22bbb4b8 100644
--- a/tests/testsuite/cargo_add/invalid_path/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_path/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_path/stdout.log b/tests/testsuite/cargo_add/invalid_path/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_path_name/mod.rs b/tests/testsuite/cargo_add/invalid_path_name/mod.rs
index 264a3f1ee..8b28bde7e 100644
--- a/tests/testsuite/cargo_add/invalid_path_name/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_path_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_path_name/stdout.log b/tests/testsuite/cargo_add/invalid_path_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_path_self/mod.rs b/tests/testsuite/cargo_add/invalid_path_self/mod.rs
index 627d46a6b..5f088a48e 100644
--- a/tests/testsuite/cargo_add/invalid_path_self/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_path_self/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_path_self/stdout.log b/tests/testsuite/cargo_add/invalid_path_self/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs
index 93448e865..35c1eb5d4 100644
--- a/tests/testsuite/cargo_add/invalid_target_empty/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_target_empty/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_target_empty/stdout.log b/tests/testsuite/cargo_add/invalid_target_empty/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/invalid_vers/mod.rs b/tests/testsuite/cargo_add/invalid_vers/mod.rs
index abaa1b29a..019dbbeed 100644
--- a/tests/testsuite/cargo_add/invalid_vers/mod.rs
+++ b/tests/testsuite/cargo_add/invalid_vers/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/invalid_vers/stdout.log b/tests/testsuite/cargo_add/invalid_vers/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/list_features/mod.rs b/tests/testsuite/cargo_add/list_features/mod.rs
index be5d0a05f..d882ec8be 100644
--- a/tests/testsuite/cargo_add/list_features/mod.rs
+++ b/tests/testsuite/cargo_add/list_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/list_features/stdout.log b/tests/testsuite/cargo_add/list_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/list_features_path/mod.rs b/tests/testsuite/cargo_add/list_features_path/mod.rs
index 780c8485b..722ef8bed 100644
--- a/tests/testsuite/cargo_add/list_features_path/mod.rs
+++ b/tests/testsuite/cargo_add/list_features_path/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -35,7 +36,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/list_features_path/stdout.log b/tests/testsuite/cargo_add/list_features_path/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs b/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs
index 2e179e5ad..a961259ab 100644
--- a/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs
+++ b/tests/testsuite/cargo_add/list_features_path_no_default/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -40,7 +41,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stdout.log b/tests/testsuite/cargo_add/list_features_path_no_default/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/locked_changed/mod.rs b/tests/testsuite/cargo_add/locked_changed/mod.rs
index 7111027a4..f4dce4ac6 100644
--- a/tests/testsuite/cargo_add/locked_changed/mod.rs
+++ b/tests/testsuite/cargo_add/locked_changed/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/locked_changed/stdout.log b/tests/testsuite/cargo_add/locked_changed/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/locked_unchanged/mod.rs b/tests/testsuite/cargo_add/locked_unchanged/mod.rs
index dd7682658..94a4dc3dc 100644
--- a/tests/testsuite/cargo_add/locked_unchanged/mod.rs
+++ b/tests/testsuite/cargo_add/locked_unchanged/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/locked_unchanged/stdout.log b/tests/testsuite/cargo_add/locked_unchanged/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/lockfile_updated/mod.rs b/tests/testsuite/cargo_add/lockfile_updated/mod.rs
index b911d451c..3036e4330 100644
--- a/tests/testsuite/cargo_add/lockfile_updated/mod.rs
+++ b/tests/testsuite/cargo_add/lockfile_updated/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/lockfile_updated/stdout.log b/tests/testsuite/cargo_add/lockfile_updated/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/manifest_path_package/mod.rs b/tests/testsuite/cargo_add/manifest_path_package/mod.rs
index ae015d49a..a8380e529 100644
--- a/tests/testsuite/cargo_add/manifest_path_package/mod.rs
+++ b/tests/testsuite/cargo_add/manifest_path_package/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -36,7 +37,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/manifest_path_package/stdout.log b/tests/testsuite/cargo_add/manifest_path_package/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/merge_activated_features/mod.rs b/tests/testsuite/cargo_add/merge_activated_features/mod.rs
index 45b6b359d..0e742a919 100644
--- a/tests/testsuite/cargo_add/merge_activated_features/mod.rs
+++ b/tests/testsuite/cargo_add/merge_activated_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/merge_activated_features/stdout.log b/tests/testsuite/cargo_add/merge_activated_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs
index f818b1c68..ba4a00d09 100644
--- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs
+++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -35,7 +36,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.log b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs
index ad68456df..b574b747a 100644
--- a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs
+++ b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.log b/tests/testsuite/cargo_add/multiple_conflicts_with_rename/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/namever/mod.rs b/tests/testsuite/cargo_add/namever/mod.rs
index 03c9ab4cc..bc86ac222 100644
--- a/tests/testsuite/cargo_add/namever/mod.rs
+++ b/tests/testsuite/cargo_add/namever/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/namever/stdout.log b/tests/testsuite/cargo_add/namever/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/no_args/mod.rs b/tests/testsuite/cargo_add/no_args/mod.rs
index 9a57b3c87..76960ab3c 100644
--- a/tests/testsuite/cargo_add/no_args/mod.rs
+++ b/tests/testsuite/cargo_add/no_args/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -17,7 +18,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/no_args/stdout.log b/tests/testsuite/cargo_add/no_args/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/no_default_features/mod.rs b/tests/testsuite/cargo_add/no_default_features/mod.rs
index 6824244e6..6e982a17b 100644
--- a/tests/testsuite/cargo_add/no_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/no_default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/no_default_features/stdout.log b/tests/testsuite/cargo_add/no_default_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/no_optional/mod.rs b/tests/testsuite/cargo_add/no_optional/mod.rs
index 042f1de9f..bc7a1bffe 100644
--- a/tests/testsuite/cargo_add/no_optional/mod.rs
+++ b/tests/testsuite/cargo_add/no_optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/no_optional/stdout.log b/tests/testsuite/cargo_add/no_optional/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/no_public/mod.rs b/tests/testsuite/cargo_add/no_public/mod.rs
index b435df9de..5c63934a7 100644
--- a/tests/testsuite/cargo_add/no_public/mod.rs
+++ b/tests/testsuite/cargo_add/no_public/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["public-dependency"])
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/no_public/stdout.log b/tests/testsuite/cargo_add/no_public/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs
index 5fd1e5697..9c50a7993 100644
--- a/tests/testsuite/cargo_add/offline_empty_cache/mod.rs
+++ b/tests/testsuite/cargo_add/offline_empty_cache/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/offline_empty_cache/stdout.log b/tests/testsuite/cargo_add/offline_empty_cache/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/optional/mod.rs b/tests/testsuite/cargo_add/optional/mod.rs
index 4a9ede95c..33c418080 100644
--- a/tests/testsuite/cargo_add/optional/mod.rs
+++ b/tests/testsuite/cargo_add/optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/optional/stdout.log b/tests/testsuite/cargo_add/optional/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs
index 6994260ab..b05f081e3 100644
--- a/tests/testsuite/cargo_add/overwrite_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_default_features/stdout.log b/tests/testsuite/cargo_add/overwrite_default_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs
index 6824244e6..6e982a17b 100644
--- a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.log b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_features/mod.rs b/tests/testsuite/cargo_add/overwrite_features/mod.rs
index 6e6a258de..7f9437b97 100644
--- a/tests/testsuite/cargo_add/overwrite_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_features/stdout.log b/tests/testsuite/cargo_add/overwrite_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs
index 169999686..a702d3d49 100644
--- a/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log b/tests/testsuite/cargo_add/overwrite_git_with_path/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
index 60b454d32..cdaac6b9b 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
index 60b454d32..cdaac6b9b 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_inherit_noop/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
index 60b454d32..cdaac6b9b 100644
--- a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_inherit_optional_noop/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs
index 6ee3a244a..fab499874 100644
--- a/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_inline_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -37,7 +38,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/stdout.log b/tests/testsuite/cargo_add/overwrite_inline_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs
index 934b249e8..783bace0f 100644
--- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -25,7 +26,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs
index 0de6b7d2f..611c5feee 100644
--- a/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_name_noop/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -25,7 +26,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_name_noop/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs
index 6824244e6..6e982a17b 100644
--- a/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/stdout.log b/tests/testsuite/cargo_add/overwrite_no_default_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs
index 6994260ab..b05f081e3 100644
--- a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.log b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs
index 042f1de9f..bc7a1bffe 100644
--- a/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_no_optional/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs
index 4a9ede95c..33c418080 100644
--- a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs
index b435df9de..5c63934a7 100644
--- a/tests/testsuite/cargo_add/overwrite_no_public/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_public/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["public-dependency"])
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_no_public/stdout.log b/tests/testsuite/cargo_add/overwrite_no_public/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs b/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs
index e95fceeeb..adeb43606 100644
--- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["public-dependency"])
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.log b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional/mod.rs
index 4a9ede95c..33c418080 100644
--- a/tests/testsuite/cargo_add/overwrite_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_optional/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs
index 820613c18..de5a72766 100644
--- a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -25,7 +26,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs
index 4f39b5613..4b99a500f 100644
--- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_optional_with_optional/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.log b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs
index 147fb02c6..4b0aadd69 100644
--- a/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_path_noop/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -25,7 +26,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_path_noop/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs
index 769d59774..dcaa0a750 100644
--- a/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_path_with_version/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stdout.log b/tests/testsuite/cargo_add/overwrite_path_with_version/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs
index 6e6a258de..7f9437b97 100644
--- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.log b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public/mod.rs
index e95fceeeb..adeb43606 100644
--- a/tests/testsuite/cargo_add/overwrite_public/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_public/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["public-dependency"])
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_public/stdout.log b/tests/testsuite/cargo_add/overwrite_public/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs
index b435df9de..5c63934a7 100644
--- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_public_with_no_public/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["public-dependency"])
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.log b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs
index e643e817a..e508c34db 100644
--- a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.log b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs
index 09edae3aa..40a55ca09 100644
--- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs
index 35f27d38d..42db5cbcc 100644
--- a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.log b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs
index 91a4d3917..6203d7dc3 100644
--- a/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_version_with_git/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -38,7 +39,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stdout.log b/tests/testsuite/cargo_add/overwrite_version_with_git/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs
index 169999686..a702d3d49 100644
--- a/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_version_with_path/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stdout.log b/tests/testsuite/cargo_add/overwrite_version_with_path/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs
index 0c00a2d2b..7634d1a00 100644
--- a/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_with_rename/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/stdout.log b/tests/testsuite/cargo_add/overwrite_with_rename/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
index 9be71d5ea..085d0c399 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log b/tests/testsuite/cargo_add/overwrite_workspace_dep/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
index 9be71d5ea..085d0c399 100644
--- a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
+++ b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.log b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/path/mod.rs b/tests/testsuite/cargo_add/path/mod.rs
index 169999686..a702d3d49 100644
--- a/tests/testsuite/cargo_add/path/mod.rs
+++ b/tests/testsuite/cargo_add/path/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/path/stdout.log b/tests/testsuite/cargo_add/path/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/path_dev/mod.rs b/tests/testsuite/cargo_add/path_dev/mod.rs
index 29c71d0fd..dce163829 100644
--- a/tests/testsuite/cargo_add/path_dev/mod.rs
+++ b/tests/testsuite/cargo_add/path_dev/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/path_dev/stdout.log b/tests/testsuite/cargo_add/path_dev/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/path_inferred_name/mod.rs b/tests/testsuite/cargo_add/path_inferred_name/mod.rs
index 169999686..a702d3d49 100644
--- a/tests/testsuite/cargo_add/path_inferred_name/mod.rs
+++ b/tests/testsuite/cargo_add/path_inferred_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/path_inferred_name/stdout.log b/tests/testsuite/cargo_add/path_inferred_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs
index 1313677a3..4cd09be05 100644
--- a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs
+++ b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.log b/tests/testsuite/cargo_add/path_inferred_name_conflicts_full_feature/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/path_normalized_name/mod.rs b/tests/testsuite/cargo_add/path_normalized_name/mod.rs
index 22273d0fd..87f44c66e 100644
--- a/tests/testsuite/cargo_add/path_normalized_name/mod.rs
+++ b/tests/testsuite/cargo_add/path_normalized_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .failure() // Fuzzy searching for paths isn't supported at this time
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/path_normalized_name/stdout.log b/tests/testsuite/cargo_add/path_normalized_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs
index d71529685..ab9466259 100644
--- a/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_dep_std_table/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log b/tests/testsuite/cargo_add/preserve_dep_std_table/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/preserve_features_table/mod.rs b/tests/testsuite/cargo_add/preserve_features_table/mod.rs
index d71529685..ab9466259 100644
--- a/tests/testsuite/cargo_add/preserve_features_table/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_features_table/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/preserve_features_table/stdout.log b/tests/testsuite/cargo_add/preserve_features_table/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/preserve_sorted/mod.rs b/tests/testsuite/cargo_add/preserve_sorted/mod.rs
index 57cd63a32..1a951d697 100644
--- a/tests/testsuite/cargo_add/preserve_sorted/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_sorted/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/preserve_sorted/stdout.log b/tests/testsuite/cargo_add/preserve_sorted/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs
index 57cd63a32..1a951d697 100644
--- a/tests/testsuite/cargo_add/preserve_unsorted/mod.rs
+++ b/tests/testsuite/cargo_add/preserve_unsorted/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/preserve_unsorted/stdout.log b/tests/testsuite/cargo_add/preserve_unsorted/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/public/mod.rs b/tests/testsuite/cargo_add/public/mod.rs
index e95fceeeb..adeb43606 100644
--- a/tests/testsuite/cargo_add/public/mod.rs
+++ b/tests/testsuite/cargo_add/public/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -19,7 +20,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["public-dependency"])
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/public/stdout.log b/tests/testsuite/cargo_add/public/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/quiet/mod.rs b/tests/testsuite/cargo_add/quiet/mod.rs
index 7c8f9fd3f..6d0a8d49c 100644
--- a/tests/testsuite/cargo_add/quiet/mod.rs
+++ b/tests/testsuite/cargo_add/quiet/mod.rs
@@ -1,6 +1,5 @@
 use cargo_test_support::compare::assert_ui;
 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::Project;
@@ -25,7 +24,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(str![""]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/quiet/stdout.log b/tests/testsuite/cargo_add/quiet/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/registry/mod.rs b/tests/testsuite/cargo_add/registry/mod.rs
index c7693f13e..85a342b36 100644
--- a/tests/testsuite/cargo_add/registry/mod.rs
+++ b/tests/testsuite/cargo_add/registry/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -33,7 +34,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/registry/stdout.log b/tests/testsuite/cargo_add/registry/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/rename/mod.rs b/tests/testsuite/cargo_add/rename/mod.rs
index 754c078d0..77dd2bb5b 100644
--- a/tests/testsuite/cargo_add/rename/mod.rs
+++ b/tests/testsuite/cargo_add/rename/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/rename/stdout.log b/tests/testsuite/cargo_add/rename/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/require_weak/mod.rs b/tests/testsuite/cargo_add/require_weak/mod.rs
index d71529685..ab9466259 100644
--- a/tests/testsuite/cargo_add/require_weak/mod.rs
+++ b/tests/testsuite/cargo_add/require_weak/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -24,7 +25,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/require_weak/stdout.log b/tests/testsuite/cargo_add/require_weak/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs
index 198aecb76..1aa4a7016 100644
--- a/tests/testsuite/cargo_add/rust_version_ignore/mod.rs
+++ b/tests/testsuite/cargo_add/rust_version_ignore/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -27,7 +28,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .assert()
         .code(0)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/rust_version_ignore/stdout.log b/tests/testsuite/cargo_add/rust_version_ignore/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs
index 5aa25e36d..0b31c8875 100644
--- a/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs
+++ b/tests/testsuite/cargo_add/rust_version_incompatible/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/rust_version_incompatible/stdout.log b/tests/testsuite/cargo_add/rust_version_incompatible/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/rust_version_latest/mod.rs b/tests/testsuite/cargo_add/rust_version_latest/mod.rs
index 35247741c..77988d592 100644
--- a/tests/testsuite/cargo_add/rust_version_latest/mod.rs
+++ b/tests/testsuite/cargo_add/rust_version_latest/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -26,7 +27,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/rust_version_latest/stdout.log b/tests/testsuite/cargo_add/rust_version_latest/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/rust_version_older/mod.rs b/tests/testsuite/cargo_add/rust_version_older/mod.rs
index 35247741c..77988d592 100644
--- a/tests/testsuite/cargo_add/rust_version_older/mod.rs
+++ b/tests/testsuite/cargo_add/rust_version_older/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -26,7 +27,7 @@ fn case() {
         .masquerade_as_nightly_cargo(&["msrv-policy"])
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/rust_version_older/stdout.log b/tests/testsuite/cargo_add/rust_version_older/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs
index efa82f81e..465c51150 100644
--- a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs
+++ b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -36,7 +37,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.log b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/target/mod.rs b/tests/testsuite/cargo_add/target/mod.rs
index 23f0edfdc..fe0a19937 100644
--- a/tests/testsuite/cargo_add/target/mod.rs
+++ b/tests/testsuite/cargo_add/target/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/target/stdout.log b/tests/testsuite/cargo_add/target/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/target_cfg/mod.rs b/tests/testsuite/cargo_add/target_cfg/mod.rs
index 9846f5837..493282288 100644
--- a/tests/testsuite/cargo_add/target_cfg/mod.rs
+++ b/tests/testsuite/cargo_add/target_cfg/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/target_cfg/stdout.log b/tests/testsuite/cargo_add/target_cfg/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
index d0d2213ea..50bae8178 100644
--- a/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
+++ b/tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log b/tests/testsuite/cargo_add/unknown_inherited_feature/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/vers/mod.rs b/tests/testsuite/cargo_add/vers/mod.rs
index 1f097d1b5..58907a95f 100644
--- a/tests/testsuite/cargo_add/vers/mod.rs
+++ b/tests/testsuite/cargo_add/vers/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/vers/stdout.log b/tests/testsuite/cargo_add/vers/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/workspace_name/mod.rs b/tests/testsuite/cargo_add/workspace_name/mod.rs
index 1e49edb57..ab541851e 100644
--- a/tests/testsuite/cargo_add/workspace_name/mod.rs
+++ b/tests/testsuite/cargo_add/workspace_name/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/workspace_name/stdout.log b/tests/testsuite/cargo_add/workspace_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/workspace_path/mod.rs b/tests/testsuite/cargo_add/workspace_path/mod.rs
index 169999686..a702d3d49 100644
--- a/tests/testsuite/cargo_add/workspace_path/mod.rs
+++ b/tests/testsuite/cargo_add/workspace_path/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/workspace_path/stdout.log b/tests/testsuite/cargo_add/workspace_path/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs
index 29c71d0fd..dce163829 100644
--- a/tests/testsuite/cargo_add/workspace_path_dev/mod.rs
+++ b/tests/testsuite/cargo_add/workspace_path_dev/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_add/workspace_path_dev/stdout.log b/tests/testsuite/cargo_add/workspace_path_dev/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_bench/no_keep_going/mod.rs b/tests/testsuite/cargo_bench/no_keep_going/mod.rs
index f996444d6..8d32b17eb 100644
--- a/tests/testsuite/cargo_bench/no_keep_going/mod.rs
+++ b/tests/testsuite/cargo_bench/no_keep_going/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -15,6 +16,6 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 }
diff --git a/tests/testsuite/cargo_bench/no_keep_going/stdout.log b/tests/testsuite/cargo_bench/no_keep_going/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/auto_git/mod.rs b/tests/testsuite/cargo_init/auto_git/mod.rs
index 992fe1d12..f28845903 100644
--- a/tests/testsuite/cargo_init/auto_git/mod.rs
+++ b/tests/testsuite/cargo_init/auto_git/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_init/auto_git/stdout.log b/tests/testsuite/cargo_init/auto_git/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs
index 470f4b2de..44f2963e4 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_explicit/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_explicit/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs
index 43f5a4194..6adab0b86 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_explicit_nosrc/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs
index bcbb78be1..c22fbb1de 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_implicit/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs
index 8c6ae8acb..31c5af6b0 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namenosrc/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs
index d07cd385c..355a37d1e 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_namesrc/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs
index 8c6ae8acb..31c5af6b0 100644
--- a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs
+++ b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log b/tests/testsuite/cargo_init/bin_already_exists_implicit_nosrc/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs
index 2be403177..8860745be 100644
--- a/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs
+++ b/tests/testsuite/cargo_init/both_lib_and_bin/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::file;
 use cargo_test_support::paths;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -11,7 +12,7 @@ fn case() {
         .current_dir(&cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert!(!cwd.join("Cargo.toml").is_file());
diff --git a/tests/testsuite/cargo_init/both_lib_and_bin/stdout.log b/tests/testsuite/cargo_init/both_lib_and_bin/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs
index cc398155c..882f09148 100644
--- a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs
+++ b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/mod.rs
@@ -1,6 +1,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::Project;
 
 #[cargo_test]
@@ -13,6 +14,6 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 }
diff --git a/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log b/tests/testsuite/cargo_init/cant_create_library_when_both_binlib_present/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs
index 62fd751d6..671f755be 100644
--- a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs
+++ b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log b/tests/testsuite/cargo_init/confused_by_multiple_lib_files/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs
index 470f4b2de..44f2963e4 100644
--- a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs
+++ b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log b/tests/testsuite/cargo_init/creates_binary_when_both_binlib_present/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs
index 470f4b2de..44f2963e4 100644
--- a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs
+++ b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.log b/tests/testsuite/cargo_init/creates_binary_when_instructed_and_has_lib_file/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs
index cd1d2046d..942de0148 100644
--- a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs
+++ b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.log b/tests/testsuite/cargo_init/creates_library_when_instructed_and_has_bin_file/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs
index 7c1efb243..8f9a618d7 100644
--- a/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs
+++ b/tests/testsuite/cargo_init/explicit_bin_with_git/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log b/tests/testsuite/cargo_init/explicit_bin_with_git/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/formats_source/mod.rs b/tests/testsuite/cargo_init/formats_source/mod.rs
index 5d2c72b15..32f3ecf3e 100644
--- a/tests/testsuite/cargo_init/formats_source/mod.rs
+++ b/tests/testsuite/cargo_init/formats_source/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::{process, Project};
 
 #[cargo_test]
@@ -22,7 +23,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/formats_source/stdout.log b/tests/testsuite/cargo_init/formats_source/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs
index 0a5ba570e..b198fac53 100644
--- a/tests/testsuite/cargo_init/fossil_autodetect/mod.rs
+++ b/tests/testsuite/cargo_init/fossil_autodetect/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/fossil_autodetect/stdout.log b/tests/testsuite/cargo_init/fossil_autodetect/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/git_autodetect/mod.rs b/tests/testsuite/cargo_init/git_autodetect/mod.rs
index ae6963aba..b572aa4c1 100644
--- a/tests/testsuite/cargo_init/git_autodetect/mod.rs
+++ b/tests/testsuite/cargo_init/git_autodetect/mod.rs
@@ -3,6 +3,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::paths;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use std::fs;
 
 #[cargo_test]
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/git_autodetect/stdout.log b/tests/testsuite/cargo_init/git_autodetect/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs
index 3522534ca..f71fb0448 100644
--- a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs
+++ b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log b/tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs b/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs
index b2b927a4e..5ca689fce 100644
--- a/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs
+++ b/tests/testsuite/cargo_init/ignores_failure_to_format_source/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -15,7 +16,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log b/tests/testsuite/cargo_init/ignores_failure_to_format_source/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs
index 619045a0c..59b6eb5e3 100644
--- a/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs
+++ b/tests/testsuite/cargo_init/inferred_bin_with_git/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log b/tests/testsuite/cargo_init/inferred_bin_with_git/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs
index 619045a0c..59b6eb5e3 100644
--- a/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs
+++ b/tests/testsuite/cargo_init/inferred_lib_with_git/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log b/tests/testsuite/cargo_init/inferred_lib_with_git/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 3132705f3..ce783bbd2 100644
--- a/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs
+++ b/tests/testsuite/cargo_init/inherit_workspace_package_table/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log b/tests/testsuite/cargo_init/inherit_workspace_package_table/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs
index 52f96cf35..fe0811134 100644
--- a/tests/testsuite/cargo_init/invalid_dir_name/mod.rs
+++ b/tests/testsuite/cargo_init/invalid_dir_name/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::file;
 use cargo_test_support::paths;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use std::fs;
 
 #[cargo_test]
@@ -13,7 +14,7 @@ fn case() {
         .current_dir(foo)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert!(!foo.join("Cargo.toml").is_file());
diff --git a/tests/testsuite/cargo_init/invalid_dir_name/stdout.log b/tests/testsuite/cargo_init/invalid_dir_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs
index d07cd385c..355a37d1e 100644
--- a/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs
+++ b/tests/testsuite/cargo_init/lib_already_exists_nosrc/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log b/tests/testsuite/cargo_init/lib_already_exists_nosrc/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs
index d07cd385c..355a37d1e 100644
--- a/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs
+++ b/tests/testsuite/cargo_init/lib_already_exists_src/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/lib_already_exists_src/stdout.log b/tests/testsuite/cargo_init/lib_already_exists_src/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs
index 0a5ba570e..b198fac53 100644
--- a/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs
+++ b/tests/testsuite/cargo_init/mercurial_autodetect/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/mercurial_autodetect/stdout.log b/tests/testsuite/cargo_init/mercurial_autodetect/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs
index 5f2693e3f..cc023a6f2 100644
--- a/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs
+++ b/tests/testsuite/cargo_init/multibin_project_name_clash/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log b/tests/testsuite/cargo_init/multibin_project_name_clash/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/no_filename/mod.rs b/tests/testsuite/cargo_init/no_filename/mod.rs
index aca139169..650d83580 100644
--- a/tests/testsuite/cargo_init/no_filename/mod.rs
+++ b/tests/testsuite/cargo_init/no_filename/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::file;
 use cargo_test_support::paths;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cfg(not(windows))]
 #[cargo_test]
@@ -10,6 +11,6 @@ fn case() {
         .current_dir(paths::root())
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 }
diff --git a/tests/testsuite/cargo_init/no_filename/stdout.log b/tests/testsuite/cargo_init/no_filename/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/path_contains_separator/mod.rs b/tests/testsuite/cargo_init/path_contains_separator/mod.rs
index 7ec3707d5..784c751db 100644
--- a/tests/testsuite/cargo_init/path_contains_separator/mod.rs
+++ b/tests/testsuite/cargo_init/path_contains_separator/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::{t, Project};
 
 #[cargo_test]
@@ -18,7 +19,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/path_contains_separator/stdout.log b/tests/testsuite/cargo_init/path_contains_separator/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs
index 0a5ba570e..b198fac53 100644
--- a/tests/testsuite/cargo_init/pijul_autodetect/mod.rs
+++ b/tests/testsuite/cargo_init/pijul_autodetect/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/pijul_autodetect/stdout.log b/tests/testsuite/cargo_init/pijul_autodetect/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/reserved_name/mod.rs b/tests/testsuite/cargo_init/reserved_name/mod.rs
index 2c9c54091..ff77b12d8 100644
--- a/tests/testsuite/cargo_init/reserved_name/mod.rs
+++ b/tests/testsuite/cargo_init/reserved_name/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::file;
 use cargo_test_support::paths;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 use std::fs;
 
 #[cargo_test]
@@ -13,7 +14,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert!(!project_root.join("Cargo.toml").is_file());
diff --git a/tests/testsuite/cargo_init/reserved_name/stdout.log b/tests/testsuite/cargo_init/reserved_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/simple_bin/mod.rs b/tests/testsuite/cargo_init/simple_bin/mod.rs
index b9aabc8b5..a2c8360ce 100644
--- a/tests/testsuite/cargo_init/simple_bin/mod.rs
+++ b/tests/testsuite/cargo_init/simple_bin/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/simple_bin/stdout.log b/tests/testsuite/cargo_init/simple_bin/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/simple_git/mod.rs b/tests/testsuite/cargo_init/simple_git/mod.rs
index 177f640e8..115f4d459 100644
--- a/tests/testsuite/cargo_init/simple_git/mod.rs
+++ b/tests/testsuite/cargo_init/simple_git/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/simple_git/stdout.log b/tests/testsuite/cargo_init/simple_git/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs
index 93320c284..b8b477752 100644
--- a/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs
+++ b/tests/testsuite/cargo_init/simple_git_ignore_exists/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log b/tests/testsuite/cargo_init/simple_git_ignore_exists/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/simple_hg/mod.rs b/tests/testsuite/cargo_init/simple_hg/mod.rs
index 1d272737e..0a56e3037 100644
--- a/tests/testsuite/cargo_init/simple_hg/mod.rs
+++ b/tests/testsuite/cargo_init/simple_hg/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test(requires_hg)]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/simple_hg/stdout.log b/tests/testsuite/cargo_init/simple_hg/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs
index 0a5ba570e..b198fac53 100644
--- a/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs
+++ b/tests/testsuite/cargo_init/simple_hg_ignore_exists/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log b/tests/testsuite/cargo_init/simple_hg_ignore_exists/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/simple_lib/mod.rs b/tests/testsuite/cargo_init/simple_lib/mod.rs
index 2f46c9356..03d367eec 100644
--- a/tests/testsuite/cargo_init/simple_lib/mod.rs
+++ b/tests/testsuite/cargo_init/simple_lib/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/simple_lib/stdout.log b/tests/testsuite/cargo_init/simple_lib/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/unknown_flags/mod.rs b/tests/testsuite/cargo_init/unknown_flags/mod.rs
index 4b61f9235..c283bf252 100644
--- a/tests/testsuite/cargo_init/unknown_flags/mod.rs
+++ b/tests/testsuite/cargo_init/unknown_flags/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::file;
 use cargo_test_support::paths;
 use cargo_test_support::prelude::*;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn case() {
@@ -9,6 +10,6 @@ fn case() {
         .current_dir(paths::root())
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 }
diff --git a/tests/testsuite/cargo_init/unknown_flags/stdout.log b/tests/testsuite/cargo_init/unknown_flags/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/with_argument/mod.rs b/tests/testsuite/cargo_init/with_argument/mod.rs
index 54db7d293..fe24473f8 100644
--- a/tests/testsuite/cargo_init/with_argument/mod.rs
+++ b/tests/testsuite/cargo_init/with_argument/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), project_root);
diff --git a/tests/testsuite/cargo_init/with_argument/stdout.log b/tests/testsuite/cargo_init/with_argument/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_init/workspace_add_member/mod.rs b/tests/testsuite/cargo_init/workspace_add_member/mod.rs
index 6dc2885a2..23929f943 100644
--- a/tests/testsuite/cargo_init/workspace_add_member/mod.rs
+++ b/tests/testsuite/cargo_init/workspace_add_member/mod.rs
@@ -2,6 +2,7 @@ use cargo_test_support::compare::assert_ui;
 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::Project;
 
 #[cargo_test]
@@ -14,7 +15,7 @@ fn case() {
         .current_dir(project_root.join("crates").join("foo"))
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_init/workspace_add_member/stdout.log b/tests/testsuite/cargo_init/workspace_add_member/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 23ae2e31a..10f826491 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.log b/tests/testsuite/cargo_new/add_members_to_non_workspace/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 4655b5f36..07be1fac7 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 4655b5f36..07be1fac7 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 c1d7ac485..bdbb2c894 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -17,7 +18,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 4655b5f36..07be1fac7 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 4655b5f36..07be1fac7 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 4655b5f36..07be1fac7 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 23ae2e31a..10f826491 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.log b/tests/testsuite/cargo_new/add_members_to_workspace_without_members/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_new/empty_name/mod.rs b/tests/testsuite/cargo_new/empty_name/mod.rs
index 73f4296e0..7a3f31646 100644
--- a/tests/testsuite/cargo_new/empty_name/mod.rs
+++ b/tests/testsuite/cargo_new/empty_name/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .failure()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/empty_name/stdout.log b/tests/testsuite/cargo_new/empty_name/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs
index 4655b5f36..07be1fac7 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_lints/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_lints/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 4655b5f36..07be1fac7 100644
--- a/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs
+++ b/tests/testsuite/cargo_new/inherit_workspace_package_table/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_package_table/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 b5ac01fa7..b9f348f4d 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 85fbb21e7..196b14942 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 4655b5f36..07be1fac7 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.log b/tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 94508c7e6..595425c7e 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
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -16,7 +17,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.log b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs
index 929332dd3..52dd9dadf 100644
--- a/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs
+++ b/tests/testsuite/cargo_remove/avoid_empty_tables/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log b/tests/testsuite/cargo_remove/avoid_empty_tables/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/build/mod.rs b/tests/testsuite/cargo_remove/build/mod.rs
index fdde6f0d4..036c96c26 100644
--- a/tests/testsuite/cargo_remove/build/mod.rs
+++ b/tests/testsuite/cargo_remove/build/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/build/stdout.log b/tests/testsuite/cargo_remove/build/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/dev/mod.rs b/tests/testsuite/cargo_remove/dev/mod.rs
index bb3ff4e84..6d6030147 100644
--- a/tests/testsuite/cargo_remove/dev/mod.rs
+++ b/tests/testsuite/cargo_remove/dev/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/dev/stdout.log b/tests/testsuite/cargo_remove/dev/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/dry_run/mod.rs b/tests/testsuite/cargo_remove/dry_run/mod.rs
index 7b1ce0c3e..ea6b962bd 100644
--- a/tests/testsuite/cargo_remove/dry_run/mod.rs
+++ b/tests/testsuite/cargo_remove/dry_run/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/dry_run/stdout.log b/tests/testsuite/cargo_remove/dry_run/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 007f314a1..e1f62987a 100644
--- a/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_keep_used_patch/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -21,7 +22,7 @@ fn case() {
         .args(["--package", "serde", "serde_derive"])
         .assert()
         .code(0)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log b/tests/testsuite/cargo_remove/gc_keep_used_patch/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/gc_patch/mod.rs b/tests/testsuite/cargo_remove/gc_patch/mod.rs
index 4d68c216c..14c9b42e8 100644
--- a/tests/testsuite/cargo_remove/gc_patch/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_patch/mod.rs
@@ -4,6 +4,7 @@ use cargo_test_support::current_dir;
 use cargo_test_support::file;
 use cargo_test_support::git;
 use cargo_test_support::project;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 
 #[cargo_test]
@@ -71,7 +72,7 @@ fn case() {
         .current_dir(&in_project.root())
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &in_project.root());
diff --git a/tests/testsuite/cargo_remove/gc_patch/stdout.log b/tests/testsuite/cargo_remove/gc_patch/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/gc_profile/mod.rs b/tests/testsuite/cargo_remove/gc_profile/mod.rs
index c1c52b1c6..3df85c132 100644
--- a/tests/testsuite/cargo_remove/gc_profile/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_profile/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/gc_profile/stdout.log b/tests/testsuite/cargo_remove/gc_profile/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/gc_replace/mod.rs b/tests/testsuite/cargo_remove/gc_replace/mod.rs
index 2f44c7427..abc571561 100644
--- a/tests/testsuite/cargo_remove/gc_replace/mod.rs
+++ b/tests/testsuite/cargo_remove/gc_replace/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -30,7 +31,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/gc_replace/stdout.log b/tests/testsuite/cargo_remove/gc_replace/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/invalid_arg/mod.rs b/tests/testsuite/cargo_remove/invalid_arg/mod.rs
index 2f4427517..9a78cba93 100644
--- a/tests/testsuite/cargo_remove/invalid_arg/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_arg/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/invalid_arg/stdout.log b/tests/testsuite/cargo_remove/invalid_arg/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/invalid_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_dep/mod.rs
index 93466218c..479ca91e2 100644
--- a/tests/testsuite/cargo_remove/invalid_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_dep/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/invalid_dep/stdout.log b/tests/testsuite/cargo_remove/invalid_dep/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/invalid_package/mod.rs b/tests/testsuite/cargo_remove/invalid_package/mod.rs
index 9376500ef..f7332a4f0 100644
--- a/tests/testsuite/cargo_remove/invalid_package/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_package/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/invalid_package/stdout.log b/tests/testsuite/cargo_remove/invalid_package/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs
index 4f8cd3670..9f03a085b 100644
--- a/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_package_multiple/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/invalid_package_multiple/stdout.log b/tests/testsuite/cargo_remove/invalid_package_multiple/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/invalid_section/mod.rs b/tests/testsuite/cargo_remove/invalid_section/mod.rs
index 91bf47b7d..eb3c28942 100644
--- a/tests/testsuite/cargo_remove/invalid_section/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_section/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/invalid_section/stdout.log b/tests/testsuite/cargo_remove/invalid_section/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs
index f7537a4ff..69f6151fb 100644
--- a/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_section_dep/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/invalid_section_dep/stdout.log b/tests/testsuite/cargo_remove/invalid_section_dep/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/invalid_target/mod.rs b/tests/testsuite/cargo_remove/invalid_target/mod.rs
index 7f1b1c113..2d5742e38 100644
--- a/tests/testsuite/cargo_remove/invalid_target/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_target/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/invalid_target/stdout.log b/tests/testsuite/cargo_remove/invalid_target/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs
index bd0458329..f70225470 100644
--- a/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs
+++ b/tests/testsuite/cargo_remove/invalid_target_dep/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/invalid_target_dep/stdout.log b/tests/testsuite/cargo_remove/invalid_target_dep/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/multiple_deps/mod.rs b/tests/testsuite/cargo_remove/multiple_deps/mod.rs
index a897114df..60ec40559 100644
--- a/tests/testsuite/cargo_remove/multiple_deps/mod.rs
+++ b/tests/testsuite/cargo_remove/multiple_deps/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/multiple_deps/stdout.log b/tests/testsuite/cargo_remove/multiple_deps/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/multiple_dev/mod.rs b/tests/testsuite/cargo_remove/multiple_dev/mod.rs
index 17d658ba9..4f7fe93c6 100644
--- a/tests/testsuite/cargo_remove/multiple_dev/mod.rs
+++ b/tests/testsuite/cargo_remove/multiple_dev/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/multiple_dev/stdout.log b/tests/testsuite/cargo_remove/multiple_dev/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/no_arg/mod.rs b/tests/testsuite/cargo_remove/no_arg/mod.rs
index 794fa69c2..f0a3b82c8 100644
--- a/tests/testsuite/cargo_remove/no_arg/mod.rs
+++ b/tests/testsuite/cargo_remove/no_arg/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -28,7 +29,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/no_arg/stdout.log b/tests/testsuite/cargo_remove/no_arg/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/offline/mod.rs b/tests/testsuite/cargo_remove/offline/mod.rs
index a09fa1978..62b57ae70 100644
--- a/tests/testsuite/cargo_remove/offline/mod.rs
+++ b/tests/testsuite/cargo_remove/offline/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -36,7 +37,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/offline/stdout.log b/tests/testsuite/cargo_remove/offline/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs
index 89999c973..e7b774ea1 100644
--- a/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_dep_feature/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/optional_dep_feature/stdout.log b/tests/testsuite/cargo_remove/optional_dep_feature/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 ed024fbbe..41a419a20 100644
--- a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.log b/tests/testsuite/cargo_remove/optional_dep_feature_formatting/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/optional_feature/mod.rs b/tests/testsuite/cargo_remove/optional_feature/mod.rs
index 45f1d7c61..e1cf95e7c 100644
--- a/tests/testsuite/cargo_remove/optional_feature/mod.rs
+++ b/tests/testsuite/cargo_remove/optional_feature/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/optional_feature/stdout.log b/tests/testsuite/cargo_remove/optional_feature/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/package/mod.rs b/tests/testsuite/cargo_remove/package/mod.rs
index 670453231..bb2056cf6 100644
--- a/tests/testsuite/cargo_remove/package/mod.rs
+++ b/tests/testsuite/cargo_remove/package/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/package/stdout.log b/tests/testsuite/cargo_remove/package/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/remove_basic/mod.rs b/tests/testsuite/cargo_remove/remove_basic/mod.rs
index 886f24204..f078b0930 100644
--- a/tests/testsuite/cargo_remove/remove_basic/mod.rs
+++ b/tests/testsuite/cargo_remove/remove_basic/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/remove_basic/stdout.log b/tests/testsuite/cargo_remove/remove_basic/stdout.log
deleted file mode 100644
index e69de29bb..000000000
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 f8ea82a9f..5fc17fad6 100644
--- a/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs
+++ b/tests/testsuite/cargo_remove/skip_gc_glob_profile/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -19,7 +20,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log b/tests/testsuite/cargo_remove/skip_gc_glob_profile/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/target/mod.rs b/tests/testsuite/cargo_remove/target/mod.rs
index b9c966a1f..310540c30 100644
--- a/tests/testsuite/cargo_remove/target/mod.rs
+++ b/tests/testsuite/cargo_remove/target/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/target/stdout.log b/tests/testsuite/cargo_remove/target/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/target_build/mod.rs b/tests/testsuite/cargo_remove/target_build/mod.rs
index 54beb798b..c7c602238 100644
--- a/tests/testsuite/cargo_remove/target_build/mod.rs
+++ b/tests/testsuite/cargo_remove/target_build/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/target_build/stdout.log b/tests/testsuite/cargo_remove/target_build/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/target_dev/mod.rs b/tests/testsuite/cargo_remove/target_dev/mod.rs
index 12a3a1028..29d960761 100644
--- a/tests/testsuite/cargo_remove/target_dev/mod.rs
+++ b/tests/testsuite/cargo_remove/target_dev/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -31,7 +32,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/target_dev/stdout.log b/tests/testsuite/cargo_remove/target_dev/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/update_lock_file/mod.rs b/tests/testsuite/cargo_remove/update_lock_file/mod.rs
index a589aa975..70200287e 100644
--- a/tests/testsuite/cargo_remove/update_lock_file/mod.rs
+++ b/tests/testsuite/cargo_remove/update_lock_file/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/update_lock_file/stdout.log b/tests/testsuite/cargo_remove/update_lock_file/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/workspace/mod.rs b/tests/testsuite/cargo_remove/workspace/mod.rs
index cdc707e80..79ea17b84 100644
--- a/tests/testsuite/cargo_remove/workspace/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/workspace/stdout.log b/tests/testsuite/cargo_remove/workspace/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
index cdc707e80..79ea17b84 100644
--- a/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log b/tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs
index cdc707e80..79ea17b84 100644
--- a/tests/testsuite/cargo_remove/workspace_preserved/mod.rs
+++ b/tests/testsuite/cargo_remove/workspace_preserved/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -29,7 +30,7 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
diff --git a/tests/testsuite/cargo_remove/workspace_preserved/stdout.log b/tests/testsuite/cargo_remove/workspace_preserved/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_test/no_keep_going/mod.rs b/tests/testsuite/cargo_test/no_keep_going/mod.rs
index 17c65fa3d..c8247863e 100644
--- a/tests/testsuite/cargo_test/no_keep_going/mod.rs
+++ b/tests/testsuite/cargo_test/no_keep_going/mod.rs
@@ -1,5 +1,6 @@
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
+use cargo_test_support::str;
 use cargo_test_support::CargoCommand;
 use cargo_test_support::Project;
 
@@ -15,6 +16,6 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 }
diff --git a/tests/testsuite/cargo_test/no_keep_going/stdout.log b/tests/testsuite/cargo_test/no_keep_going/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs
index f5e9d1f64..23ad8fbb0 100644
--- a/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs
+++ b/tests/testsuite/cargo_update/toolchain_pkgname/mod.rs
@@ -1,6 +1,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::Project;
 
 #[cargo_test]
@@ -15,6 +16,6 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .stdout_matches(file!["stdout.log"])
+        .stdout_matches(str![""])
         .stderr_matches(file!["stderr.log"]);
 }
diff --git a/tests/testsuite/cargo_update/toolchain_pkgname/stdout.log b/tests/testsuite/cargo_update/toolchain_pkgname/stdout.log
deleted file mode 100644
index e69de29bb..000000000