diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index d532d4e5a..2b0fea0f8 100644
--- a/tests/compile-test.rs
+++ b/tests/compile-test.rs
@@ -46,7 +46,9 @@ fn config(dir: &'static str, mode: &'static str) -> compiletest::Config {
     config.target_rustcflags = Some(format!("-L {0} -L {0}/deps -Dwarnings", host_libs().display()));
 
     config.mode = cfg_mode;
-    config.build_base = {
+    config.build_base = if rustc_test_suite().is_some() {
+        PathBuf::from("/tmp/clippy_test_build_base")
+    } else {
         let mut path = std::env::current_dir().unwrap();
         path.push("target/debug/test_build_base");
         path
diff --git a/tests/ui/absurd-extreme-comparisons.stderr b/tests/ui/absurd-extreme-comparisons.stderr
index a4b883979..2b1e9ad66 100644
--- a/tests/ui/absurd-extreme-comparisons.stderr
+++ b/tests/ui/absurd-extreme-comparisons.stderr
@@ -143,3 +143,5 @@ error: <-comparison of unit values detected. This will always be false
    |
    = note: `-D unit-cmp` implied by `-D warnings`
 
+error: aborting due to 18 previous errors
+
diff --git a/tests/ui/approx_const.stderr b/tests/ui/approx_const.stderr
index f102dc5b5..dda28433d 100644
--- a/tests/ui/approx_const.stderr
+++ b/tests/ui/approx_const.stderr
@@ -114,3 +114,5 @@ error: approximate value of `f{32, 64}::consts::SQRT_2` found. Consider using it
 55 |     let my_sq2 = 1.4142;
    |                  ^^^^^^
 
+error: aborting due to 19 previous errors
+
diff --git a/tests/ui/arithmetic.stderr b/tests/ui/arithmetic.stderr
index ea32a0052..ad4a02e21 100644
--- a/tests/ui/arithmetic.stderr
+++ b/tests/ui/arithmetic.stderr
@@ -69,3 +69,5 @@ error: floating-point arithmetic detected
 29 |     -f;
    |     ^^
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/array_indexing.stderr b/tests/ui/array_indexing.stderr
index dd1124724..d730b0129 100644
--- a/tests/ui/array_indexing.stderr
+++ b/tests/ui/array_indexing.stderr
@@ -116,3 +116,5 @@ error: range is out of bounds
 44 |     &empty[..4];
    |      ^^^^^^^^^^
 
+error: aborting due to 19 previous errors
+
diff --git a/tests/ui/assign_ops.stderr b/tests/ui/assign_ops.stderr
index c1cc5d244..2123507e2 100644
--- a/tests/ui/assign_ops.stderr
+++ b/tests/ui/assign_ops.stderr
@@ -134,3 +134,5 @@ error: manual implementation of an assign operation
 40 |     s = s + "bla";
    |     ^^^^^^^^^^^^^ help: replace it with: `s += "bla"`
 
+error: aborting due to 22 previous errors
+
diff --git a/tests/ui/assign_ops2.stderr b/tests/ui/assign_ops2.stderr
index 47528c315..0ff211259 100644
--- a/tests/ui/assign_ops2.stderr
+++ b/tests/ui/assign_ops2.stderr
@@ -48,3 +48,5 @@ error: variable appears on both sides of an assignment operation
 15 |     a &= a & 1;
    |     ^^^^^^^^^^ help: replace it with: `a &= 1`
 
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/attrs.stderr b/tests/ui/attrs.stderr
index 9e4ac3d12..f743399a6 100644
--- a/tests/ui/attrs.stderr
+++ b/tests/ui/attrs.stderr
@@ -20,3 +20,5 @@ error: the since field must contain a semver-compliant version
 30 | #[deprecated(since = "1")]
    |              ^^^^^^^^^^^
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/bit_masks.stderr b/tests/ui/bit_masks.stderr
index 39320bb9c..6aad98ff5 100644
--- a/tests/ui/bit_masks.stderr
+++ b/tests/ui/bit_masks.stderr
@@ -106,3 +106,5 @@ error: ineffective bit mask: `x | 1` compared to `8`, is the same as x compared
 55 |     x | 1 >= 8;
    |     ^^^^^^^^^^
 
+error: aborting due to 17 previous errors
+
diff --git a/tests/ui/blacklisted_name.stderr b/tests/ui/blacklisted_name.stderr
index a08a53268..68fbe27a0 100644
--- a/tests/ui/blacklisted_name.stderr
+++ b/tests/ui/blacklisted_name.stderr
@@ -84,3 +84,5 @@ error: use of a blacklisted/placeholder name `baz`
 35 |     if let Some(ref mut baz) = Some(42) {}
    |                         ^^^
 
+error: aborting due to 14 previous errors
+
diff --git a/tests/ui/block_in_if_condition.stderr b/tests/ui/block_in_if_condition.stderr
index 86a289c19..4b7d12598 100644
--- a/tests/ui/block_in_if_condition.stderr
+++ b/tests/ui/block_in_if_condition.stderr
@@ -50,3 +50,5 @@ error: this boolean expression can be simplified
    |
    = note: `-D nonminimal-bool` implied by `-D warnings`
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/bool_comparison.stderr b/tests/ui/bool_comparison.stderr
index e5e062e02..4436980bc 100644
--- a/tests/ui/bool_comparison.stderr
+++ b/tests/ui/bool_comparison.stderr
@@ -24,3 +24,5 @@ error: equality checks against false can be replaced by a negation
 10 |     if false == x { "yes" } else { "no" };
    |        ^^^^^^^^^^ help: try simplifying it as shown: `!x`
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/booleans.stderr b/tests/ui/booleans.stderr
index 6367ba034..c88a7a7be 100644
--- a/tests/ui/booleans.stderr
+++ b/tests/ui/booleans.stderr
@@ -175,3 +175,5 @@ error: this boolean expression can be simplified
 58 |     let _ = !c ^ c || !a.is_some();
    |             ^^^^^^^^^^^^^^^^^^^^^^ help: try: `!c ^ c || a.is_none()`
 
+error: aborting due to 21 previous errors
+
diff --git a/tests/ui/borrow_box.stderr b/tests/ui/borrow_box.stderr
index 74134f4f2..2cf0ea796 100644
--- a/tests/ui/borrow_box.stderr
+++ b/tests/ui/borrow_box.stderr
@@ -28,3 +28,5 @@ error: you seem to be trying to use `&Box<T>`. Consider using just `&T`
 22 |     fn test4(a: &Box<bool>);
    |                 ^^^^^^^^^^ help: try: `&bool`
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/box_vec.stderr b/tests/ui/box_vec.stderr
index c1badd0dc..254d07713 100644
--- a/tests/ui/box_vec.stderr
+++ b/tests/ui/box_vec.stderr
@@ -7,3 +7,5 @@ error: you seem to be trying to use `Box<Vec<T>>`. Consider using just `Vec<T>`
    = note: `-D box-vec` implied by `-D warnings`
    = help: `Vec<T>` is already on the heap, `Box<Vec<T>>` makes an extra allocation.
 
+error: aborting due to previous error
+
diff --git a/tests/ui/builtin-type-shadow.stderr b/tests/ui/builtin-type-shadow.stderr
index 058813356..eb4c73b65 100644
--- a/tests/ui/builtin-type-shadow.stderr
+++ b/tests/ui/builtin-type-shadow.stderr
@@ -17,3 +17,5 @@ error[E0308]: mismatched types
   = note: expected type `u32`
              found type `{integer}`
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/bytecount.stderr b/tests/ui/bytecount.stderr
index c4f6b65a2..307edecfd 100644
--- a/tests/ui/bytecount.stderr
+++ b/tests/ui/bytecount.stderr
@@ -22,3 +22,5 @@ error: You appear to be counting bytes the naive way
 22 |     let _ = x.iter().filter(|a| b + 1 == **a).count(); // naive byte count
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider using the bytecount crate: `bytecount::count(x, b + 1)`
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/cast.stderr b/tests/ui/cast.stderr
index ac409a813..0a008cb68 100644
--- a/tests/ui/cast.stderr
+++ b/tests/ui/cast.stderr
@@ -178,3 +178,5 @@ error: casting to the same type is unnecessary (`bool` -> `bool`)
 39 |     false as bool;
    |     ^^^^^^^^^^^^^
 
+error: aborting due to 28 previous errors
+
diff --git a/tests/ui/cast_lossless_float.stderr b/tests/ui/cast_lossless_float.stderr
index 781d9c897..a60f838fa 100644
--- a/tests/ui/cast_lossless_float.stderr
+++ b/tests/ui/cast_lossless_float.stderr
@@ -60,3 +60,5 @@ error: casting u32 to f64 may become silently lossy if types change
 14 |     1u32 as f64;
    |     ^^^^^^^^^^^ help: try: `f64::from(1u32)`
 
+error: aborting due to 10 previous errors
+
diff --git a/tests/ui/cast_lossless_integer.stderr b/tests/ui/cast_lossless_integer.stderr
index fdd915979..19d617619 100644
--- a/tests/ui/cast_lossless_integer.stderr
+++ b/tests/ui/cast_lossless_integer.stderr
@@ -108,3 +108,5 @@ error: casting u32 to u64 may become silently lossy if types change
 23 |     1u32 as u64;
    |     ^^^^^^^^^^^ help: try: `u64::from(1u32)`
 
+error: aborting due to 18 previous errors
+
diff --git a/tests/ui/cast_size.stderr b/tests/ui/cast_size.stderr
index a6aac1300..1c4b12bce 100644
--- a/tests/ui/cast_size.stderr
+++ b/tests/ui/cast_size.stderr
@@ -120,3 +120,5 @@ error: casting i32 to usize may lose the sign of the value
 22 |     1i32 as usize;
    |     ^^^^^^^^^^^^^
 
+error: aborting due to 19 previous errors
+
diff --git a/tests/ui/char_lit_as_u8.stderr b/tests/ui/char_lit_as_u8.stderr
index 4e7c1866a..fcf038fe0 100644
--- a/tests/ui/char_lit_as_u8.stderr
+++ b/tests/ui/char_lit_as_u8.stderr
@@ -8,3 +8,5 @@ error: casting character literal to u8. `char`s are 4 bytes wide in rust, so cas
   = help: Consider using a byte literal instead:
           b'a'
 
+error: aborting due to previous error
+
diff --git a/tests/ui/cmp_nan.stderr b/tests/ui/cmp_nan.stderr
index 9ea1a29d2..46f3d3d57 100644
--- a/tests/ui/cmp_nan.stderr
+++ b/tests/ui/cmp_nan.stderr
@@ -72,3 +72,5 @@ error: doomed comparison with NAN, use `std::{f32,f64}::is_nan()` instead
 21 |     y >= std::f64::NAN;
    |     ^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 12 previous errors
+
diff --git a/tests/ui/cmp_null.stderr b/tests/ui/cmp_null.stderr
index 51c0ceea4..481a4d0f9 100644
--- a/tests/ui/cmp_null.stderr
+++ b/tests/ui/cmp_null.stderr
@@ -12,3 +12,5 @@ error: Comparing with null is better expressed by the .is_null() method
 16 |     if m == ptr::null_mut() {
    |        ^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/cmp_owned.stderr b/tests/ui/cmp_owned.stderr
index e69962446..d40fb4b8a 100644
--- a/tests/ui/cmp_owned.stderr
+++ b/tests/ui/cmp_owned.stderr
@@ -36,3 +36,5 @@ error: this creates an owned instance just for comparison
 30 |         self.to_owned() == *other
    |         ^^^^^^^^^^^^^^^ try calling implementing the comparison without allocating
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/collapsible_if.stderr b/tests/ui/collapsible_if.stderr
index bc10afced..69f2013c1 100644
--- a/tests/ui/collapsible_if.stderr
+++ b/tests/ui/collapsible_if.stderr
@@ -240,3 +240,5 @@ help: try
 112 | }
     |
 
+error: aborting due to 13 previous errors
+
diff --git a/tests/ui/complex_types.stderr b/tests/ui/complex_types.stderr
index 8ce63652f..829a22c23 100644
--- a/tests/ui/complex_types.stderr
+++ b/tests/ui/complex_types.stderr
@@ -90,3 +90,5 @@ error: very complex type used. Consider factoring parts into `type` definitions
 40 |     let _y: Vec<Vec<Box<(u32, u32, u32, u32)>>> = vec![];
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 15 previous errors
+
diff --git a/tests/ui/conf_bad_arg.stderr b/tests/ui/conf_bad_arg.stderr
index 66c32aed0..bc44cebdb 100644
--- a/tests/ui/conf_bad_arg.stderr
+++ b/tests/ui/conf_bad_arg.stderr
@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+
diff --git a/tests/ui/conf_bad_toml.stderr b/tests/ui/conf_bad_toml.stderr
index f2a741c70..d42369265 100644
--- a/tests/ui/conf_bad_toml.stderr
+++ b/tests/ui/conf_bad_toml.stderr
@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+
diff --git a/tests/ui/conf_bad_type.stderr b/tests/ui/conf_bad_type.stderr
index 679418f38..440437d14 100644
--- a/tests/ui/conf_bad_type.stderr
+++ b/tests/ui/conf_bad_type.stderr
@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+
diff --git a/tests/ui/conf_french_blacklisted_name.stderr b/tests/ui/conf_french_blacklisted_name.stderr
index 71c0d578a..19c8e5c97 100644
--- a/tests/ui/conf_french_blacklisted_name.stderr
+++ b/tests/ui/conf_french_blacklisted_name.stderr
@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+
diff --git a/tests/ui/conf_path_non_string.stderr b/tests/ui/conf_path_non_string.stderr
index f1f679e6b..7a0aebb57 100644
--- a/tests/ui/conf_path_non_string.stderr
+++ b/tests/ui/conf_path_non_string.stderr
@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+
diff --git a/tests/ui/conf_unknown_key.stderr b/tests/ui/conf_unknown_key.stderr
index fc1c33426..d1957c311 100644
--- a/tests/ui/conf_unknown_key.stderr
+++ b/tests/ui/conf_unknown_key.stderr
@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+
diff --git a/tests/ui/const_static_lifetime.stderr b/tests/ui/const_static_lifetime.stderr
index 448d83ee9..db33744c7 100644
--- a/tests/ui/const_static_lifetime.stderr
+++ b/tests/ui/const_static_lifetime.stderr
@@ -78,3 +78,5 @@ error: Constants have by default a `'static` lifetime
 24 | const VAR_ARRAY: &'static [u8; 1] = b"T"; // ERROR Consider removing 'static.
    |                  -^^^^^^^-------- help: consider removing `'static`: `&[u8; 1]`
 
+error: aborting due to 13 previous errors
+
diff --git a/tests/ui/copies.stderr b/tests/ui/copies.stderr
index 4457e2b7d..9accb310d 100644
--- a/tests/ui/copies.stderr
+++ b/tests/ui/copies.stderr
@@ -33,3 +33,5 @@ error: This else block is redundant.
             }
             
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/cstring.stderr b/tests/ui/cstring.stderr
index c3dd9cf83..973f26a96 100644
--- a/tests/ui/cstring.stderr
+++ b/tests/ui/cstring.stderr
@@ -12,3 +12,5 @@ help: assign the `CString` to a variable to extend its lifetime
 7 |     CString::new("foo").unwrap().as_ptr();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to previous error
+
diff --git a/tests/ui/cyclomatic_complexity.stderr b/tests/ui/cyclomatic_complexity.stderr
index 62fd5313c..43676762d 100644
--- a/tests/ui/cyclomatic_complexity.stderr
+++ b/tests/ui/cyclomatic_complexity.stderr
@@ -269,3 +269,5 @@ error: the function has a cyclomatic complexity of 8
     |
     = help: you could split it up into multiple smaller functions
 
+error: aborting due to 20 previous errors
+
diff --git a/tests/ui/cyclomatic_complexity_attr_used.stderr b/tests/ui/cyclomatic_complexity_attr_used.stderr
index a9cefe93e..e671b3439 100644
--- a/tests/ui/cyclomatic_complexity_attr_used.stderr
+++ b/tests/ui/cyclomatic_complexity_attr_used.stderr
@@ -13,3 +13,5 @@ error: the function has a cyclomatic complexity of 3
    = note: `-D cyclomatic-complexity` implied by `-D warnings`
    = help: you could split it up into multiple smaller functions
 
+error: aborting due to previous error
+
diff --git a/tests/ui/deprecated.stderr b/tests/ui/deprecated.stderr
index 425595967..7d5d594cf 100644
--- a/tests/ui/deprecated.stderr
+++ b/tests/ui/deprecated.stderr
@@ -24,3 +24,5 @@ error: lint unstable_as_mut_slice has been removed: `Vec::as_mut_slice` has been
 10 | #[warn(unstable_as_mut_slice)]
    |        ^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/derive.stderr b/tests/ui/derive.stderr
index f336dc3a8..ffeed948b 100644
--- a/tests/ui/derive.stderr
+++ b/tests/ui/derive.stderr
@@ -106,3 +106,5 @@ note: consider deriving `Clone` or removing `Copy`
 87 | | }
    | |_^
 
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/diverging_sub_expression.stderr b/tests/ui/diverging_sub_expression.stderr
index b39d1ae07..0d7b1ca6f 100644
--- a/tests/ui/diverging_sub_expression.stderr
+++ b/tests/ui/diverging_sub_expression.stderr
@@ -36,3 +36,5 @@ error: sub-expression diverges
 37 |             _ => true || break,
    |                          ^^^^^
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/dlist.stderr b/tests/ui/dlist.stderr
index 95872c029..de0422e17 100644
--- a/tests/ui/dlist.stderr
+++ b/tests/ui/dlist.stderr
@@ -47,3 +47,5 @@ error: I see you're using a LinkedList! Perhaps you meant some other data struct
    |
    = help: a VecDeque might work
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/doc.stderr b/tests/ui/doc.stderr
index fc036d01b..f38678e89 100644
--- a/tests/ui/doc.stderr
+++ b/tests/ui/doc.stderr
@@ -180,3 +180,5 @@ error: you should put bare URLs between `<`/`>` or make a proper Markdown link
 168 | /// Not ok: http://www.unicode.org/reports/tr9/#Reordering_Resolved_Levels
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 30 previous errors
+
diff --git a/tests/ui/double_neg.stderr b/tests/ui/double_neg.stderr
index 8c64eb37e..fd4da8820 100644
--- a/tests/ui/double_neg.stderr
+++ b/tests/ui/double_neg.stderr
@@ -6,3 +6,5 @@ error: `--x` could be misinterpreted as pre-decrement by C programmers, is usual
   |
   = note: `-D double-neg` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/double_parens.stderr b/tests/ui/double_parens.stderr
index ab3e844d7..a77b08528 100644
--- a/tests/ui/double_parens.stderr
+++ b/tests/ui/double_parens.stderr
@@ -30,3 +30,5 @@ error: Consider removing unnecessary double parentheses
 32 |     (())
    |     ^^^^
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/drop_forget_copy.stderr b/tests/ui/drop_forget_copy.stderr
index f399c5a12..3ea7bf973 100644
--- a/tests/ui/drop_forget_copy.stderr
+++ b/tests/ui/drop_forget_copy.stderr
@@ -72,3 +72,5 @@ note: argument has type SomeStruct
 42 |     forget(s4);
    |            ^^
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/drop_forget_ref.stderr b/tests/ui/drop_forget_ref.stderr
index 6058b89c7..1654fdd28 100644
--- a/tests/ui/drop_forget_ref.stderr
+++ b/tests/ui/drop_forget_ref.stderr
@@ -216,3 +216,5 @@ note: argument has type &SomeStruct
 59 |     std::mem::forget(&SomeStruct);
    |                      ^^^^^^^^^^^
 
+error: aborting due to 18 previous errors
+
diff --git a/tests/ui/duplicate_underscore_argument.stderr b/tests/ui/duplicate_underscore_argument.stderr
index de9e6f1e0..c926f57f1 100644
--- a/tests/ui/duplicate_underscore_argument.stderr
+++ b/tests/ui/duplicate_underscore_argument.stderr
@@ -6,3 +6,5 @@ error: `darth` already exists, having another argument having almost the same na
   |
   = note: `-D duplicate-underscore-argument` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/else_if_without_else.stderr b/tests/ui/else_if_without_else.stderr
index 2395c2afd..b8a5031fb 100644
--- a/tests/ui/else_if_without_else.stderr
+++ b/tests/ui/else_if_without_else.stderr
@@ -18,3 +18,5 @@ error: if expression with an `else if`, but without a final `else`
 49 | |     }
    | |_____^ help: add an `else` block here
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/empty_enum.stderr b/tests/ui/empty_enum.stderr
index a0d491b6f..ca377cee8 100644
--- a/tests/ui/empty_enum.stderr
+++ b/tests/ui/empty_enum.stderr
@@ -11,3 +11,5 @@ help: consider using the uninhabited type `!` or a wrapper around it
 7 | enum Empty {}
   | ^^^^^^^^^^^^^
 
