diff --git a/tests/ui/frontmatter/frontmatter-contains-whitespace.rs b/tests/ui/frontmatter/content-contains-whitespace.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-contains-whitespace.rs
rename to tests/ui/frontmatter/content-contains-whitespace.rs
diff --git a/tests/ui/frontmatter/frontmatter-non-lexible-tokens.rs b/tests/ui/frontmatter/content-non-lexible-tokens.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-non-lexible-tokens.rs
rename to tests/ui/frontmatter/content-non-lexible-tokens.rs
diff --git a/tests/ui/frontmatter/escape.rs b/tests/ui/frontmatter/escape-hyphens-leading.rs
similarity index 100%
rename from tests/ui/frontmatter/escape.rs
rename to tests/ui/frontmatter/escape-hyphens-leading.rs
diff --git a/tests/ui/frontmatter/multifrontmatter-2.rs b/tests/ui/frontmatter/escape-hyphens-nonleading-1.rs
similarity index 100%
rename from tests/ui/frontmatter/multifrontmatter-2.rs
rename to tests/ui/frontmatter/escape-hyphens-nonleading-1.rs
diff --git a/tests/ui/frontmatter/frontmatter-inner-hyphens-1.rs b/tests/ui/frontmatter/escape-hyphens-nonleading-2.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-inner-hyphens-1.rs
rename to tests/ui/frontmatter/escape-hyphens-nonleading-2.rs
diff --git a/tests/ui/frontmatter/frontmatter-inner-hyphens-2.rs b/tests/ui/frontmatter/escape-hyphens-nonleading-3.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-inner-hyphens-2.rs
rename to tests/ui/frontmatter/escape-hyphens-nonleading-3.rs
diff --git a/tests/ui/frontmatter/extra-after-end.rs b/tests/ui/frontmatter/fence-close-extra-after.rs
similarity index 100%
rename from tests/ui/frontmatter/extra-after-end.rs
rename to tests/ui/frontmatter/fence-close-extra-after.rs
diff --git a/tests/ui/frontmatter/extra-after-end.stderr b/tests/ui/frontmatter/fence-close-extra-after.stderr
similarity index 76%
rename from tests/ui/frontmatter/extra-after-end.stderr
rename to tests/ui/frontmatter/fence-close-extra-after.stderr
index c2770fdfd41ff..a54a67152f970 100644
--- a/tests/ui/frontmatter/extra-after-end.stderr
+++ b/tests/ui/frontmatter/fence-close-extra-after.stderr
@@ -1,5 +1,5 @@
 error: extra characters after frontmatter close are not allowed
-  --> $DIR/extra-after-end.rs:2:1
+  --> $DIR/fence-close-extra-after.rs:2:1
    |
 LL | ---cargo
    | ^^^^^^^^
diff --git a/tests/ui/frontmatter/frontmatter-whitespace-2.rs b/tests/ui/frontmatter/fence-indented-mismatch.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-whitespace-2.rs
rename to tests/ui/frontmatter/fence-indented-mismatch.rs
diff --git a/tests/ui/frontmatter/frontmatter-whitespace-2.stderr b/tests/ui/frontmatter/fence-indented-mismatch.stderr
similarity index 81%
rename from tests/ui/frontmatter/frontmatter-whitespace-2.stderr
rename to tests/ui/frontmatter/fence-indented-mismatch.stderr
index 2ae63cdc6fe48..d85add1652105 100644
--- a/tests/ui/frontmatter/frontmatter-whitespace-2.stderr
+++ b/tests/ui/frontmatter/fence-indented-mismatch.stderr
@@ -1,5 +1,5 @@
 error: unclosed frontmatter
-  --> $DIR/frontmatter-whitespace-2.rs:1:1
+  --> $DIR/fence-indented-mismatch.rs:1:1
    |
 LL | / ---cargo
 ...  |
@@ -7,13 +7,13 @@ LL | |
    | |_^
    |
 note: frontmatter opening here was not closed
-  --> $DIR/frontmatter-whitespace-2.rs:1:1
+  --> $DIR/fence-indented-mismatch.rs:1:1
    |
 LL | ---cargo
    | ^^^
 
 warning: use of a double negation
-  --> $DIR/frontmatter-whitespace-2.rs:9:6
+  --> $DIR/fence-indented-mismatch.rs:9:6
    |
 LL |     ---x
    |      ^^^
