diff --git a/src/test/rustdoc-ui/track-diagnostics.rs b/src/test/rustdoc-ui/track-diagnostics.rs
index 3da80adbf44..fcc50a7aba0 100644
--- a/src/test/rustdoc-ui/track-diagnostics.rs
+++ b/src/test/rustdoc-ui/track-diagnostics.rs
@@ -3,7 +3,7 @@
 
 // Normalize the emitted location so this doesn't need
 // updating everytime someone adds or removes a line.
-// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL"
+// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
 
 struct A;
 struct B;
diff --git a/src/test/rustdoc-ui/track-diagnostics.stderr b/src/test/rustdoc-ui/track-diagnostics.stderr
index 5a0982ff731..ec303186253 100644
--- a/src/test/rustdoc-ui/track-diagnostics.stderr
+++ b/src/test/rustdoc-ui/track-diagnostics.stderr
@@ -1,9 +1,9 @@
 error[E0308]: mismatched types
-  --> $DIR/track-diagnostics.rs:$LINE::$COL
+  --> $DIR/track-diagnostics.rs:LL:CC
    |
 LL | const S: A = B;
    |              ^ expected struct `A`, found struct `B`
--Ztrack-diagnostics: created at compiler/rustc_infer/src/infer/error_reporting/mod.rs:$LINE::$COL
+-Ztrack-diagnostics: created at compiler/rustc_infer/src/infer/error_reporting/mod.rs:LL:CC
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/track-diagnostics/track.rs b/src/test/ui/track-diagnostics/track.rs
index 23c0c8c4ed8..61b9137eadd 100644
--- a/src/test/ui/track-diagnostics/track.rs
+++ b/src/test/ui/track-diagnostics/track.rs
@@ -3,7 +3,7 @@
 
 // Normalize the emitted location so this doesn't need
 // updating everytime someone adds or removes a line.
-// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL"
+// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
 // normalize-stderr-test "note: rustc .+ running on .+" -> "note: rustc $$VERSION running on $$TARGET"
 
 fn main() {
diff --git a/src/test/ui/track-diagnostics/track.stderr b/src/test/ui/track-diagnostics/track.stderr
index ed5c70b5a06..d23f625c2d1 100644
--- a/src/test/ui/track-diagnostics/track.stderr
+++ b/src/test/ui/track-diagnostics/track.stderr
@@ -1,16 +1,16 @@
 error[E0425]: cannot find value `rust` in this scope
-  --> $DIR/track.rs:$LINE::$COL
+  --> $DIR/track.rs:LL:CC
    |
 LL |     break rust
    |           ^^^^ not found in this scope
--Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:$LINE::$COL
+-Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:LL:CC
 
 error[E0268]: `break` outside of a loop
-  --> $DIR/track.rs:$LINE::$COL
+  --> $DIR/track.rs:LL:CC
    |
 LL |     break rust
    |     ^^^^^^^^^^ cannot `break` outside of a loop
--Ztrack-diagnostics: created at compiler/rustc_passes/src/errors.rs:$LINE::$COL
+-Ztrack-diagnostics: created at compiler/rustc_passes/src/errors.rs:LL:CC
 
 error: internal compiler error: It looks like you're trying to break rust; would you like some ICE?
 
diff --git a/src/test/ui/track-diagnostics/track2.rs b/src/test/ui/track-diagnostics/track2.rs
index 45afd081566..dc105c61d72 100644
--- a/src/test/ui/track-diagnostics/track2.rs
+++ b/src/test/ui/track-diagnostics/track2.rs
@@ -3,7 +3,7 @@
 
 // Normalize the emitted location so this doesn't need
 // updating everytime someone adds or removes a line.
-// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL"
+// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
 
 fn main() {
     let _moved @ _from = String::from("foo");
diff --git a/src/test/ui/track-diagnostics/track2.stderr b/src/test/ui/track-diagnostics/track2.stderr
index 28d17f1e141..38a621da816 100644
--- a/src/test/ui/track-diagnostics/track2.stderr
+++ b/src/test/ui/track-diagnostics/track2.stderr
@@ -1,12 +1,12 @@
 error[E0382]: use of moved value
-  --> $DIR/track2.rs:$LINE::$COL
+  --> $DIR/track2.rs:LL:CC
    |
 LL |     let _moved @ _from = String::from("foo");
    |         ^^^^^^   -----   ------------------- move occurs because value has type `String`, which does not implement the `Copy` trait
    |         |        |
    |         |        value moved here
    |         value used here after move
--Ztrack-diagnostics: created at compiler/rustc_borrowck/src/borrowck_errors.rs:$LINE::$COL
+-Ztrack-diagnostics: created at compiler/rustc_borrowck/src/borrowck_errors.rs:LL:CC
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/track-diagnostics/track3.rs b/src/test/ui/track-diagnostics/track3.rs
index e9316a42189..0699239503a 100644
--- a/src/test/ui/track-diagnostics/track3.rs
+++ b/src/test/ui/track-diagnostics/track3.rs
@@ -3,7 +3,7 @@
 
 // Normalize the emitted location so this doesn't need
 // updating everytime someone adds or removes a line.
-// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL"
+// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
 
 fn main() {
     let _unimported = Blah { field: u8 };
diff --git a/src/test/ui/track-diagnostics/track3.stderr b/src/test/ui/track-diagnostics/track3.stderr
index 005380df430..dc468d7e8ee 100644
--- a/src/test/ui/track-diagnostics/track3.stderr
+++ b/src/test/ui/track-diagnostics/track3.stderr
@@ -1,16 +1,16 @@
 error[E0422]: cannot find struct, variant or union type `Blah` in this scope
-  --> $DIR/track3.rs:$LINE::$COL
+  --> $DIR/track3.rs:LL:CC
    |
 LL |     let _unimported = Blah { field: u8 };
    |                       ^^^^ not found in this scope
--Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:$LINE::$COL
+-Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:LL:CC
 
 error[E0423]: expected value, found builtin type `u8`
-  --> $DIR/track3.rs:$LINE::$COL
+  --> $DIR/track3.rs:LL:CC
    |
 LL |     let _unimported = Blah { field: u8 };
    |                                     ^^ not a value
--Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:$LINE::$COL
+-Ztrack-diagnostics: created at compiler/rustc_resolve/src/late/diagnostics.rs:LL:CC
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/track-diagnostics/track4.rs b/src/test/ui/track-diagnostics/track4.rs
index 065cc604604..35eec799bba 100644
--- a/src/test/ui/track-diagnostics/track4.rs
+++ b/src/test/ui/track-diagnostics/track4.rs
@@ -3,7 +3,7 @@
 
 // Normalize the emitted location so this doesn't need
 // updating everytime someone adds or removes a line.
-// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL"
+// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
 
 pub onion {
     Owo(u8),
diff --git a/src/test/ui/track-diagnostics/track4.stderr b/src/test/ui/track-diagnostics/track4.stderr
index e0cedcee0d3..c4668444c4b 100644
--- a/src/test/ui/track-diagnostics/track4.stderr
+++ b/src/test/ui/track-diagnostics/track4.stderr
@@ -1,9 +1,9 @@
 error: missing `struct` for struct definition
-  --> $DIR/track4.rs:$LINE::$COL
+  --> $DIR/track4.rs:LL:CC
    |
 LL | pub onion {
    |    ^
--Ztrack-diagnostics: created at compiler/rustc_parse/src/parser/diagnostics.rs:$LINE::$COL
+-Ztrack-diagnostics: created at compiler/rustc_parse/src/parser/diagnostics.rs:LL:CC
    |
 help: add `struct` here to parse `onion` as a public struct
    |
diff --git a/src/tools/clippy/tests/ui/track-diagnostics.rs b/src/tools/clippy/tests/ui/track-diagnostics.rs
index 550ccd7b3d3..fa9221ed02d 100644
--- a/src/tools/clippy/tests/ui/track-diagnostics.rs
+++ b/src/tools/clippy/tests/ui/track-diagnostics.rs
@@ -3,7 +3,7 @@
 
 // Normalize the emitted location so this doesn't need
 // updating everytime someone adds or removes a line.
-// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:$$LINE::$$COL"
+// normalize-stderr-test ".rs:\d+:\d+" -> ".rs:LL:CC"
 
 struct A;
 struct B;
diff --git a/src/tools/clippy/tests/ui/track-diagnostics.stderr b/src/tools/clippy/tests/ui/track-diagnostics.stderr
index 5a0982ff731..ec303186253 100644
--- a/src/tools/clippy/tests/ui/track-diagnostics.stderr
+++ b/src/tools/clippy/tests/ui/track-diagnostics.stderr
@@ -1,9 +1,9 @@
 error[E0308]: mismatched types
-  --> $DIR/track-diagnostics.rs:$LINE::$COL
+  --> $DIR/track-diagnostics.rs:LL:CC
    |
 LL | const S: A = B;
    |              ^ expected struct `A`, found struct `B`
--Ztrack-diagnostics: created at compiler/rustc_infer/src/infer/error_reporting/mod.rs:$LINE::$COL
+-Ztrack-diagnostics: created at compiler/rustc_infer/src/infer/error_reporting/mod.rs:LL:CC
 
 error: aborting due to previous error