+error: aborting due to previous error
+
diff --git a/tests/ui/entry.stderr b/tests/ui/entry.stderr
index e60c158d7..09c4a8822 100644
--- a/tests/ui/entry.stderr
+++ b/tests/ui/entry.stderr
@@ -42,3 +42,5 @@ error: usage of `contains_key` followed by `insert` on a `BTreeMap`
 37 |     if !m.contains_key(&k) { foo(); m.insert(k, v) } else { None };
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `m.entry(k)`
 
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/enum_glob_use.stderr b/tests/ui/enum_glob_use.stderr
index 1e0fffb9a..2d53618c1 100644
--- a/tests/ui/enum_glob_use.stderr
+++ b/tests/ui/enum_glob_use.stderr
@@ -12,3 +12,5 @@ error: don't use glob imports for enum variants
 12 | use self::Enum::*;
    | ^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/enum_variants.stderr b/tests/ui/enum_variants.stderr
index 7e2716b8e..e33e29ec7 100644
--- a/tests/ui/enum_variants.stderr
+++ b/tests/ui/enum_variants.stderr
@@ -97,3 +97,5 @@ error: All variants have the same prefix: `With`
    = note: `-D pub-enum-variant-names` implied by `-D warnings`
    = help: remove the prefixes and use full paths to the variants instead of glob imports
 