diff --git a/tests/ui/frontmatter/frontmatter-whitespace-1.rs b/tests/ui/frontmatter/fence-indented.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-whitespace-1.rs
rename to tests/ui/frontmatter/fence-indented.rs
diff --git a/tests/ui/frontmatter/frontmatter-whitespace-1.stderr b/tests/ui/frontmatter/fence-indented.stderr
similarity index 69%
rename from tests/ui/frontmatter/frontmatter-whitespace-1.stderr
rename to tests/ui/frontmatter/fence-indented.stderr
index f16788fa39929..777db0976d08a 100644
--- a/tests/ui/frontmatter/frontmatter-whitespace-1.stderr
+++ b/tests/ui/frontmatter/fence-indented.stderr
@@ -1,17 +1,17 @@
 error: invalid preceding whitespace for frontmatter opening
-  --> $DIR/frontmatter-whitespace-1.rs:1:1
+  --> $DIR/fence-indented.rs:1:1
    |
 LL |   ---
    | ^^^^^
    |
 note: frontmatter opening should not be preceded by whitespace
-  --> $DIR/frontmatter-whitespace-1.rs:1:1
+  --> $DIR/fence-indented.rs:1:1
    |
 LL |   ---
    | ^^
 
 error: unclosed frontmatter
-  --> $DIR/frontmatter-whitespace-1.rs:1:3
+  --> $DIR/fence-indented.rs:1:3
    |
 LL | /   ---
 LL | |
@@ -21,7 +21,7 @@ LL | |
    | |_^
    |
 note: frontmatter opening here was not closed
-  --> $DIR/frontmatter-whitespace-1.rs:1:3
+  --> $DIR/fence-indented.rs:1:3
    |
 LL |   ---
    |   ^^^
diff --git a/tests/ui/frontmatter/mismatch-1.rs b/tests/ui/frontmatter/fence-mismatch-1.rs
similarity index 100%
rename from tests/ui/frontmatter/mismatch-1.rs
rename to tests/ui/frontmatter/fence-mismatch-1.rs
diff --git a/tests/ui/frontmatter/mismatch-1.stderr b/tests/ui/frontmatter/fence-mismatch-1.stderr
similarity index 88%
rename from tests/ui/frontmatter/mismatch-1.stderr
rename to tests/ui/frontmatter/fence-mismatch-1.stderr
index b6e29294d9e14..f971039522cd4 100644
--- a/tests/ui/frontmatter/mismatch-1.stderr
+++ b/tests/ui/frontmatter/fence-mismatch-1.stderr
@@ -1,5 +1,5 @@
 error: frontmatter close does not match the opening
-  --> $DIR/mismatch-1.rs:1:1
+  --> $DIR/fence-mismatch-1.rs:1:1
    |
 LL |   ---cargo
    |   ^--
diff --git a/tests/ui/frontmatter/mismatch-2.rs b/tests/ui/frontmatter/fence-mismatch-2.rs
similarity index 100%
rename from tests/ui/frontmatter/mismatch-2.rs
rename to tests/ui/frontmatter/fence-mismatch-2.rs
diff --git a/tests/ui/frontmatter/mismatch-2.stderr b/tests/ui/frontmatter/fence-mismatch-2.stderr
similarity index 84%
rename from tests/ui/frontmatter/mismatch-2.stderr
rename to tests/ui/frontmatter/fence-mismatch-2.stderr
index 90bb7b80bcea0..8378ae20901e1 100644
--- a/tests/ui/frontmatter/mismatch-2.stderr
+++ b/tests/ui/frontmatter/fence-mismatch-2.stderr
@@ -1,5 +1,5 @@
 error: frontmatter close does not match the opening
-  --> $DIR/mismatch-2.rs:1:1
+  --> $DIR/fence-mismatch-2.rs:1:1
    |
 LL |   ----cargo
    |   ^---
@@ -13,7 +13,7 @@ LL | | ---cargo
    |   ...while the close has 3 dashes
 
 error: extra characters after frontmatter close are not allowed
-  --> $DIR/mismatch-2.rs:3:1
+  --> $DIR/fence-mismatch-2.rs:3:1
    |
 LL | ---cargo
    | ^^^^^^^^
