diff --git a/src/cargo/core/compiler/fingerprint/dirty_reason.rs b/src/cargo/core/compiler/fingerprint/dirty_reason.rs
index 418422c14c5..cb6548a41a5 100644
--- a/src/cargo/core/compiler/fingerprint/dirty_reason.rs
+++ b/src/cargo/core/compiler/fingerprint/dirty_reason.rs
@@ -175,7 +175,7 @@ impl DirtyReason {
             DirtyReason::LocalLengthsChanged => {
                 s.dirty_because(unit, "the local lengths changed")?;
                 s.note(
-                    "This could happen because of added/removed `cargo::rerun-if` instructions in the build script",
+                    "this could happen because of added/removed `cargo::rerun-if` instructions in the build script",
                 )?;
 
                 Ok(())
diff --git a/src/cargo/ops/cargo_compile/unit_generator.rs b/src/cargo/ops/cargo_compile/unit_generator.rs
index ce5a825fe3a..d6b111dd013 100644
--- a/src/cargo/ops/cargo_compile/unit_generator.rs
+++ b/src/cargo/ops/cargo_compile/unit_generator.rs
@@ -537,7 +537,7 @@ Rustdoc did not scrape the following examples because they require dev-dependenc
                 }
 
                 return shell.warn(format!(
-                    "Target {}{} specified, but no targets matched. This is a no-op",
+                    "target {}{} specified, but no targets matched; this is a no-op",
                     if miss_count > 1 { "filters" } else { "filter" },
                     filters,
                 ));
diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
index 2ff0187feed..b3d0cc495d2 100644
--- a/src/cargo/ops/cargo_package.rs
+++ b/src/cargo/ops/cargo_package.rs
@@ -566,7 +566,7 @@ fn check_repo_state(
             }
             config.shell().verbose(|shell| {
                 shell.warn(format!(
-                    "No (git) Cargo.toml found at `{}` in workdir `{}`",
+                    "no (git) Cargo.toml found at `{}` in workdir `{}`",
                     path.display(),
                     workdir.display()
                 ))
@@ -574,7 +574,7 @@ fn check_repo_state(
         }
     } else {
         config.shell().verbose(|shell| {
-            shell.warn(format!("No (git) VCS found for `{}`", p.root().display()))
+            shell.warn(format!("no (git) VCS found for `{}`", p.root().display()))
         })?;
     }
 
diff --git a/src/cargo/ops/registry/publish.rs b/src/cargo/ops/registry/publish.rs
index 2313792c8cd..0e6431d01fd 100644
--- a/src/cargo/ops/registry/publish.rs
+++ b/src/cargo/ops/registry/publish.rs
@@ -91,7 +91,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
                 // Don't change the registry for crates.io and don't warn the user.
                 // crates.io will be defaulted even without this.
                 opts.config.shell().note(&format!(
-                    "Found `{}` as only allowed registry. Publishing to it automatically.",
+                    "found `{}` as only allowed registry. Publishing to it automatically.",
                     default_registry
                 ))?;
                 publish_registry = Some(default_registry.clone());
@@ -228,7 +228,7 @@ fn wait_for_publish(
         format!("{short_pkg_description} to {source_description}"),
     )?;
     config.shell().note(format!(
-        "Waiting for `{short_pkg_description}` to be available at {source_description}.\n\
+        "waiting for `{short_pkg_description}` to be available at {source_description}.\n\
         You may press ctrl-c to skip waiting; the crate should be available shortly."
     ))?;
     let mut progress = Progress::with_style("Waiting", ProgressStyle::Ratio, config);
@@ -265,7 +265,7 @@ fn wait_for_publish(
                 "timed out waiting for `{short_pkg_description}` to be available in {source_description}",
             ))?;
             config.shell().note(
-                "The registry may have a backlog that is delaying making the \
+                "the registry may have a backlog that is delaying making the \
                 crate available. The crate should be available soon.",
             )?;
             break false;
diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs
index 901357dbc59..94c70a30855 100644
--- a/src/cargo/util/config/mod.rs
+++ b/src/cargo/util/config/mod.rs
@@ -830,7 +830,7 @@ impl Config {
     fn check_environment_key_case_mismatch(&self, key: &ConfigKey) {
         if let Some(env_key) = self.env.get_normalized(key.as_env_key()) {
             let _ = self.shell().warn(format!(
-                "Environment variables are expected to use uppercase letters and underscores, \
+                "environment variables are expected to use uppercase letters and underscores, \
                 the variable `{}` will be ignored and have no effect",
                 env_key
             ));
@@ -1522,7 +1522,7 @@ impl Config {
                 if !skip_warning {
                     if possible_with_extension.exists() {
                         self.shell().warn(format!(
-                            "Both `{}` and `{}` exist. Using `{}`",
+                            "both `{}` and `{}` exist. Using `{}`",
                             possible.display(),
                             possible_with_extension.display(),
                             possible.display()
@@ -1533,7 +1533,7 @@ impl Config {
                             possible.display(),
                         ))?;
                         self.shell().note(
-                            format!("If you need to support cargo 1.38 or earlier, you can symlink `{filename_without_extension}` to `{filename_without_extension}.toml`"),
+                            format!("if you need to support cargo 1.38 or earlier, you can symlink `{filename_without_extension}` to `{filename_without_extension}.toml`"),
                         )?;
                     }
                 }
diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs
index 36638764e2a..d41ca008f8e 100644
--- a/tests/testsuite/alt_registry.rs
+++ b/tests/testsuite/alt_registry.rs
@@ -329,7 +329,7 @@ fn publish_with_registry_dependency() {
 [PACKAGED] [..]
 [UPLOADING] foo v0.0.1 [..]
 [UPLOADED] foo v0.0.1 to registry `alternative`
-note: Waiting for `foo v0.0.1` to be available at registry `alternative`.
+[NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.0.1 at registry `alternative`
 ",
@@ -489,7 +489,7 @@ fn publish_to_alt_registry() {
 [PACKAGED] [..]
 [UPLOADING] foo v0.0.1 [..]
 [UPLOADED] foo v0.0.1 to registry `alternative`
-note: Waiting for `foo v0.0.1` to be available at registry `alternative`.
+[NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.0.1 at registry `alternative`
 ",
@@ -571,7 +571,7 @@ fn publish_with_crates_io_dep() {
 [PACKAGED] [..]
 [UPLOADING] foo v0.0.1 [..]
 [UPLOADED] foo v0.0.1 to registry `alternative`
-note: Waiting for `foo v0.0.1` to be available at registry `alternative`.
+[NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.0.1 at registry `alternative`
 ",
diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs
index 01b4ecf47fd..1f4018cd0a7 100644
--- a/tests/testsuite/artifact_dep.rs
+++ b/tests/testsuite/artifact_dep.rs
@@ -2028,7 +2028,7 @@ fn publish_artifact_dep() {
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
 [UPLOADED] foo v0.1.0 [..]
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.1.0 [..]
 ",
diff --git a/tests/testsuite/cargo_features.rs b/tests/testsuite/cargo_features.rs
index 4aba640cdee..bbdd7f296b6 100644
--- a/tests/testsuite/cargo_features.rs
+++ b/tests/testsuite/cargo_features.rs
@@ -652,7 +652,7 @@ fn publish_allowed() {
 [PACKAGED] [..]
 [UPLOADING] a v0.0.1 [..]
 [UPLOADED] a v0.0.1 to registry `crates-io`
-note: Waiting for `a v0.0.1` to be available at registry `crates-io`.
+[NOTE] waiting for `a v0.0.1` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] a v0.0.1 at registry `crates-io`
 ",
diff --git a/tests/testsuite/cargo_targets.rs b/tests/testsuite/cargo_targets.rs
index fcf2930193f..52d97a8fb84 100644
--- a/tests/testsuite/cargo_targets.rs
+++ b/tests/testsuite/cargo_targets.rs
@@ -23,8 +23,8 @@ fn warn_unmatched_target_filters() {
     p.cargo("check --tests --bins --examples --benches")
         .with_stderr(
             "\
-[WARNING] Target filters `bins`, `tests`, `examples`, `benches` specified, \
-but no targets matched. This is a no-op
+[WARNING] target filters `bins`, `tests`, `examples`, `benches` specified, \
+but no targets matched; this is a no-op
 [FINISHED][..]
 ",
         )
diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs
index 39bc30e41e0..4da9241d312 100644
--- a/tests/testsuite/config.rs
+++ b/tests/testsuite/config.rs
@@ -276,8 +276,8 @@ f1 = 1
     // It should NOT have warned for the symlink.
     let output = read_output(config);
     let expected = "\
-warning: `[ROOT]/.cargo/config` is deprecated in favor of `config.toml`
-note: If you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`";
+[WARNING] `[ROOT]/.cargo/config` is deprecated in favor of `config.toml`
+[NOTE] if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`";
     assert_match(expected, &output);
 }
 
@@ -332,7 +332,7 @@ f1 = 2
     // But it also should have warned.
     let output = read_output(config);
     let expected = "\
-warning: Both `[..]/.cargo/config` and `[..]/.cargo/config.toml` exist. Using `[..]/.cargo/config`
+[WARNING] both `[..]/.cargo/config` and `[..]/.cargo/config.toml` exist. Using `[..]/.cargo/config`
 ";
     assert_match(expected, &output);
 }
diff --git a/tests/testsuite/credential_process.rs b/tests/testsuite/credential_process.rs
index 8322ee6ad41..e31f675fb78 100644
--- a/tests/testsuite/credential_process.rs
+++ b/tests/testsuite/credential_process.rs
@@ -77,7 +77,7 @@ fn publish() {
 {"v":1,"registry":{"index-url":"[..]","name":"alternative"},"kind":"get","operation":"publish","name":"foo","vers":"0.1.0","cksum":"[..]"}
 [UPLOADING] foo v0.1.0 [..]
 [UPLOADED] foo v0.1.0 [..]
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.1.0 [..]
 "#,
@@ -541,7 +541,7 @@ fn token_caching() {
 {"v":1,"registry":{"index-url":"[..]","name":"alternative"},"kind":"get","operation":"publish","name":"foo","vers":"0.1.0","cksum":"[..]"}
 [UPLOADING] foo v0.1.0 [..]
 [UPLOADED] foo v0.1.0 [..]
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.1.0 [..]
 "#;
diff --git a/tests/testsuite/cross_publish.rs b/tests/testsuite/cross_publish.rs
index 83e0ecab709..150c3b53e56 100644
--- a/tests/testsuite/cross_publish.rs
+++ b/tests/testsuite/cross_publish.rs
@@ -113,7 +113,7 @@ fn publish_with_target() {
 [PACKAGED] [..]
 [UPLOADING] foo v0.0.0 ([CWD])
 [UPLOADED] foo v0.0.0 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.0 at registry `crates-io`
 ",
diff --git a/tests/testsuite/features_namespaced.rs b/tests/testsuite/features_namespaced.rs
index 6cf64fa4cfc..a8e600bd283 100644
--- a/tests/testsuite/features_namespaced.rs
+++ b/tests/testsuite/features_namespaced.rs
@@ -898,7 +898,7 @@ fn publish_no_implicit() {
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
 [UPLOADED] foo v0.1.0 [..]
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.1.0 [..]
 ",
@@ -1021,7 +1021,7 @@ fn publish() {
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
 [UPLOADED] foo v0.1.0 [..]
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.1.0 [..]
 ",
diff --git a/tests/testsuite/inheritable_workspace_fields.rs b/tests/testsuite/inheritable_workspace_fields.rs
index bce830fe807..762b828e83b 100644
--- a/tests/testsuite/inheritable_workspace_fields.rs
+++ b/tests/testsuite/inheritable_workspace_fields.rs
@@ -173,7 +173,7 @@ fn inherit_own_workspace_fields() {
 [PACKAGED] [..]
 [UPLOADING] foo v1.2.3 [..]
 [UPLOADED] foo v1.2.3 to registry `crates-io`
-note: Waiting for `foo v1.2.3` to be available at registry `crates-io`.
+[NOTE] waiting for `foo v1.2.3` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v1.2.3 at registry `crates-io`
 ",
@@ -323,7 +323,7 @@ fn inherit_own_dependencies() {
 [PACKAGED] [..]
 [UPLOADING] bar v0.2.0 [..]
 [UPLOADED] bar v0.2.0 to registry `crates-io`
-note: Waiting for `bar v0.2.0` to be available at registry `crates-io`.
+[NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] bar v0.2.0 at registry `crates-io`
 ",
@@ -469,7 +469,7 @@ fn inherit_own_detailed_dependencies() {
 [PACKAGED] [..]
 [UPLOADING] bar v0.2.0 [..]
 [UPLOADED] bar v0.2.0 to registry `crates-io`
-note: Waiting for `bar v0.2.0` to be available at registry `crates-io`.
+[NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] bar v0.2.0 at registry `crates-io`
 ",
@@ -709,7 +709,7 @@ fn inherit_workspace_fields() {
 [PACKAGED] [..]
 [UPLOADING] bar v1.2.3 [..]
 [UPLOADED] bar v1.2.3 to registry `crates-io`
-note: Waiting for `bar v1.2.3` to be available at registry `crates-io`.
+[NOTE] waiting for `bar v1.2.3` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] bar v1.2.3 at registry `crates-io`
 ",
@@ -867,7 +867,7 @@ fn inherit_dependencies() {
 [PACKAGED] [..]
 [UPLOADING] bar v0.2.0 [..]
 [UPLOADED] bar v0.2.0 to registry `crates-io`
-note: Waiting for `bar v0.2.0` to be available at registry `crates-io`.
+[NOTE] waiting for `bar v0.2.0` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] bar v0.2.0 at registry `crates-io`
 ",
diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs
index 5623776bb6a..c4f537ff749 100644
--- a/tests/testsuite/publish.rs
+++ b/tests/testsuite/publish.rs
@@ -118,7 +118,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting for `foo v0.0.1` to be available at registry `crates-io`.
+[NOTE] waiting for `foo v0.0.1` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.0.1 at registry `crates-io`
 ",
@@ -162,7 +162,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `dummy-registry`
-note: Waiting for `foo v0.0.1` to be available at registry `dummy-registry`.
+[NOTE] waiting for `foo v0.0.1` to be available at registry `dummy-registry`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.0.1 at registry `dummy-registry`
 ",
@@ -205,7 +205,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `dummy-registry`
-note: Waiting for `foo v0.0.1` to be available at registry `dummy-registry`.
+[NOTE] waiting for `foo v0.0.1` to be available at registry `dummy-registry`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.0.1 at registry `dummy-registry`
 ",
@@ -259,7 +259,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -304,7 +304,7 @@ fn simple_with_index() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `[ROOT]/registry`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -505,7 +505,7 @@ fn publish_clean() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -554,7 +554,7 @@ fn publish_in_sub_repo() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -603,7 +603,7 @@ fn publish_when_ignored() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -651,7 +651,7 @@ fn ignore_when_crate_ignored() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -840,7 +840,7 @@ fn publish_allowed_registry() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `alternative`
-note: Waiting for `foo v0.0.1` to be available at registry `alternative`.
+[NOTE] waiting for `foo v0.0.1` to be available at registry `alternative`.
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 at registry `alternative`
 ",
@@ -892,7 +892,7 @@ fn publish_implicitly_to_only_allowed_registry() {
     p.cargo("publish")
         .with_stderr(
             "\
-[NOTE] Found `alternative` as only allowed registry. Publishing to it automatically.
+[NOTE] found `alternative` as only allowed registry. Publishing to it automatically.
 [UPDATING] `alternative` index
 [..]
 [VERIFYING] foo v0.0.1 ([CWD])
@@ -901,7 +901,7 @@ fn publish_implicitly_to_only_allowed_registry() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `alternative`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -956,7 +956,7 @@ fn publish_failed_with_index_and_only_allowed_registry() {
         .with_status(101)
         .with_stderr(
             "\
-[NOTE] Found `alternative` as only allowed registry. Publishing to it automatically.
+[NOTE] found `alternative` as only allowed registry. Publishing to it automatically.
 [ERROR] command-line argument --index requires --token to be specified
 ",
         )
@@ -1072,7 +1072,7 @@ The registry `alternative` is not listed in the `package.publish` value in Cargo
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -1123,7 +1123,7 @@ fn publish_with_select_features() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -1174,7 +1174,7 @@ fn publish_with_all_features() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -1279,7 +1279,7 @@ fn publish_with_patch() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -1479,7 +1479,7 @@ fn publish_git_with_version() {
 [..]
 [UPLOADING] foo v0.1.0 ([CWD])
 [UPLOADED] foo v0.1.0 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.1.0 [..]
 ",
@@ -1602,7 +1602,7 @@ fn publish_dev_dep_no_version() {
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] foo v0.1.0 [..]
 [UPLOADED] foo v0.1.0 [..]
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.1.0 [..]
 ",
@@ -1695,14 +1695,14 @@ fn credentials_ambiguous_filename() {
         .with_stderr(
             "\
 [..]
-[WARNING] Both `[..]/credentials` and `[..]/credentials.toml` exist. Using `[..]/credentials`
+[WARNING] both `[..]/credentials` and `[..]/credentials.toml` exist. Using `[..]/credentials`
 [..]
 [..]
 [..]
 [..]
 [UPLOADING] foo v0.0.1 [..]
 [UPLOADED] foo v0.0.1 [..]
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -2117,7 +2117,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] li v0.0.1 ([CWD]/li)
 [UPLOADED] li v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] li v0.0.1 [..]
 ",
@@ -2220,7 +2220,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] li v0.0.1 ([CWD]/li)
 [UPLOADED] li v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] li v0.0.1 [..]
 ",
@@ -2316,7 +2316,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] li v0.0.1 ([CWD]/li)
 [UPLOADED] li v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] li v0.0.1 [..]
 ",
@@ -2506,7 +2506,7 @@ fn http_api_not_noop() {
 [..]
 [UPLOADING] foo v0.0.1 ([CWD])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 You may press ctrl-c [..]
 [PUBLISHED] foo v0.0.1 [..]
 ",
@@ -2583,7 +2583,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] delay v0.0.1 ([CWD])
 [UPLOADED] delay v0.0.1 to registry `crates-io`
-note: Waiting for `delay v0.0.1` to be available at registry `crates-io`.
+[NOTE] waiting for `delay v0.0.1` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] delay v0.0.1 at registry `crates-io`
 ",
@@ -2675,7 +2675,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] delay_with_underscore v0.0.1 ([CWD])
 [UPLOADED] delay_with_underscore v0.0.1 to registry `crates-io`
-note: Waiting for `delay_with_underscore v0.0.1` to be available at registry `crates-io`.
+[NOTE] waiting for `delay_with_underscore v0.0.1` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] delay_with_underscore v0.0.1 at registry `crates-io`
 ",
@@ -2774,7 +2774,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] delay v0.0.2 ([CWD])
 [UPLOADED] delay v0.0.2 to registry `crates-io`
-note: Waiting for `delay v0.0.2` to be available at registry `crates-io`.
+[NOTE] waiting for `delay v0.0.2` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] delay v0.0.2 at registry `crates-io`
 ",
@@ -2890,10 +2890,10 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] delay v0.0.1 ([CWD])
 [UPLOADED] delay v0.0.1 to registry `crates-io`
-note: Waiting for `delay v0.0.1` to be available at registry `crates-io`.
+[NOTE] waiting for `delay v0.0.1` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 warning: timed out waiting for `delay v0.0.1` to be available in registry `crates-io`
-note: The registry may have a backlog that is delaying making the crate available. The crate should be available soon.
+[NOTE] the registry may have a backlog that is delaying making the crate available. The crate should be available soon.
 ",
         )
         .run();
@@ -2939,7 +2939,7 @@ See [..]
 [PACKAGED] [..] files, [..] ([..] compressed)
 [UPLOADING] delay v0.0.2 ([CWD])
 [UPLOADED] delay v0.0.2 to registry `crates-io`
-note: Waiting for `delay v0.0.2` to be available at registry `crates-io`.
+[NOTE] waiting for `delay v0.0.2` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] delay v0.0.2 at registry `crates-io`
 ",
diff --git a/tests/testsuite/registry_auth.rs b/tests/testsuite/registry_auth.rs
index df2bdf565d7..bb9c6332810 100644
--- a/tests/testsuite/registry_auth.rs
+++ b/tests/testsuite/registry_auth.rs
@@ -478,7 +478,7 @@ fn token_not_logged() {
 [PACKAGED] 3 files[..]
 [UPLOADING] foo v0.1.0[..]
 [UPLOADED] foo v0.1.0 to registry `crates-io`
-note: Waiting [..]
+[NOTE] waiting [..]
 ";
     for line in lines.lines() {
         match_contains(line, &log, None).unwrap();
diff --git a/tests/testsuite/required_features.rs b/tests/testsuite/required_features.rs
index 88be89fd4d0..a1a075b0424 100644
--- a/tests/testsuite/required_features.rs
+++ b/tests/testsuite/required_features.rs
@@ -810,7 +810,7 @@ Consider enabling some of the needed features by passing, e.g., `--features=\"b
         .with_stderr(
             "\
 [INSTALLING] foo v0.0.1 ([..])
-[WARNING] Target filter `bins` specified, but no targets matched. This is a no-op
+[WARNING] target filter `bins` specified, but no targets matched; this is a no-op
 [FINISHED] release [optimized] target(s) in [..]
 [WARNING] none of the package's binaries are available for install using the selected features
   bin \"foo_1\" requires the features: `b`, `c`
@@ -825,7 +825,7 @@ Consider enabling some of the needed features by passing, e.g., `--features=\"b
         .with_stderr(
             "\
 [INSTALLING] foo v0.0.1 ([..])
-[WARNING] Target filter `examples` specified, but no targets matched. This is a no-op
+[WARNING] target filter `examples` specified, but no targets matched; this is a no-op
 [FINISHED] release [optimized] target(s) in [..]
 [WARNING] none of the package's binaries are available for install using the selected features
   bin \"foo_1\" requires the features: `b`, `c`
@@ -840,7 +840,7 @@ Consider enabling some of the needed features by passing, e.g., `--features=\"b
         .with_stderr(
             "\
 [INSTALLING] foo v0.0.1 ([..])
-[WARNING] Target filters `bins`, `examples` specified, but no targets matched. This is a no-op
+[WARNING] target filters `bins`, `examples` specified, but no targets matched; this is a no-op
 [FINISHED] release [optimized] target(s) in [..]
 [WARNING] none of the package's binaries are available for install using the selected features
   bin \"foo_1\" requires the features: `b`, `c`
diff --git a/tests/testsuite/source_replacement.rs b/tests/testsuite/source_replacement.rs
index d6ed9c6ec30..ce4c8f84c58 100644
--- a/tests/testsuite/source_replacement.rs
+++ b/tests/testsuite/source_replacement.rs
@@ -221,7 +221,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
 [PACKAGED] [..]
 [UPLOADING] foo v0.0.1 ([..])
 [UPLOADED] foo v0.0.1 to registry `crates-io`
-note: Waiting for `foo v0.0.1` to be available at registry `crates-io`.
+[NOTE] waiting for `foo v0.0.1` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.0.1 at registry `crates-io`
 ",
diff --git a/tests/testsuite/tool_paths.rs b/tests/testsuite/tool_paths.rs
index c5eebbbcdf8..b693e138e75 100644
--- a/tests/testsuite/tool_paths.rs
+++ b/tests/testsuite/tool_paths.rs
@@ -441,7 +441,7 @@ fn target_in_environment_contains_lower_case() {
         .arg(target)
         .env(&env_key, "nonexistent-linker")
         .with_stderr_contains(format!(
-            "warning: Environment variables are expected to use uppercase \
+            "warning: environment variables are expected to use uppercase \
              letters and underscores, the variable `{}` will be ignored and \
              have no effect",
             env_key
diff --git a/tests/testsuite/weak_dep_features.rs b/tests/testsuite/weak_dep_features.rs
index 6f7c035476a..8520793ae6e 100644
--- a/tests/testsuite/weak_dep_features.rs
+++ b/tests/testsuite/weak_dep_features.rs
@@ -562,7 +562,7 @@ fn publish() {
 [PACKAGED] [..]
 [UPLOADING] foo v0.1.0 [..]
 [UPLOADED] foo v0.1.0 to registry `crates-io`
-note: Waiting for `foo v0.1.0` to be available at registry `crates-io`.
+[NOTE] waiting for `foo v0.1.0` to be available at registry `crates-io`.
 You may press ctrl-c to skip waiting; the crate should be available shortly.
 [PUBLISHED] foo v0.1.0 at registry `crates-io`
 ",