diff --git a/src/test/compile-fail/E0081.rs b/src/test/compile-fail/E0081.rs
index 9911e093a8980..e12eff72c7f41 100644
--- a/src/test/compile-fail/E0081.rs
+++ b/src/test/compile-fail/E0081.rs
@@ -9,10 +9,10 @@
 // except according to those terms.
 
 enum Enum {
-    P = 3, //~ NOTE first use of `3isize`
+    P = 3, //~ NOTE first use of `3`
     X = 3,
-    //~^ ERROR discriminant value `3isize` already exists
-    //~| NOTE enum already has `3isize`
+    //~^ ERROR discriminant value `3` already exists
+    //~| NOTE enum already has `3`
     Y = 5
 }
 
diff --git a/src/test/compile-fail/issue-15524.rs b/src/test/compile-fail/issue-15524.rs
index 658a0c1546b9f..0d5f5fd75eba8 100644
--- a/src/test/compile-fail/issue-15524.rs
+++ b/src/test/compile-fail/issue-15524.rs
@@ -12,20 +12,20 @@ const N: isize = 1;
 
 enum Foo {
     A = 1,
-    //~^ NOTE first use of `1isize`
-    //~| NOTE first use of `1isize`
-    //~| NOTE first use of `1isize`
+    //~^ NOTE first use of `1`
+    //~| NOTE first use of `1`
+    //~| NOTE first use of `1`
     B = 1,
-    //~^ ERROR discriminant value `1isize` already exists
-    //~| NOTE enum already has `1isize`
+    //~^ ERROR discriminant value `1` already exists
+    //~| NOTE enum already has `1`
     C = 0,
     D,
-    //~^ ERROR discriminant value `1isize` already exists
-    //~| NOTE enum already has `1isize`
+    //~^ ERROR discriminant value `1` already exists
+    //~| NOTE enum already has `1`
 
     E = N,
-    //~^ ERROR discriminant value `1isize` already exists
-    //~| NOTE enum already has `1isize`
+    //~^ ERROR discriminant value `1` already exists
+    //~| NOTE enum already has `1`
 
 }
 
diff --git a/src/test/ui/custom-derive/issue-36935.stderr b/src/test/ui/custom-derive/issue-36935.stderr
index 9a5e2de14e3b0..46cc7a42b0429 100644
--- a/src/test/ui/custom-derive/issue-36935.stderr
+++ b/src/test/ui/custom-derive/issue-36935.stderr
@@ -1,7 +1,7 @@
 error: proc-macro derive panicked
-  --> $DIR/issue-36935.rs:17:15
+  --> $DIR/issue-36935.rs:18:15
    |
-17 | #[derive(Foo, Bar)]
+18 | #[derive(Foo, Bar)]
    |               ^^^
    |
    = help: message: lolnope