diff --git a/tests/ui/frontmatter/unclosed-1.rs b/tests/ui/frontmatter/fence-unclosed-1.rs
similarity index 100%
rename from tests/ui/frontmatter/unclosed-1.rs
rename to tests/ui/frontmatter/fence-unclosed-1.rs
diff --git a/tests/ui/frontmatter/unclosed-1.stderr b/tests/ui/frontmatter/fence-unclosed-1.stderr
similarity index 73%
rename from tests/ui/frontmatter/unclosed-1.stderr
rename to tests/ui/frontmatter/fence-unclosed-1.stderr
index 04031d128398c..f96da8cc6689c 100644
--- a/tests/ui/frontmatter/unclosed-1.stderr
+++ b/tests/ui/frontmatter/fence-unclosed-1.stderr
@@ -1,5 +1,5 @@
 error: unclosed frontmatter
-  --> $DIR/unclosed-1.rs:1:1
+  --> $DIR/fence-unclosed-1.rs:1:1
    |
 LL | / ----cargo
 ...  |
@@ -7,7 +7,7 @@ LL | |
    | |_^
    |
 note: frontmatter opening here was not closed
-  --> $DIR/unclosed-1.rs:1:1
+  --> $DIR/fence-unclosed-1.rs:1:1
    |
 LL | ----cargo
    | ^^^^
diff --git a/tests/ui/frontmatter/unclosed-2.rs b/tests/ui/frontmatter/fence-unclosed-2.rs
similarity index 100%
rename from tests/ui/frontmatter/unclosed-2.rs
rename to tests/ui/frontmatter/fence-unclosed-2.rs
diff --git a/tests/ui/frontmatter/unclosed-2.stderr b/tests/ui/frontmatter/fence-unclosed-2.stderr
similarity index 86%
rename from tests/ui/frontmatter/unclosed-2.stderr
rename to tests/ui/frontmatter/fence-unclosed-2.stderr
index 0a4022c1557b7..7eeb30bed528a 100644
--- a/tests/ui/frontmatter/unclosed-2.stderr
+++ b/tests/ui/frontmatter/fence-unclosed-2.stderr
@@ -1,5 +1,5 @@
 error: unclosed frontmatter
-  --> $DIR/unclosed-2.rs:1:1
+  --> $DIR/fence-unclosed-2.rs:1:1
    |
 LL | / ----cargo
 ...  |
@@ -8,13 +8,13 @@ LL | | }
    | |__^
    |
 note: frontmatter opening here was not closed
-  --> $DIR/unclosed-2.rs:1:1
+  --> $DIR/fence-unclosed-2.rs:1:1
    |
 LL | ----cargo
    | ^^^^
 
 error[E0658]: frontmatters are experimental
-  --> $DIR/unclosed-2.rs:1:1
+  --> $DIR/fence-unclosed-2.rs:1:1
    |
 LL | / ----cargo
 ...  |
diff --git a/tests/ui/frontmatter/unclosed-3.rs b/tests/ui/frontmatter/fence-unclosed-3.rs
similarity index 100%
rename from tests/ui/frontmatter/unclosed-3.rs
rename to tests/ui/frontmatter/fence-unclosed-3.rs
diff --git a/tests/ui/frontmatter/unclosed-3.stderr b/tests/ui/frontmatter/fence-unclosed-3.stderr
similarity index 79%
rename from tests/ui/frontmatter/unclosed-3.stderr
rename to tests/ui/frontmatter/fence-unclosed-3.stderr
index cd69cb0004080..aa3e8fa3c01d3 100644
--- a/tests/ui/frontmatter/unclosed-3.stderr
+++ b/tests/ui/frontmatter/fence-unclosed-3.stderr
@@ -1,17 +1,17 @@
 error: invalid preceding whitespace for frontmatter close
-  --> $DIR/unclosed-3.rs:12:1
+  --> $DIR/fence-unclosed-3.rs:12:1
    |
 LL |     ---x
    | ^^^^^^^^
    |
 note: frontmatter close should not be preceded by whitespace
-  --> $DIR/unclosed-3.rs:12:1
+  --> $DIR/fence-unclosed-3.rs:12:1
    |
 LL |     ---x
    | ^^^^
 
 error: frontmatter close does not match the opening