+error: aborting due to 10 previous errors
+
diff --git a/tests/ui/enums_clike.stderr b/tests/ui/enums_clike.stderr
index e0555bb02..d6a137c6f 100644
--- a/tests/ui/enums_clike.stderr
+++ b/tests/ui/enums_clike.stderr
@@ -48,3 +48,5 @@ error: Clike enum variant discriminant is not portable to 32-bit targets
 37 |     A = 0x1_0000_0000,
    |     ^^^^^^^^^^^^^^^^^
 
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/eq_op.stderr b/tests/ui/eq_op.stderr
index 914a85719..46c0ac108 100644
--- a/tests/ui/eq_op.stderr
+++ b/tests/ui/eq_op.stderr
@@ -204,3 +204,5 @@ error: taken reference of right operand
    |
    = note: `-D op-ref` implied by `-D warnings`
 
+error: aborting due to 33 previous errors
+
diff --git a/tests/ui/erasing_op.stderr b/tests/ui/erasing_op.stderr
index 8a05d2c25..310c41c54 100644
--- a/tests/ui/erasing_op.stderr
+++ b/tests/ui/erasing_op.stderr
@@ -18,3 +18,5 @@ error: this operation will always return zero. This is likely not the intended o
 11 |     0 / x;
    |     ^^^^^
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/eta.stderr b/tests/ui/eta.stderr
index 34a6217cd..5dca265c2 100644
--- a/tests/ui/eta.stderr
+++ b/tests/ui/eta.stderr
@@ -32,3 +32,5 @@ error: redundant closure found
 18 |     let e = Some(1u8).map(|a| generic(a));
    |                           ^^^^^^^^^^^^^^ help: remove closure as shown: `generic`
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/eval_order_dependence.stderr b/tests/ui/eval_order_dependence.stderr
index e9bdc3b51..2e01a167c 100644
--- a/tests/ui/eval_order_dependence.stderr
+++ b/tests/ui/eval_order_dependence.stderr
@@ -47,3 +47,5 @@ note: whether read occurs before this write depends on evaluation order
 21 |         x += { x = 20; 2 };
    |                ^^^^^^
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/explicit_write.stderr b/tests/ui/explicit_write.stderr
index 9a813e897..7a2a0c66f 100644
--- a/tests/ui/explicit_write.stderr
+++ b/tests/ui/explicit_write.stderr
@@ -36,3 +36,5 @@ error: use of `stderr().write_fmt(...).unwrap()`. Consider using `eprint!` inste
 21 |         std::io::stderr().write_fmt(format_args!("test")).unwrap();
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/fallible_impl_from.stderr b/tests/ui/fallible_impl_from.stderr
index 8e93966cc..c8af77eca 100644
--- a/tests/ui/fallible_impl_from.stderr
+++ b/tests/ui/fallible_impl_from.stderr
@@ -89,3 +89,5 @@ note: potential failure(s)
    |             ^^^^^^^^^^^^^^^^^^
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/filter_methods.stderr b/tests/ui/filter_methods.stderr
index 8f1853c39..cec03a47b 100644
--- a/tests/ui/filter_methods.stderr
+++ b/tests/ui/filter_methods.stderr
@@ -36,3 +36,5 @@ error: called `filter_map(p).map(q)` on an `Iterator`. This is more succinctly e
 25 | |                                 .map(|x| x.checked_mul(2))
    | |__________________________________________________________^
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/float_cmp.stderr b/tests/ui/float_cmp.stderr
index d2903f501..a764403d0 100644
--- a/tests/ui/float_cmp.stderr
+++ b/tests/ui/float_cmp.stderr
@@ -95,3 +95,5 @@ note: std::f32::EPSILON and std::f64::EPSILON are available.
 57 |     twice(x) != twice(ONE as f64);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/float_cmp_const.stderr b/tests/ui/float_cmp_const.stderr
