diff --git a/src/test/ui/coherence/coherence-subtyping.stderr b/src/test/ui/coherence/coherence-subtyping.stderr
index 92ac829f8000b263f9682011aaa563631d0b5bf3..eb68768eed07202f77ffa678475c8997d86cb0f2 100644
--- a/src/test/ui/coherence/coherence-subtyping.stderr
+++ b/src/test/ui/coherence/coherence-subtyping.stderr
@@ -1,5 +1,5 @@
 error[E0119]: conflicting implementations of trait `Contravariant` for type `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`:
-  --> $DIR/coherence-subtyping.rs:21:1
+  --> $DIR/coherence-subtyping.rs:11:1
    |
 LL | impl Contravariant for for<'a,'b> fn(&'a u8, &'b u8) -> &'a u8 {
    | -------------------------------------------------------------- first implementation here
@@ -8,7 +8,7 @@ LL | impl Contravariant for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
 
 error[E0119]: conflicting implementations of trait `Covariant` for type `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`:
-  --> $DIR/coherence-subtyping.rs:34:1
+  --> $DIR/coherence-subtyping.rs:24:1
    |
 LL | impl Covariant for for<'a,'b> fn(&'a u8, &'b u8) -> &'a u8 {
    | ---------------------------------------------------------- first implementation here
@@ -17,7 +17,7 @@ LL | impl Covariant for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
 
 error[E0119]: conflicting implementations of trait `Invariant` for type `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`:
-  --> $DIR/coherence-subtyping.rs:47:1
+  --> $DIR/coherence-subtyping.rs:37:1
    |
 LL | impl Invariant for for<'a,'b> fn(&'a u8, &'b u8) -> &'a u8 {
    | ---------------------------------------------------------- first implementation here
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
index 1225842665d99dca0e398facf43d817b934a28e0..bb1a828f3da4b5d566780e3328d707a0df243707 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
@@ -11,8 +11,8 @@ LL | |                              fn(&'x u32)) }
    = note: expected type `std::option::Option<for<'a> fn(&'a u32)>`
               found type `std::option::Option<fn(&'x u32)>`
    = note: lifetime RePlaceholder(Placeholder { universe: U1, name: BrNamed(crate0:DefIndex(1:23), 'a) })...
-note: ...does not necessarily outlive the lifetime 'x as defined on the function body at 48:22
-  --> $DIR/hr-subtype.rs:48:22
+note: ...does not necessarily outlive the lifetime 'x as defined on the function body at 38:22
+  --> $DIR/hr-subtype.rs:38:22
    |
 LL |           fn supertype<'x,'y:'x,'z:'y>() {
    |                        ^^
diff --git a/src/test/ui/issues/issue-22872.rs b/src/test/ui/issues/issue-22872.rs
index a6130d21b5d396953e7aa8028c234ef42c0fc333..8ef4af15bd462b957ae1313e422f93bb8c1c153f 100644
--- a/src/test/ui/issues/issue-22872.rs
+++ b/src/test/ui/issues/issue-22872.rs
@@ -19,7 +19,6 @@ pub trait Process<'a> {
 fn push_process<P>(process: P) where P: Process<'static> {
     let _: Box<for<'b> Wrap<'b>> = Box::new(Wrapper(process));
 //~^ ERROR is not an iterator
-//~| ERROR is not satisfied
 }
 
 fn main() {}
diff --git a/src/test/ui/lub-glb/old-lub-glb-object.stderr b/src/test/ui/lub-glb/old-lub-glb-object.stderr
index 3a7478b73b85a588cb2ddffa251ed1b298833fd5..2ed180f25dc025ea614452ce772b5095eb7018a0 100644
--- a/src/test/ui/lub-glb/old-lub-glb-object.stderr
+++ b/src/test/ui/lub-glb/old-lub-glb-object.stderr
@@ -1,4 +1,4 @@
-error[E0308]: match arms have incompatible types
+error[E0495]: cannot infer an appropriate lifetime for lifetime parameter 'a in generic type due to conflicting requirements
   --> $DIR/old-lub-glb-object.rs:10:13
    |
 LL |       let z = match 22 { //~ ERROR cannot infer