-  --> $DIR/unclosed-3.rs:1:1
+  --> $DIR/fence-unclosed-3.rs:1:1
    |
 LL |   ----cargo
    |   ^---
@@ -26,13 +26,13 @@ LL | |     ---x
    |   ...while the close has 3 dashes
 
 error: extra characters after frontmatter close are not allowed
-  --> $DIR/unclosed-3.rs:12:1
+  --> $DIR/fence-unclosed-3.rs:12:1
    |
 LL |     ---x
    | ^^^^^^^^
 
 error: unexpected closing delimiter: `}`
-  --> $DIR/unclosed-3.rs:15:1
+  --> $DIR/fence-unclosed-3.rs:15:1
    |
 LL | }
    | ^ unexpected closing delimiter
diff --git a/tests/ui/frontmatter/unclosed-4.rs b/tests/ui/frontmatter/fence-unclosed-4.rs
similarity index 100%
rename from tests/ui/frontmatter/unclosed-4.rs
rename to tests/ui/frontmatter/fence-unclosed-4.rs
diff --git a/tests/ui/frontmatter/unclosed-4.stderr b/tests/ui/frontmatter/fence-unclosed-4.stderr
similarity index 73%
rename from tests/ui/frontmatter/unclosed-4.stderr
rename to tests/ui/frontmatter/fence-unclosed-4.stderr
index b3ba56937bbad..cb597d16de28e 100644
--- a/tests/ui/frontmatter/unclosed-4.stderr
+++ b/tests/ui/frontmatter/fence-unclosed-4.stderr
@@ -1,5 +1,5 @@
 error: unclosed frontmatter
-  --> $DIR/unclosed-4.rs:1:1
+  --> $DIR/fence-unclosed-4.rs:1:1
    |
 LL | / ----cargo
 LL | |
@@ -7,7 +7,7 @@ LL | |
    | |_^
    |
 note: frontmatter opening here was not closed
-  --> $DIR/unclosed-4.rs:1:1
+  --> $DIR/fence-unclosed-4.rs:1:1
    |
 LL | ----cargo
    | ^^^^
diff --git a/tests/ui/frontmatter/unclosed-5.rs b/tests/ui/frontmatter/fence-unclosed-5.rs
similarity index 100%
rename from tests/ui/frontmatter/unclosed-5.rs
rename to tests/ui/frontmatter/fence-unclosed-5.rs
diff --git a/tests/ui/frontmatter/unclosed-5.stderr b/tests/ui/frontmatter/fence-unclosed-5.stderr
similarity index 85%
rename from tests/ui/frontmatter/unclosed-5.stderr
rename to tests/ui/frontmatter/fence-unclosed-5.stderr
index e904014a175a5..09531f3c03412 100644
--- a/tests/ui/frontmatter/unclosed-5.stderr
+++ b/tests/ui/frontmatter/fence-unclosed-5.stderr
@@ -1,5 +1,5 @@
 error: unclosed frontmatter
-  --> $DIR/unclosed-5.rs:1:1
+  --> $DIR/fence-unclosed-5.rs:1:1
    |
 LL | / ----cargo
 ...  |
@@ -7,13 +7,13 @@ LL | |
    | |_^
    |
 note: frontmatter opening here was not closed
-  --> $DIR/unclosed-5.rs:1:1
+  --> $DIR/fence-unclosed-5.rs:1:1
    |
 LL | ----cargo
    | ^^^^
 
 error[E0658]: frontmatters are experimental
-  --> $DIR/unclosed-5.rs:1:1
+  --> $DIR/fence-unclosed-5.rs:1:1
    |
 LL | / ----cargo
 ...  |
diff --git a/tests/ui/frontmatter/unclosed-6.rs b/tests/ui/frontmatter/fence-unclosed-6.rs
similarity index 100%
rename from tests/ui/frontmatter/unclosed-6.rs
rename to tests/ui/frontmatter/fence-unclosed-6.rs
diff --git a/tests/ui/frontmatter/unclosed-6.stderr b/tests/ui/frontmatter/fence-unclosed-6.stderr
similarity index 75%
rename from tests/ui/frontmatter/unclosed-6.stderr
rename to tests/ui/frontmatter/fence-unclosed-6.stderr
index 01a13e87268c7..6b653f0781c69 100644
--- a/tests/ui/frontmatter/unclosed-6.stderr
+++ b/tests/ui/frontmatter/fence-unclosed-6.stderr
@@ -1,5 +1,5 @@
 error: unclosed frontmatter