index fe277de28..6367ec73c 100644
--- a/tests/ui/float_cmp_const.stderr
+++ b/tests/ui/float_cmp_const.stderr
@@ -83,3 +83,5 @@ note: std::f32::EPSILON and std::f64::EPSILON are available.
 25 |     v != ONE;
    |     ^^^^^^^^
 
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/for_loop.stderr b/tests/ui/for_loop.stderr
index b09350970..1e7ff40e1 100644
--- a/tests/ui/for_loop.stderr
+++ b/tests/ui/for_loop.stderr
@@ -565,3 +565,5 @@ error: it looks like you're manually copying between slices
 549 | |     }
     | |_____^ help: try replacing the loop by: `dst[..src.len()].clone_from_slice(&src[..])`
 
+error: aborting due to 59 previous errors
+
diff --git a/tests/ui/format.stderr b/tests/ui/format.stderr
index 558e9e83c..5f5bdc02a 100644
--- a/tests/ui/format.stderr
+++ b/tests/ui/format.stderr
@@ -6,3 +6,5 @@ error: useless use of `format!`
   |
   = note: `-D useless-format` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/formatting.stderr b/tests/ui/formatting.stderr
index d121929d0..266de262e 100644
--- a/tests/ui/formatting.stderr
+++ b/tests/ui/formatting.stderr
@@ -86,3 +86,5 @@ error: possibly missing a comma here
    |
    = note: to remove this lint, add a comma or write the expr in a single line
 
+error: aborting due to 10 previous errors
+
diff --git a/tests/ui/functions.stderr b/tests/ui/functions.stderr
index c8b4db352..0a9774895 100644
--- a/tests/ui/functions.stderr
+++ b/tests/ui/functions.stderr
@@ -75,3 +75,5 @@ error: this public function dereferences a raw pointer but is not marked `unsafe
 63 |         unsafe { std::ptr::read(p) };
    |                                 ^
 
+error: aborting due to 12 previous errors
+
diff --git a/tests/ui/get_unwrap.stderr b/tests/ui/get_unwrap.stderr
index 3724cbfc8..b5ada8625 100644
--- a/tests/ui/get_unwrap.stderr
+++ b/tests/ui/get_unwrap.stderr
@@ -60,3 +60,5 @@ error: called `.get_mut().unwrap()` on a VecDeque. Using `[]` is more clear and
 40 |         *some_vecdeque.get_mut(0).unwrap() = 1;
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&mut some_vecdeque[0]`
 
