diff --git a/src/test/ui/issue-47377-1.stderr b/src/test/ui/issue-47377-1.stderr
deleted file mode 100644
index aad5373ae00dd..0000000000000
--- a/src/test/ui/issue-47377-1.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0369]: binary operation `+` cannot be applied to type `&str`
-  --> $DIR/issue-47377-1.rs:13:37
-   |
-13 |         println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!"; //~ERROR 13:37: 13:51: binary operation `+` cannot be applied to type `&str` [E0369]
-   |                                          ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings
-help: `to_owned()` can be used to create an owned `String` from a string reference. String concatenation appends the string on the right to the string on the left and may require reallocation. This requires ownership of the string on the left
-   |
-13 |         println!("🦀🦀🦀🦀🦀"); let _a = b.to_owned() + ", World!"; //~ERROR 13:37: 13:51: binary operation `+` cannot be applied to type `&str` [E0369]
-   |                                          ^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/issue-47377.rs b/src/test/ui/issue-47377.rs
index 2a8f2e30c0e88..f2e18590ddef5 100644
--- a/src/test/ui/issue-47377.rs
+++ b/src/test/ui/issue-47377.rs
@@ -7,8 +7,8 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-
 fn main(){
     let b = "hello";
-    let _a = b + ", World!"; //~ERROR 13:14: 13:28: binary operation `+` cannot be applied to type `&str` [E0369]
-}
\ No newline at end of file
+    let _a = b + ", World!";
+    //~^ ERROR E0369
+}
diff --git a/src/test/ui/issue-47377.stderr b/src/test/ui/issue-47377.stderr
index e9f285a19c3d9..b80867f1714a0 100644
--- a/src/test/ui/issue-47377.stderr
+++ b/src/test/ui/issue-47377.stderr
@@ -1,11 +1,11 @@
 error[E0369]: binary operation `+` cannot be applied to type `&str`
-  --> $DIR/issue-47377.rs:13:14
+  --> $DIR/issue-47377.rs:12:14
    |
-13 |     let _a = b + ", World!"; //~ERROR 13:14: 13:28: binary operation `+` cannot be applied to type `&str` [E0369]
+12 |     let _a = b + ", World!";
    |              ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings
 help: `to_owned()` can be used to create an owned `String` from a string reference. String concatenation appends the string on the right to the string on the left and may require reallocation. This requires ownership of the string on the left
    |
-13 |     let _a = b.to_owned() + ", World!"; //~ERROR 13:14: 13:28: binary operation `+` cannot be applied to type `&str` [E0369]
+12 |     let _a = b.to_owned() + ", World!";
    |              ^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/issue-47377-1.rs b/src/test/ui/issue-47380.rs
similarity index 76%
rename from src/test/ui/issue-47377-1.rs
rename to src/test/ui/issue-47380.rs
index f173d0096381b..748891fad5aab 100644
--- a/src/test/ui/issue-47377-1.rs
+++ b/src/test/ui/issue-47380.rs
@@ -7,8 +7,9 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-
+// ignore-tidy-tab
 fn main(){
     let b = "hello";
-        println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!"; //~ERROR 13:37: 13:51: binary operation `+` cannot be applied to type `&str` [E0369]
-}
\ No newline at end of file
+    println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!";
+    //~^ ERROR E0369
+}
diff --git a/src/test/ui/issue-47380.stderr b/src/test/ui/issue-47380.stderr
new file mode 100644
index 0000000000000..8ead1697c7f68
--- /dev/null
+++ b/src/test/ui/issue-47380.stderr
@@ -0,0 +1,12 @@
+error[E0369]: binary operation `+` cannot be applied to type `&str`
+  --> $DIR/blah.rs:13:33
+   |
+13 |     println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!";
+   |                                      ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings
+help: `to_owned()` can be used to create an owned `String` from a string reference. String concatenation appends the string on the right to the string on the left and may require reallocation. This requires ownership of the string on the left
+   |
+13 |     println!("🦀🦀🦀🦀🦀"); let _a = b.to_owned() + ", World!";
+   |                                      ^^^^^^^^^^^^
+
+error: aborting due to previous error
+