-  --> $DIR/unclosed-6.rs:1:1
+  --> $DIR/fence-unclosed-6.rs:1:1
    |
 LL | / ---
 LL | |
@@ -10,7 +10,7 @@ LL | |
    | |_^
    |
 note: frontmatter opening here was not closed
-  --> $DIR/unclosed-6.rs:1:1
+  --> $DIR/fence-unclosed-6.rs:1:1
    |
 LL | ---
    | ^^^
diff --git a/tests/ui/frontmatter/frontmatter-whitespace-3.rs b/tests/ui/frontmatter/fence-whitespace-trailing-1.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-whitespace-3.rs
rename to tests/ui/frontmatter/fence-whitespace-trailing-1.rs
diff --git a/tests/ui/frontmatter/frontmatter-whitespace-4.rs b/tests/ui/frontmatter/fence-whitespace-trailing-2.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-whitespace-4.rs
rename to tests/ui/frontmatter/fence-whitespace-trailing-2.rs
diff --git a/tests/ui/frontmatter/infostring-fail.rs b/tests/ui/frontmatter/infostring-comma.rs
similarity index 100%
rename from tests/ui/frontmatter/infostring-fail.rs
rename to tests/ui/frontmatter/infostring-comma.rs
diff --git a/tests/ui/frontmatter/infostring-fail.stderr b/tests/ui/frontmatter/infostring-comma.stderr
similarity index 86%
rename from tests/ui/frontmatter/infostring-fail.stderr
rename to tests/ui/frontmatter/infostring-comma.stderr
index 6b264abc90f11..4463dd414c4fd 100644
--- a/tests/ui/frontmatter/infostring-fail.stderr
+++ b/tests/ui/frontmatter/infostring-comma.stderr
@@ -1,5 +1,5 @@
 error: invalid infostring for frontmatter
-  --> $DIR/infostring-fail.rs:1:4
+  --> $DIR/infostring-comma.rs:1:4
    |
 LL | ---cargo,clippy
    |    ^^^^^^^^^^^^
diff --git a/tests/ui/frontmatter/dot-in-infostring-leading.rs b/tests/ui/frontmatter/infostring-dot-leading.rs
similarity index 100%
rename from tests/ui/frontmatter/dot-in-infostring-leading.rs
rename to tests/ui/frontmatter/infostring-dot-leading.rs
diff --git a/tests/ui/frontmatter/dot-in-infostring-leading.stderr b/tests/ui/frontmatter/infostring-dot-leading.stderr
similarity index 83%
rename from tests/ui/frontmatter/dot-in-infostring-leading.stderr
rename to tests/ui/frontmatter/infostring-dot-leading.stderr
index bc86bd80eece8..8c15f8f7536eb 100644
--- a/tests/ui/frontmatter/dot-in-infostring-leading.stderr
+++ b/tests/ui/frontmatter/infostring-dot-leading.stderr
@@ -1,5 +1,5 @@
 error: invalid infostring for frontmatter
-  --> $DIR/dot-in-infostring-leading.rs:1:4
+  --> $DIR/infostring-dot-leading.rs:1:4
    |
 LL | ---.toml
    |    ^^^^^
diff --git a/tests/ui/frontmatter/dot-in-infostring-non-leading.rs b/tests/ui/frontmatter/infostring-dot-nonleading.rs
similarity index 100%
rename from tests/ui/frontmatter/dot-in-infostring-non-leading.rs
rename to tests/ui/frontmatter/infostring-dot-nonleading.rs
diff --git a/tests/ui/frontmatter/hyphen-in-infostring-leading.rs b/tests/ui/frontmatter/infostring-hyphen-leading.rs
similarity index 100%
rename from tests/ui/frontmatter/hyphen-in-infostring-leading.rs
rename to tests/ui/frontmatter/infostring-hyphen-leading.rs
diff --git a/tests/ui/frontmatter/hyphen-in-infostring-leading.stderr b/tests/ui/frontmatter/infostring-hyphen-leading.stderr
similarity index 82%
rename from tests/ui/frontmatter/hyphen-in-infostring-leading.stderr
rename to tests/ui/frontmatter/infostring-hyphen-leading.stderr
index 167b537d62be2..646936b92830b 100644
--- a/tests/ui/frontmatter/hyphen-in-infostring-leading.stderr
+++ b/tests/ui/frontmatter/infostring-hyphen-leading.stderr
@@ -1,5 +1,5 @@
 error: invalid infostring for frontmatter