+error: aborting due to 10 previous errors
+
diff --git a/tests/ui/identity_conversion.stderr b/tests/ui/identity_conversion.stderr
index 152bb8882..1ae3f229d 100644
--- a/tests/ui/identity_conversion.stderr
+++ b/tests/ui/identity_conversion.stderr
@@ -40,3 +40,5 @@ error: identical conversion
 39 |     let _ = String::from("foo".to_string());
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider removing `String::from()`: `"foo".to_string()`
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/identity_op.stderr b/tests/ui/identity_op.stderr
index c1ce8d2ec..45f579ce8 100644
--- a/tests/ui/identity_op.stderr
+++ b/tests/ui/identity_op.stderr
@@ -48,3 +48,5 @@ error: the operation is ineffective. Consider reducing it to `u`
 32 |     u & 255;
    |     ^^^^^^^
 
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/if_let_redundant_pattern_matching.stderr b/tests/ui/if_let_redundant_pattern_matching.stderr
index b15d17e37..e7bfd0275 100644
--- a/tests/ui/if_let_redundant_pattern_matching.stderr
+++ b/tests/ui/if_let_redundant_pattern_matching.stderr
@@ -24,3 +24,5 @@ error: redundant pattern matching, consider using `is_some()`
 17 |     if let Some(_) = Some(42) {
    |     -------^^^^^^^----------- help: try this: `if Some(42).is_some()`
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/if_not_else.stderr b/tests/ui/if_not_else.stderr
index f9462f422..b920ef3b6 100644
--- a/tests/ui/if_not_else.stderr
+++ b/tests/ui/if_not_else.stderr
@@ -23,3 +23,5 @@ error: Unnecessary `!=` operation
    |
    = help: change to `==` and swap the blocks of the if/else
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/implicit_hasher.stderr b/tests/ui/implicit_hasher.stderr
index aaa1e37ca..cdba5372b 100644
--- a/tests/ui/implicit_hasher.stderr
+++ b/tests/ui/implicit_hasher.stderr
@@ -133,3 +133,5 @@ help: consider adding a type parameter
 78 |         pub fn $name<S: ::std::hash::BuildHasher>(_map: &mut HashMap<i32, i32>, _set: &mut HashSet<i32, S>) {
    |
 
+error: aborting due to 10 previous errors
+
diff --git a/tests/ui/inconsistent_digit_grouping.stderr b/tests/ui/inconsistent_digit_grouping.stderr
index 2725d5f4e..12d9e3cf0 100644
--- a/tests/ui/inconsistent_digit_grouping.stderr
+++ b/tests/ui/inconsistent_digit_grouping.stderr
@@ -39,3 +39,5 @@ error: digits grouped inconsistently by underscores
   |
   = help: consider: 1.234_567_8_f32
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/infinite_iter.stderr b/tests/ui/infinite_iter.stderr
index 87b7ca493..f79db7784 100644
--- a/tests/ui/infinite_iter.stderr
+++ b/tests/ui/infinite_iter.stderr
@@ -96,3 +96,5 @@ error: possible infinite iteration detected
 30 |     (0..).all(|x| x == 24); // maybe infinite iter
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 14 previous errors
+
diff --git a/tests/ui/int_plus_one.stderr b/tests/ui/int_plus_one.stderr
index 69a8621fb..deecaffa1 100644
--- a/tests/ui/int_plus_one.stderr
+++ b/tests/ui/int_plus_one.stderr
@@ -40,3 +40,5 @@ help: change `>= y + 1` to `> y` as shown
 14 |     y < x;
    |     ^^^^^
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/invalid_ref.stderr b/tests/ui/invalid_ref.stderr
index c018bdf6d..420fed017 100644
--- a/tests/ui/invalid_ref.stderr
+++ b/tests/ui/invalid_ref.stderr
@@ -47,3 +47,5 @@ error: reference to uninitialized memory
    |
    = help: Creation of a null reference is undefined behavior; see https://doc.rust-lang.org/reference/behavior-considered-undefined.html
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/invalid_upcast_comparisons.stderr b/tests/ui/invalid_upcast_comparisons.stderr
index 3f11c3730..eb4680289 100644
--- a/tests/ui/invalid_upcast_comparisons.stderr
+++ b/tests/ui/invalid_upcast_comparisons.stderr
@@ -162,3 +162,5 @@ error: because of the numeric bounds on `u8` prior to casting, this expression i
 78 |     -5 >= (u8 as i32);
    |     ^^^^^^^^^^^^^^^^^
 
+error: aborting due to 27 previous errors
+
diff --git a/tests/ui/is_unit_expr.stderr b/tests/ui/is_unit_expr.stderr
index 64a7ad86b..7a16fe971 100644
--- a/tests/ui/is_unit_expr.stderr
+++ b/tests/ui/is_unit_expr.stderr
@@ -69,3 +69,5 @@ error: This expression evaluates to the Unit type ()
 78 |     let x3 = match None { Some(_) => {}, None => {}, };
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/item_after_statement.stderr b/tests/ui/item_after_statement.stderr
index e98e7ee12..ec1296caf 100644
--- a/tests/ui/item_after_statement.stderr
+++ b/tests/ui/item_after_statement.stderr
@@ -12,3 +12,5 @@ error: adding items after statements is confusing, since items exist from the st
 17 |     fn foo() { println!("foo"); }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/large_digit_groups.stderr b/tests/ui/large_digit_groups.stderr
index db49ded1d..6fc285274 100644
--- a/tests/ui/large_digit_groups.stderr
+++ b/tests/ui/large_digit_groups.stderr
@@ -47,3 +47,5 @@ error: digit groups should be smaller
   |
   = help: consider: 123_456.123_456_f32
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/large_enum_variant.stderr b/tests/ui/large_enum_variant.stderr
index 5c6aac7d4..5e938337b 100644
--- a/tests/ui/large_enum_variant.stderr
+++ b/tests/ui/large_enum_variant.stderr
@@ -66,3 +66,5 @@ help: consider boxing the large fields to reduce the total size of the enum
 49 |     StructLikeLarge2 { x: Box<[i32; 8000]> },
    |                           ^^^^^^^^^^^^^^^^
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/len_zero.stderr b/tests/ui/len_zero.stderr
index d23a972dd..6e3cf1b3c 100644
--- a/tests/ui/len_zero.stderr
+++ b/tests/ui/len_zero.stderr
@@ -94,3 +94,5 @@ error: trait `DependsOnFoo` has a `len` method but no (possibly inherited) `is_e
 191 | | }
     | |_^
 
+error: aborting due to 12 previous errors
+
diff --git a/tests/ui/let_if_seq.stderr b/tests/ui/let_if_seq.stderr
index 39686a9dd..b912373f9 100644
--- a/tests/ui/let_if_seq.stderr
+++ b/tests/ui/let_if_seq.stderr
@@ -46,3 +46,5 @@ error: `if _ { .. } else { .. }` is an expression
     |
     = note: you might not need `mut` at all
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/let_return.stderr b/tests/ui/let_return.stderr
index b38c9ab2e..459b2eafa 100644
--- a/tests/ui/let_return.stderr
+++ b/tests/ui/let_return.stderr
@@ -23,3 +23,5 @@ note: this expression can be directly returned
 15 |         let x = 5;
    |                 ^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/let_unit.stderr b/tests/ui/let_unit.stderr
index 196afc057..da579ec80 100644
--- a/tests/ui/let_unit.stderr
+++ b/tests/ui/let_unit.stderr
@@ -12,3 +12,5 @@ error: this let-binding has unit value. Consider omitting `let _a =`
 18 |         let _a = ();
    |         ^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/lifetimes.stderr b/tests/ui/lifetimes.stderr
index 744e1ce21..23b353d13 100644
--- a/tests/ui/lifetimes.stderr
+++ b/tests/ui/lifetimes.stderr
@@ -86,3 +86,5 @@ error: explicit lifetimes given in parameter types where they could be elided
 120 | fn trait_bound_ok<'a, T: WithLifetime<'static>>(_: &'a u8, _: T) { unimplemented!() }
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 14 previous errors
+
diff --git a/tests/ui/lint_pass.stderr b/tests/ui/lint_pass.stderr
index 66f2d62ed..2f9a6813b 100644
--- a/tests/ui/lint_pass.stderr
+++ b/tests/ui/lint_pass.stderr
@@ -6,3 +6,5 @@ error: the lint `MISSING_LINT` is not added to any `LintPass`
    |
    = note: `-D lint-without-lint-pass` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/literals.stderr b/tests/ui/literals.stderr
index bcb9dbd13..92540b734 100644
--- a/tests/ui/literals.stderr
+++ b/tests/ui/literals.stderr
@@ -86,3 +86,5 @@ help: if you mean to use an octal constant, use `0o`
 30 |     let fail8 = 0o123;
    |                 ^^^^^
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/map_clone.stderr b/tests/ui/map_clone.stderr
index 272b868a2..c29f37918 100644
--- a/tests/ui/map_clone.stderr
+++ b/tests/ui/map_clone.stderr
@@ -98,3 +98,5 @@ error: you seem to be using .map() to clone the contents of an Option, consider
    = help: try
            x.as_ref().cloned()
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/matches.stderr b/tests/ui/matches.stderr
index 62c77c778..fd22247cb 100644
--- a/tests/ui/matches.stderr
+++ b/tests/ui/matches.stderr
@@ -448,3 +448,5 @@ error: use as_mut() instead
 329 | |     };
     | |_____^ help: try this: `mut_owned.as_mut()`
 
+error: aborting due to 37 previous errors
+
diff --git a/tests/ui/mem_forget.stderr b/tests/ui/mem_forget.stderr
index c79afa829..6e7a44694 100644
--- a/tests/ui/mem_forget.stderr
+++ b/tests/ui/mem_forget.stderr
@@ -18,3 +18,5 @@ error: usage of mem::forget on Drop type
 24 |     forgetSomething(eight);
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/methods.stderr b/tests/ui/methods.stderr
index 65d8b82da..feea8e5e5 100644
--- a/tests/ui/methods.stderr
+++ b/tests/ui/methods.stderr
@@ -501,3 +501,5 @@ error: used unwrap() on an Option value. If you don't want to handle the None ca
     |
     = note: `-D option-unwrap-used` implied by `-D warnings`
 
+error: aborting due to 66 previous errors
+
diff --git a/tests/ui/min_max.stderr b/tests/ui/min_max.stderr
index e9225f93b..de4c4e16f 100644
--- a/tests/ui/min_max.stderr
+++ b/tests/ui/min_max.stderr
@@ -42,3 +42,5 @@ error: this min/max combination leads to constant result
 30 |     max(min(s, "Apple"), "Zoo");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/missing-doc.stderr b/tests/ui/missing-doc.stderr
index 340a53386..54834f902 100644
--- a/tests/ui/missing-doc.stderr
+++ b/tests/ui/missing-doc.stderr
@@ -264,3 +264,5 @@ error: missing documentation for a function
 191 |         fn also_undocumented2() {}
     |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 39 previous errors
+
diff --git a/tests/ui/module_inception.stderr b/tests/ui/module_inception.stderr
index cb6ea951a..c9d3319db 100644
--- a/tests/ui/module_inception.stderr
+++ b/tests/ui/module_inception.stderr
@@ -16,3 +16,5 @@ error: module has the same name as its containing module
 14 | |     }
    | |_____^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/modulo_one.stderr b/tests/ui/modulo_one.stderr
index 48cfe6c38..ccfca7154 100644
--- a/tests/ui/modulo_one.stderr
+++ b/tests/ui/modulo_one.stderr
@@ -6,3 +6,5 @@ error: any number modulo 1 will be 0
   |
   = note: `-D modulo-one` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/mut_from_ref.stderr b/tests/ui/mut_from_ref.stderr
index eacda70ce..a7cbc0b7a 100644
--- a/tests/ui/mut_from_ref.stderr
+++ b/tests/ui/mut_from_ref.stderr
@@ -59,3 +59,5 @@ note: immutable borrow here
 32 | fn fail_double<'a, 'b>(x: &'a u32, y: &'a u32, z: &'b mut u32) -> &'a mut u32 {
    |                           ^^^^^^^     ^^^^^^^
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/mut_mut.stderr b/tests/ui/mut_mut.stderr
index 8bfc2fc8a..d1f05ea80 100644
--- a/tests/ui/mut_mut.stderr
+++ b/tests/ui/mut_mut.stderr
@@ -57,3 +57,5 @@ error: generally you want to avoid `&mut &mut _` if possible
 35 |         let y : &mut &mut &mut u32 = &mut &mut &mut 2;
    |                      ^^^^^^^^^^^^^
 
+error: aborting due to 9 previous errors
+
diff --git a/tests/ui/mut_range_bound.stderr b/tests/ui/mut_range_bound.stderr
index 20dbb6511..d7be7ae1e 100644
--- a/tests/ui/mut_range_bound.stderr
+++ b/tests/ui/mut_range_bound.stderr
@@ -30,3 +30,5 @@ error: attempt to mutate range bound within loop; note that the range of the loo
 40 |         let n = &mut m;  // warning
    |                      ^
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/mut_reference.stderr b/tests/ui/mut_reference.stderr
index 6708bca8b..73df19bf1 100644
--- a/tests/ui/mut_reference.stderr
+++ b/tests/ui/mut_reference.stderr
@@ -18,3 +18,5 @@ error: The function/method `takes_an_immutable_reference` doesn't need a mutable
 28 |     my_struct.takes_an_immutable_reference(&mut 42);
    |                                            ^^^^^^^
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/mutex_atomic.stderr b/tests/ui/mutex_atomic.stderr
index d46c71316..354f9891c 100644
--- a/tests/ui/mutex_atomic.stderr
+++ b/tests/ui/mutex_atomic.stderr
@@ -44,3 +44,5 @@ error: Consider using an AtomicIsize instead of a Mutex here. If you just want t
 16 |     Mutex::new(0i32);
    |     ^^^^^^^^^^^^^^^^
 
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/needless_bool.stderr b/tests/ui/needless_bool.stderr
index a25b34bfa..63e063244 100644
--- a/tests/ui/needless_bool.stderr
+++ b/tests/ui/needless_bool.stderr
@@ -66,3 +66,5 @@ error: this if-then-else expression returns a bool literal
 50 |     if x && y { return false } else { return true };
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: you can reduce it to: `return !(x && y)`
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/needless_borrow.stderr b/tests/ui/needless_borrow.stderr
index 16962bb48..fde38508b 100644
--- a/tests/ui/needless_borrow.stderr
+++ b/tests/ui/needless_borrow.stderr
@@ -38,3 +38,5 @@ error: this pattern creates a reference to a reference
 50 |     let _ = v.iter().filter(|&ref a| a.is_empty());
    |                               ^^^^^ help: change this to: `a`
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/needless_borrowed_ref.stderr b/tests/ui/needless_borrowed_ref.stderr
index c85bf9f5a..2a8cf4348 100644
--- a/tests/ui/needless_borrowed_ref.stderr
+++ b/tests/ui/needless_borrowed_ref.stderr
@@ -24,3 +24,5 @@ error: this pattern takes a reference on something that is being de-referenced
 42 |         (&Animal::Cat(v), &ref k) | (&ref k, &Animal::Cat(v)) => (), // lifetime mismatch error if there is no '&ref'
    |                                      ^^^^^^ help: try removing the `&ref` part and just keep: `k`
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/needless_continue.stderr b/tests/ui/needless_continue.stderr
index f63f120fc..3e0368892 100644
--- a/tests/ui/needless_continue.stderr
+++ b/tests/ui/needless_continue.stderr
@@ -55,3 +55,5 @@ error: There is no need for an explicit `else` block for this `if` expression
            println!("Jabber");
            ...
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/needless_pass_by_value.stderr b/tests/ui/needless_pass_by_value.stderr
index 2ca96b127..33bda7d98 100644
--- a/tests/ui/needless_pass_by_value.stderr
+++ b/tests/ui/needless_pass_by_value.stderr
@@ -124,3 +124,5 @@ error: this argument is passed by value, but not consumed in the function body
 101 |         _s: Self,
     |             ^^^^ help: consider taking a reference instead: `&Self`
 
+error: aborting due to 16 previous errors
+
diff --git a/tests/ui/needless_range_loop.stderr b/tests/ui/needless_range_loop.stderr
index af78b370a..7fb4571e0 100644
--- a/tests/ui/needless_range_loop.stderr
+++ b/tests/ui/needless_range_loop.stderr
@@ -37,3 +37,5 @@ help: consider using an iterator
 35 |     for <item> in &mut ms {
    |
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/needless_return.stderr b/tests/ui/needless_return.stderr
index 68c2654c8..42dc6e659 100644
--- a/tests/ui/needless_return.stderr
+++ b/tests/ui/needless_return.stderr
@@ -48,3 +48,5 @@ error: unneeded return statement
 39 |     let _ = || return true;
    |                ^^^^^^^^^^^ help: remove `return` as shown: `true`
 
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/needless_update.stderr b/tests/ui/needless_update.stderr
index 978fd8e62..3e509870d 100644
--- a/tests/ui/needless_update.stderr
+++ b/tests/ui/needless_update.stderr
@@ -6,3 +6,5 @@ error: struct update has no effect, all the fields in the struct have already be
    |
    = note: `-D needless-update` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/neg_multiply.stderr b/tests/ui/neg_multiply.stderr
index 6ed31d384..1d52ba16e 100644
--- a/tests/ui/neg_multiply.stderr
+++ b/tests/ui/neg_multiply.stderr
@@ -12,3 +12,5 @@ error: Negation by multiplying with -1
 32 |     -1 * x;
    |     ^^^^^^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/never_loop.stderr b/tests/ui/never_loop.stderr
index e62fe0c29..83c10c9b1 100644
--- a/tests/ui/never_loop.stderr
+++ b/tests/ui/never_loop.stderr
@@ -90,3 +90,5 @@ error: this loop never actually loops
 160 | |         }
     | |_________^
 
+error: aborting due to 9 previous errors
+
diff --git a/tests/ui/new_without_default.stderr b/tests/ui/new_without_default.stderr
index c12c10b9a..335e60404 100644
--- a/tests/ui/new_without_default.stderr
+++ b/tests/ui/new_without_default.stderr
@@ -36,3 +36,5 @@ help: try this
 67 | }
    |
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/no_effect.stderr b/tests/ui/no_effect.stderr
index 0d8d6624a..5bcab9f2b 100644
--- a/tests/ui/no_effect.stderr
+++ b/tests/ui/no_effect.stderr
@@ -278,3 +278,5 @@ error: statement can be reduced
 115 |     FooString { s: String::from("blah"), };
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `String::from("blah");`
 
+error: aborting due to 46 previous errors
+
diff --git a/tests/ui/non_expressive_names.stderr b/tests/ui/non_expressive_names.stderr
index 6412b47aa..850a3ccd9 100644
--- a/tests/ui/non_expressive_names.stderr
+++ b/tests/ui/non_expressive_names.stderr
@@ -149,3 +149,5 @@ error: consider choosing a more descriptive name
 141 |     let __1___2 = 12; //~ERROR Consider a more descriptive name
     |         ^^^^^^^
 
+error: aborting due to 14 previous errors
+
diff --git a/tests/ui/ok_expect.stderr b/tests/ui/ok_expect.stderr
index 79b09b3fa..da2d3b950 100644
--- a/tests/ui/ok_expect.stderr
+++ b/tests/ui/ok_expect.stderr
@@ -30,3 +30,5 @@ error: called `ok().expect()` on a Result value. You can call `expect` directly
 26 |     res6.ok().expect("meh");
    |     ^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/ok_if_let.stderr b/tests/ui/ok_if_let.stderr
index b696672d2..e1371d924 100644
--- a/tests/ui/ok_if_let.stderr
+++ b/tests/ui/ok_if_let.stderr
@@ -11,3 +11,5 @@ error: Matching on `Some` with `ok()` is redundant
    = note: `-D if-let-some-result` implied by `-D warnings`
    = help: Consider matching on `Ok(y)` and removing the call to `ok` instead
 
+error: aborting due to previous error
+
diff --git a/tests/ui/op_ref.stderr b/tests/ui/op_ref.stderr
index 325969445..a4f7b3c67 100644
--- a/tests/ui/op_ref.stderr
+++ b/tests/ui/op_ref.stderr
@@ -10,3 +10,5 @@ help: use the values directly
 13 |     let foo = 5 - 6;
    |
 
+error: aborting due to previous error
+
diff --git a/tests/ui/open_options.stderr b/tests/ui/open_options.stderr
index 2f4070c28..f0d419041 100644
--- a/tests/ui/open_options.stderr
+++ b/tests/ui/open_options.stderr
@@ -42,3 +42,5 @@ error: the method "truncate" is called more than once
 15 |     OpenOptions::new().truncate(true).truncate(false).open("foo.txt");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/overflow_check_conditional.stderr b/tests/ui/overflow_check_conditional.stderr
index 6efcbfe38..adf353a1c 100644
--- a/tests/ui/overflow_check_conditional.stderr
+++ b/tests/ui/overflow_check_conditional.stderr
@@ -48,3 +48,5 @@ error: You are trying to use classic C underflow conditions that will fail in Ru
 32 |     if a < a - b {
    |        ^^^^^^^^^
 
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/panic.stderr b/tests/ui/panic.stderr
index f2480dfea..25113ed80 100644
--- a/tests/ui/panic.stderr
+++ b/tests/ui/panic.stderr
@@ -18,3 +18,5 @@ error: you probably are missing some parameter in your format string
 12 |         assert!(true, "here be missing values: {}");
    |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/partialeq_ne_impl.stderr b/tests/ui/partialeq_ne_impl.stderr
index c332ce53c..5e536cc51 100644
--- a/tests/ui/partialeq_ne_impl.stderr
+++ b/tests/ui/partialeq_ne_impl.stderr
@@ -6,3 +6,5 @@ error: re-implementing `PartialEq::ne` is unnecessary
    |
    = note: `-D partialeq-ne-impl` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/patterns.stderr b/tests/ui/patterns.stderr
index 9a246c483..59bce3a9a 100644
--- a/tests/ui/patterns.stderr
+++ b/tests/ui/patterns.stderr
@@ -6,3 +6,5 @@ error: the `y @ _` pattern can be written as just `y`
    |
    = note: `-D redundant-pattern` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/precedence.stderr b/tests/ui/precedence.stderr
index 26fbd7516..9f0e53ffc 100644
--- a/tests/ui/precedence.stderr
+++ b/tests/ui/precedence.stderr
@@ -54,3 +54,5 @@ error: unary minus has lower precedence than method call
 16 |     -1f32.abs();
    |     ^^^^^^^^^^^ help: consider adding parentheses to clarify your intent: `-(1f32.abs())`
 
+error: aborting due to 9 previous errors
+
diff --git a/tests/ui/print.stderr b/tests/ui/print.stderr
index fa547949b..789e1218b 100644
--- a/tests/ui/print.stderr
+++ b/tests/ui/print.stderr
@@ -50,3 +50,5 @@ error: use of `Debug`-based formatting
 31 |     print!("Hello {:#?}", "#orld");
    |                           ^^^^^^^
 
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/print_with_newline.stderr b/tests/ui/print_with_newline.stderr
index 0148a470e..4f32d1b2a 100644
--- a/tests/ui/print_with_newline.stderr
+++ b/tests/ui/print_with_newline.stderr
@@ -6,3 +6,5 @@ error: using `print!()` with a format string that ends in a newline, consider us
   |
   = note: `-D print-with-newline` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/println_empty_string.stderr b/tests/ui/println_empty_string.stderr
index 2036d7d97..f70b056e5 100644
--- a/tests/ui/println_empty_string.stderr
+++ b/tests/ui/println_empty_string.stderr
@@ -6,3 +6,5 @@ error: using `println!("")`
   |
   = note: `-D print-with-newline` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/ptr_arg.stderr b/tests/ui/ptr_arg.stderr
index 4fbf73183..bf8608111 100644
--- a/tests/ui/ptr_arg.stderr
+++ b/tests/ui/ptr_arg.stderr
@@ -76,3 +76,5 @@ help: change `y.as_str()` to
 62 |     let c = y;
    |             ^
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/range.stderr b/tests/ui/range.stderr
index 4098d32d0..fc51f1a07 100644
--- a/tests/ui/range.stderr
+++ b/tests/ui/range.stderr
@@ -38,3 +38,5 @@ error: Iterator::step_by(0) will panic at runtime
 33 |     let _ = v1.iter().step_by(2/3);
    |             ^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/range_plus_minus_one.stderr b/tests/ui/range_plus_minus_one.stderr
index a2a3ae607..cc0038c34 100644
--- a/tests/ui/range_plus_minus_one.stderr
+++ b/tests/ui/range_plus_minus_one.stderr
@@ -65,3 +65,5 @@ error: an inclusive range would be more readable
    |             help: use: `(f()+1)..=f()`
    |             in this macro invocation
 
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/redundant_closure_call.stderr b/tests/ui/redundant_closure_call.stderr
index 5acc3e9dd..d2b5616a4 100644
--- a/tests/ui/redundant_closure_call.stderr
+++ b/tests/ui/redundant_closure_call.stderr
@@ -30,3 +30,5 @@ error: Try not to call a closure in the expression where it is declared.
 12 |     k = (|a,b| a*b)(1,5);
    |         ^^^^^^^^^^^^^^^^
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/reference.stderr b/tests/ui/reference.stderr
index 2e6b23f6d..741c0cc10 100644
--- a/tests/ui/reference.stderr
+++ b/tests/ui/reference.stderr
@@ -66,3 +66,5 @@ error: immediately dereferencing a reference
 53 |         let y = **&mut &mut x;
    |                  ^^^^^^^^^^^^ help: try this: `&mut x`
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/regex.stderr b/tests/ui/regex.stderr
index 9f1397990..433061e41 100644
--- a/tests/ui/regex.stderr
+++ b/tests/ui/regex.stderr
@@ -149,3 +149,5 @@ error: trivial regex
    |
    = help: consider using consider using `str::is_empty`
 
+error: aborting due to 21 previous errors
+
diff --git a/tests/ui/replace_consts.stderr b/tests/ui/replace_consts.stderr
index a8e3dd2d0..fb2e71db1 100644
--- a/tests/ui/replace_consts.stderr
+++ b/tests/ui/replace_consts.stderr
@@ -214,3 +214,5 @@ error: using `MAX`
 47 |     { let foo = std::u128::MAX; };
    |                 ^^^^^^^^^^^^^^ help: try this: `u128::max_value()`
 
+error: aborting due to 35 previous errors
+
diff --git a/tests/ui/serde.stderr b/tests/ui/serde.stderr
index da0a96b2a..58667e0f8 100644
--- a/tests/ui/serde.stderr
+++ b/tests/ui/serde.stderr
@@ -10,3 +10,5 @@ error: you should not implement `visit_string` without also implementing `visit_
    |
    = note: `-D serde-api-misuse` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/shadow.stderr b/tests/ui/shadow.stderr
index d50432611..0eb5e5b2a 100644
--- a/tests/ui/shadow.stderr
+++ b/tests/ui/shadow.stderr
@@ -134,3 +134,5 @@ note: previous binding is here
 21 |     let x = y;
    |         ^
 
+error: aborting due to 9 previous errors
+
diff --git a/tests/ui/short_circuit_statement.stderr b/tests/ui/short_circuit_statement.stderr
index d7a02d7b9..7697cbd1c 100644
--- a/tests/ui/short_circuit_statement.stderr
+++ b/tests/ui/short_circuit_statement.stderr
@@ -18,3 +18,5 @@ error: boolean short circuit operator in statement may be clearer using an expli
 9 |     1 == 2 || g();
   |     ^^^^^^^^^^^^^^ help: replace it with: `if !(1 == 2) { g(); }`
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/single_char_pattern.stderr b/tests/ui/single_char_pattern.stderr
index d5f21f210..42ee2b9fe 100644
--- a/tests/ui/single_char_pattern.stderr
+++ b/tests/ui/single_char_pattern.stderr
@@ -102,3 +102,5 @@ error: single-character string constant used as pattern
 37 |     x.trim_right_matches("x");
    |     ---------------------^^^- help: try using a char instead: `x.trim_right_matches('x')`
 
+error: aborting due to 17 previous errors
+
diff --git a/tests/ui/starts_ends_with.stderr b/tests/ui/starts_ends_with.stderr
index c67cc8a86..7d73f201b 100644
--- a/tests/ui/starts_ends_with.stderr
+++ b/tests/ui/starts_ends_with.stderr
@@ -74,3 +74,5 @@ error: you should use the `ends_with` method
 38 |     Some(' ') != "".chars().next_back();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: like this: `!"".ends_with(' ')`
 
+error: aborting due to 12 previous errors
+
diff --git a/tests/ui/string_extend.stderr b/tests/ui/string_extend.stderr
index 1f6d94007..4be2037ad 100644
--- a/tests/ui/string_extend.stderr
+++ b/tests/ui/string_extend.stderr
@@ -18,3 +18,5 @@ error: calling `.extend(_.chars())`
 22 |     s.extend(def.chars());
    |     ^^^^^^^^^^^^^^^^^^^^^ help: try this: `s.push_str(&def)`
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/strings.stderr b/tests/ui/strings.stderr
index a8fd59e12..d098ce9df 100644
--- a/tests/ui/strings.stderr
+++ b/tests/ui/strings.stderr
@@ -72,3 +72,5 @@ error: manual implementation of an assign operation
 65 |     ; x = x + 1;
    |       ^^^^^^^^^ help: replace it with: `x += 1`
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/stutter.stderr b/tests/ui/stutter.stderr
index e6465a2bc..25e857991 100644
--- a/tests/ui/stutter.stderr
+++ b/tests/ui/stutter.stderr
@@ -30,3 +30,5 @@ error: item name starts with its containing module's name
 12 |     pub struct Foo7Bar;
    |     ^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/swap.stderr b/tests/ui/swap.stderr
index 0bda9bc8d..a01ec375e 100644
--- a/tests/ui/swap.stderr
+++ b/tests/ui/swap.stderr
@@ -65,3 +65,5 @@ error: this looks like you are trying to swap `c.0` and `a`
    |
    = note: or maybe you should use `std::mem::replace`?
 
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/temporary_assignment.stderr b/tests/ui/temporary_assignment.stderr
index 73a4818ba..979720c91 100644
--- a/tests/ui/temporary_assignment.stderr
+++ b/tests/ui/temporary_assignment.stderr
@@ -12,3 +12,5 @@ error: assignment to temporary
 30 |     (0, 0).0 = 1;
    |     ^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/toplevel_ref_arg.stderr b/tests/ui/toplevel_ref_arg.stderr
index 525b181bf..f360e8532 100644
--- a/tests/ui/toplevel_ref_arg.stderr
+++ b/tests/ui/toplevel_ref_arg.stderr
@@ -30,3 +30,5 @@ error: `ref` on an entire `let` pattern is discouraged, take a reference with `&
 24 |   let ref mut z = 1 + 2;
    |   ----^^^^^^^^^--------- help: try: `let z = &mut (1 + 2);`
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/trailing_zeros.stderr b/tests/ui/trailing_zeros.stderr
index 0a4b5361d..91e4d59da 100644
--- a/tests/ui/trailing_zeros.stderr
+++ b/tests/ui/trailing_zeros.stderr
@@ -12,3 +12,5 @@ error: bit mask could be simplified with a call to `trailing_zeros`
 8 |     let _ = x & 0b1_1111 == 0; // suggest trailing_zeros
   |             ^^^^^^^^^^^^^^^^^ help: try: `x.trailing_zeros() >= 5`
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/transmute.stderr b/tests/ui/transmute.stderr
index 6504f5584..f3ac9a101 100644
--- a/tests/ui/transmute.stderr
+++ b/tests/ui/transmute.stderr
@@ -204,3 +204,5 @@ error: transmute from a `&mut [u8]` to a `&mut str`
 140 |     let _: &mut str = unsafe { std::mem::transmute(mb) };
     |                                ^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `std::str::from_utf8_mut(mb).unwrap()`
 
+error: aborting due to 32 previous errors
+
diff --git a/tests/ui/transmute_64bit.stderr b/tests/ui/transmute_64bit.stderr
index b679b9138..3a6a6e73f 100644
--- a/tests/ui/transmute_64bit.stderr
+++ b/tests/ui/transmute_64bit.stderr
@@ -12,3 +12,5 @@ error: transmute from a `f64` to a pointer
 11 |         let _: *mut usize = std::mem::transmute(6.0f64);
    |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/types.stderr b/tests/ui/types.stderr
index a2f4ede5c..b41bff7a9 100644
--- a/tests/ui/types.stderr
+++ b/tests/ui/types.stderr
@@ -6,3 +6,5 @@ error: casting i32 to i64 may become silently lossy if types change
   |
   = note: `-D cast-lossless` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/unicode.stderr b/tests/ui/unicode.stderr
index 870a12ee4..9e99a44bb 100644
--- a/tests/ui/unicode.stderr
+++ b/tests/ui/unicode.stderr
@@ -28,3 +28,5 @@ error: literal non-ASCII character detected
    = help: Consider replacing the string with:
            ""/u{dc}ben!""
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/unit_cmp.stderr b/tests/ui/unit_cmp.stderr
index a85e4150a..51ad3fca9 100644
--- a/tests/ui/unit_cmp.stderr
+++ b/tests/ui/unit_cmp.stderr
@@ -12,3 +12,5 @@ error: >-comparison of unit values detected. This will always be false
 19 |     if { true; } > { false; } {
    |        ^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/unnecessary_clone.stderr b/tests/ui/unnecessary_clone.stderr
index bb78bfa16..486d2e350 100644
--- a/tests/ui/unnecessary_clone.stderr
+++ b/tests/ui/unnecessary_clone.stderr
@@ -80,3 +80,5 @@ error: called `cloned().collect()` on a slice to create a `Vec`. Calling `to_vec
    |
    = note: `-D iter-cloned-collect` implied by `-D warnings`
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/unneeded_field_pattern.stderr b/tests/ui/unneeded_field_pattern.stderr
index ef1a8d757..7e4c3a6cb 100644
--- a/tests/ui/unneeded_field_pattern.stderr
+++ b/tests/ui/unneeded_field_pattern.stderr
@@ -15,3 +15,5 @@ error: All the struct fields are matched to a wildcard pattern, consider using `
    |
    = help: Try with `Foo { .. }` instead
 
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/unreadable_literal.stderr b/tests/ui/unreadable_literal.stderr
index 81b69937a..72cb160fa 100644
--- a/tests/ui/unreadable_literal.stderr
+++ b/tests/ui/unreadable_literal.stderr
@@ -31,3 +31,5 @@ error: long literal lacking separators
   |
   = help: consider: 1.234_56_f32
 
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/unsafe_removed_from_name.stderr b/tests/ui/unsafe_removed_from_name.stderr
index 7d455d31b..93f2ddd53 100644
--- a/tests/ui/unsafe_removed_from_name.stderr
+++ b/tests/ui/unsafe_removed_from_name.stderr
@@ -18,3 +18,5 @@ error: removed "unsafe" from the name of `Unsafe` in use as `LieAboutModSafety`
 23 | use mod_with_some_unsafe_things::Unsafe as LieAboutModSafety;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/unused_io_amount.stderr b/tests/ui/unused_io_amount.stderr
index b4a3cb212..5114d375f 100644
--- a/tests/ui/unused_io_amount.stderr
+++ b/tests/ui/unused_io_amount.stderr
@@ -39,3 +39,5 @@ error: handle read amount returned or use `Read::read_exact` instead
 27 |     s.read(&mut buf).unwrap();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/unused_labels.stderr b/tests/ui/unused_labels.stderr
index 338eb2f15..19c91e2a6 100644
--- a/tests/ui/unused_labels.stderr
+++ b/tests/ui/unused_labels.stderr
@@ -22,3 +22,5 @@ error: unused label `'same_label_in_two_fns`
 34 | |     }
    | |_____^
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/unused_lt.stderr b/tests/ui/unused_lt.stderr
index a4f01de18..b1fcebe6e 100644
--- a/tests/ui/unused_lt.stderr
+++ b/tests/ui/unused_lt.stderr
@@ -18,3 +18,5 @@ error: this lifetime isn't used in the function definition
 50 |     fn x<'a>(&self) {}
    |          ^^
 
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/use_self.stderr b/tests/ui/use_self.stderr
index 9d316dd3e..bfd334335 100644
--- a/tests/ui/use_self.stderr
+++ b/tests/ui/use_self.stderr
@@ -36,3 +36,5 @@ error: unnecessary structure name repetition
 24 |             Foo::new()
    |             ^^^^^^^^ help: use the applicable keyword: `Self`
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/used_underscore_binding.stderr b/tests/ui/used_underscore_binding.stderr
index 388a34914..712f81c1b 100644
--- a/tests/ui/used_underscore_binding.stderr
+++ b/tests/ui/used_underscore_binding.stderr
@@ -30,3 +30,5 @@ error: used binding `_underscore_field` which is prefixed with an underscore. A
 36 |     s._underscore_field += 1;
    |     ^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 5 previous errors
+
diff --git a/tests/ui/useless_asref.stderr b/tests/ui/useless_asref.stderr
index 4b6af9b87..875d830a3 100644
--- a/tests/ui/useless_asref.stderr
+++ b/tests/ui/useless_asref.stderr
@@ -70,3 +70,5 @@ error: this call to `as_ref` does nothing
 106 |     foo_rt(mrt.as_ref());
     |            ^^^^^^^^^^^^ help: try this: `mrt`
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/useless_attribute.stderr b/tests/ui/useless_attribute.stderr
index 0bb87f8c5..707a11d55 100644
--- a/tests/ui/useless_attribute.stderr
+++ b/tests/ui/useless_attribute.stderr
@@ -6,3 +6,5 @@ error: useless lint attribute
   |
   = note: `-D useless-attribute` implied by `-D warnings`
 
+error: aborting due to previous error
+
diff --git a/tests/ui/vec.stderr b/tests/ui/vec.stderr
index a1555bc79..6a47eb5b0 100644
--- a/tests/ui/vec.stderr
+++ b/tests/ui/vec.stderr
@@ -36,3 +36,5 @@ error: useless use of `vec!`
 49 |     for a in vec![1, 2, 3] {
    |              ^^^^^^^^^^^^^ help: you can use a slice directly: `&[1, 2, 3]`
 
+error: aborting due to 6 previous errors
+
diff --git a/tests/ui/while_loop.stderr b/tests/ui/while_loop.stderr
index edc88405c..689c92d6f 100644
--- a/tests/ui/while_loop.stderr
+++ b/tests/ui/while_loop.stderr
@@ -110,3 +110,5 @@ error: this loop could be written as a `for` loop
 184 | |         }
     | |_________^ help: try: `for v in y { .. }`
 
+error: aborting due to 11 previous errors
+
diff --git a/tests/ui/wrong_self_convention.stderr b/tests/ui/wrong_self_convention.stderr
index e57ffc326..216fd0bb8 100644
--- a/tests/ui/wrong_self_convention.stderr
+++ b/tests/ui/wrong_self_convention.stderr
@@ -72,3 +72,5 @@ error: methods called `from_*` usually take no self; consider choosing a less am
 54 |     pub fn from_i64(self) {}
    |                     ^^^^
 
+error: aborting due to 12 previous errors
+
diff --git a/tests/ui/zero_div_zero.stderr b/tests/ui/zero_div_zero.stderr
index 697432af4..b81e59c07 100644
--- a/tests/ui/zero_div_zero.stderr
+++ b/tests/ui/zero_div_zero.stderr
@@ -57,3 +57,5 @@ error: constant division of 0.0 with 0.0 will always result in NaN
    |
    = help: Consider using `std::f64::NAN` if you would like a constant representing NaN
 
+error: aborting due to 8 previous errors
+
diff --git a/tests/ui/zero_ptr.stderr b/tests/ui/zero_ptr.stderr
index fb87a4753..5155dc401 100644
--- a/tests/ui/zero_ptr.stderr
+++ b/tests/ui/zero_ptr.stderr
@@ -12,3 +12,5 @@ error: `0 as *mut _` detected. Consider using `ptr::null_mut()`
 7 |     let y = 0 as *mut f64;
   |             ^^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+