-  --> $DIR/hyphen-in-infostring-leading.rs:1:4
+  --> $DIR/infostring-hyphen-leading.rs:1:4
    |
 LL | --- -toml
    |    ^^^^^^
diff --git a/tests/ui/frontmatter/hyphen-in-infostring-non-leading.rs b/tests/ui/frontmatter/infostring-hyphen-nonleading.rs
similarity index 100%
rename from tests/ui/frontmatter/hyphen-in-infostring-non-leading.rs
rename to tests/ui/frontmatter/infostring-hyphen-nonleading.rs
diff --git a/tests/ui/frontmatter/space-in-infostring.rs b/tests/ui/frontmatter/infostring-space.rs
similarity index 100%
rename from tests/ui/frontmatter/space-in-infostring.rs
rename to tests/ui/frontmatter/infostring-space.rs
diff --git a/tests/ui/frontmatter/space-in-infostring.stderr b/tests/ui/frontmatter/infostring-space.stderr
similarity index 86%
rename from tests/ui/frontmatter/space-in-infostring.stderr
rename to tests/ui/frontmatter/infostring-space.stderr
index b876ddae782e9..aa8d08d60904b 100644
--- a/tests/ui/frontmatter/space-in-infostring.stderr
+++ b/tests/ui/frontmatter/infostring-space.stderr
@@ -1,5 +1,5 @@
 error: invalid infostring for frontmatter
-  --> $DIR/space-in-infostring.rs:1:4
+  --> $DIR/infostring-space.rs:1:4
    |
 LL | --- cargo clippy
    |    ^^^^^^^^^^^^^
diff --git a/tests/ui/frontmatter/shebang.rs b/tests/ui/frontmatter/location-after-shebang.rs
similarity index 100%
rename from tests/ui/frontmatter/shebang.rs
rename to tests/ui/frontmatter/location-after-shebang.rs
diff --git a/tests/ui/frontmatter/frontmatter-after-tokens.rs b/tests/ui/frontmatter/location-after-tokens.rs
similarity index 100%
rename from tests/ui/frontmatter/frontmatter-after-tokens.rs
rename to tests/ui/frontmatter/location-after-tokens.rs
diff --git a/tests/ui/frontmatter/frontmatter-after-tokens.stderr b/tests/ui/frontmatter/location-after-tokens.stderr
similarity index 84%
rename from tests/ui/frontmatter/frontmatter-after-tokens.stderr
rename to tests/ui/frontmatter/location-after-tokens.stderr
index 919456924d027..b8b38167ace5f 100644
--- a/tests/ui/frontmatter/frontmatter-after-tokens.stderr
+++ b/tests/ui/frontmatter/location-after-tokens.stderr
@@ -1,5 +1,5 @@
 error: expected item, found `-`
-  --> $DIR/frontmatter-after-tokens.rs:3:1
+  --> $DIR/location-after-tokens.rs:3:1
    |
 LL | ---
    | ^ expected item
diff --git a/tests/ui/frontmatter/include-in-expr-ctxt.rs b/tests/ui/frontmatter/location-include-in-expr-ctxt.rs
similarity index 100%
rename from tests/ui/frontmatter/include-in-expr-ctxt.rs
rename to tests/ui/frontmatter/location-include-in-expr-ctxt.rs
diff --git a/tests/ui/frontmatter/include-in-item-ctxt.rs b/tests/ui/frontmatter/location-include-in-item-ctxt.rs
similarity index 100%
rename from tests/ui/frontmatter/include-in-item-ctxt.rs
rename to tests/ui/frontmatter/location-include-in-item-ctxt.rs
diff --git a/tests/ui/frontmatter/proc-macro-observer.rs b/tests/ui/frontmatter/location-proc-macro-observer.rs
similarity index 100%
rename from tests/ui/frontmatter/proc-macro-observer.rs
rename to tests/ui/frontmatter/location-proc-macro-observer.rs