diff --git a/src/test/ui/dead-code-alias-in-pat.rs b/src/test/ui/lint/dead-code/alias-in-pat.rs
similarity index 100%
rename from src/test/ui/dead-code-alias-in-pat.rs
rename to src/test/ui/lint/dead-code/alias-in-pat.rs
diff --git a/src/test/ui/lint-dead-code-associated-type.rs b/src/test/ui/lint/dead-code/associated-type.rs
similarity index 100%
rename from src/test/ui/lint-dead-code-associated-type.rs
rename to src/test/ui/lint/dead-code/associated-type.rs
diff --git a/src/test/ui/fail-no-dead-code.rs b/src/test/ui/lint/dead-code/basic.rs
similarity index 100%
rename from src/test/ui/fail-no-dead-code.rs
rename to src/test/ui/lint/dead-code/basic.rs
diff --git a/src/test/ui/fail-no-dead-code.stderr b/src/test/ui/lint/dead-code/basic.stderr
similarity index 73%
rename from src/test/ui/fail-no-dead-code.stderr
rename to src/test/ui/lint/dead-code/basic.stderr
index 8babcffaa8dd..e5d1af12cf28 100644
--- a/src/test/ui/fail-no-dead-code.stderr
+++ b/src/test/ui/lint/dead-code/basic.stderr
@@ -1,11 +1,11 @@
 error: function is never used: `foo`
-  --> $DIR/fail-no-dead-code.rs:4:1
+  --> $DIR/basic.rs:4:1
    |
 LL | fn foo() {
    | ^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/fail-no-dead-code.rs:1:9
+  --> $DIR/basic.rs:1:9
    |
 LL | #![deny(dead_code)]
    |         ^^^^^^^^^
diff --git a/src/test/ui/dead-code-closure-bang.rs b/src/test/ui/lint/dead-code/closure-bang.rs
similarity index 100%
rename from src/test/ui/dead-code-closure-bang.rs
rename to src/test/ui/lint/dead-code/closure-bang.rs
diff --git a/src/test/ui/lint/lint-dead-code-const-and-self.rs b/src/test/ui/lint/dead-code/const-and-self.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-const-and-self.rs
rename to src/test/ui/lint/dead-code/const-and-self.rs
diff --git a/src/test/ui/lint/lint-dead-code-empty-unused-enum.rs b/src/test/ui/lint/dead-code/empty-unused-enum.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-empty-unused-enum.rs
rename to src/test/ui/lint/dead-code/empty-unused-enum.rs
diff --git a/src/test/ui/lint/lint-dead-code-empty-unused-enum.stderr b/src/test/ui/lint/dead-code/empty-unused-enum.stderr
similarity index 70%
rename from src/test/ui/lint/lint-dead-code-empty-unused-enum.stderr
rename to src/test/ui/lint/dead-code/empty-unused-enum.stderr
index 4e3bebfc48bd..17bbdfc71a26 100644
--- a/src/test/ui/lint/lint-dead-code-empty-unused-enum.stderr
+++ b/src/test/ui/lint/dead-code/empty-unused-enum.stderr
@@ -1,11 +1,11 @@
 error: enum is never used: `E`
-  --> $DIR/lint-dead-code-empty-unused-enum.rs:3:1
+  --> $DIR/empty-unused-enum.rs:3:1
    |
 LL | enum E {}
    | ^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint-dead-code-empty-unused-enum.rs:1:9
+  --> $DIR/empty-unused-enum.rs:1:9
    |
 LL | #![deny(unused)]
    |         ^^^^^^
diff --git a/src/test/ui/lint/lint-dead-code-empty-unused-enum-pub.rs b/src/test/ui/lint/dead-code/empty-unused-public-enum.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-empty-unused-enum-pub.rs
rename to src/test/ui/lint/dead-code/empty-unused-public-enum.rs
diff --git a/src/test/ui/lint-dead-code-variant.rs b/src/test/ui/lint/dead-code/enum-variants.rs
similarity index 100%
rename from src/test/ui/lint-dead-code-variant.rs
rename to src/test/ui/lint/dead-code/enum-variants.rs
diff --git a/src/test/ui/lint/lint-dead-code-impl-trait.rs b/src/test/ui/lint/dead-code/impl-trait.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-impl-trait.rs
rename to src/test/ui/lint/dead-code/impl-trait.rs
diff --git a/src/test/ui/lint/lint-dead-code-impl-trait.stderr b/src/test/ui/lint/dead-code/impl-trait.stderr
similarity index 71%
rename from src/test/ui/lint/lint-dead-code-impl-trait.stderr
rename to src/test/ui/lint/dead-code/impl-trait.stderr
index 61d0954bf314..f2a78cc65e26 100644
--- a/src/test/ui/lint/lint-dead-code-impl-trait.stderr
+++ b/src/test/ui/lint/dead-code/impl-trait.stderr
@@ -1,11 +1,11 @@
 error: type alias is never used: `Unused`
-  --> $DIR/lint-dead-code-impl-trait.rs:12:1
+  --> $DIR/impl-trait.rs:12:1
    |
 LL | type Unused = ();
    | ^^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint-dead-code-impl-trait.rs:1:9
+  --> $DIR/impl-trait.rs:1:9
    |
 LL | #![deny(dead_code)]
    |         ^^^^^^^^^
diff --git a/src/test/ui/dead-code-leading-underscore.rs b/src/test/ui/lint/dead-code/leading-underscore.rs
similarity index 100%
rename from src/test/ui/dead-code-leading-underscore.rs
rename to src/test/ui/lint/dead-code/leading-underscore.rs
diff --git a/src/test/ui/lint/lint-dead-code-1.rs b/src/test/ui/lint/dead-code/lint-dead-code-1.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-1.rs
rename to src/test/ui/lint/dead-code/lint-dead-code-1.rs
diff --git a/src/test/ui/lint/lint-dead-code-1.stderr b/src/test/ui/lint/dead-code/lint-dead-code-1.stderr
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-1.stderr
rename to src/test/ui/lint/dead-code/lint-dead-code-1.stderr
diff --git a/src/test/ui/lint/lint-dead-code-2.rs b/src/test/ui/lint/dead-code/lint-dead-code-2.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-2.rs
rename to src/test/ui/lint/dead-code/lint-dead-code-2.rs
diff --git a/src/test/ui/lint/lint-dead-code-2.stderr b/src/test/ui/lint/dead-code/lint-dead-code-2.stderr
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-2.stderr
rename to src/test/ui/lint/dead-code/lint-dead-code-2.stderr
diff --git a/src/test/ui/lint/lint-dead-code-3.rs b/src/test/ui/lint/dead-code/lint-dead-code-3.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-3.rs
rename to src/test/ui/lint/dead-code/lint-dead-code-3.rs
diff --git a/src/test/ui/lint/lint-dead-code-3.stderr b/src/test/ui/lint/dead-code/lint-dead-code-3.stderr
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-3.stderr
rename to src/test/ui/lint/dead-code/lint-dead-code-3.stderr
diff --git a/src/test/ui/lint/lint-dead-code-4.rs b/src/test/ui/lint/dead-code/lint-dead-code-4.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-4.rs
rename to src/test/ui/lint/dead-code/lint-dead-code-4.rs
diff --git a/src/test/ui/lint/lint-dead-code-4.stderr b/src/test/ui/lint/dead-code/lint-dead-code-4.stderr
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-4.stderr
rename to src/test/ui/lint/dead-code/lint-dead-code-4.stderr
diff --git a/src/test/ui/lint/lint-dead-code-5.rs b/src/test/ui/lint/dead-code/lint-dead-code-5.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-5.rs
rename to src/test/ui/lint/dead-code/lint-dead-code-5.rs
diff --git a/src/test/ui/lint/lint-dead-code-5.stderr b/src/test/ui/lint/dead-code/lint-dead-code-5.stderr
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-5.stderr
rename to src/test/ui/lint/dead-code/lint-dead-code-5.stderr
diff --git a/src/test/ui/dead-code-tuple-struct-field.rs b/src/test/ui/lint/dead-code/tuple-struct-field.rs
similarity index 100%
rename from src/test/ui/dead-code-tuple-struct-field.rs
rename to src/test/ui/lint/dead-code/tuple-struct-field.rs
diff --git a/src/test/ui/lint/lint-dead-code-type-alias.rs b/src/test/ui/lint/dead-code/type-alias.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-type-alias.rs
rename to src/test/ui/lint/dead-code/type-alias.rs
diff --git a/src/test/ui/lint/lint-dead-code-type-alias.stderr b/src/test/ui/lint/dead-code/type-alias.stderr
similarity index 71%
rename from src/test/ui/lint/lint-dead-code-type-alias.stderr
rename to src/test/ui/lint/dead-code/type-alias.stderr
index 4198ddfb6cb0..82df23bd9448 100644
--- a/src/test/ui/lint/lint-dead-code-type-alias.stderr
+++ b/src/test/ui/lint/dead-code/type-alias.stderr
@@ -1,11 +1,11 @@
 error: type alias is never used: `Unused`
-  --> $DIR/lint-dead-code-type-alias.rs:4:1
+  --> $DIR/type-alias.rs:4:1
    |
 LL | type Unused = u8;
    | ^^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint-dead-code-type-alias.rs:1:9
+  --> $DIR/type-alias.rs:1:9
    |
 LL | #![deny(dead_code)]
    |         ^^^^^^^^^
diff --git a/src/test/ui/lint/lint-dead-code-unused-enum.rs b/src/test/ui/lint/dead-code/unused-enum.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-unused-enum.rs
rename to src/test/ui/lint/dead-code/unused-enum.rs
diff --git a/src/test/ui/lint/lint-dead-code-unused-enum.stderr b/src/test/ui/lint/dead-code/unused-enum.stderr
similarity index 68%
rename from src/test/ui/lint/lint-dead-code-unused-enum.stderr
rename to src/test/ui/lint/dead-code/unused-enum.stderr
index ea711e7b05ee..682dfcf58818 100644
--- a/src/test/ui/lint/lint-dead-code-unused-enum.stderr
+++ b/src/test/ui/lint/dead-code/unused-enum.stderr
@@ -1,24 +1,24 @@
 error: struct is never constructed: `F`
-  --> $DIR/lint-dead-code-unused-enum.rs:3:1
+  --> $DIR/unused-enum.rs:3:1
    |
 LL | struct F;
    | ^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint-dead-code-unused-enum.rs:1:9
+  --> $DIR/unused-enum.rs:1:9
    |
 LL | #![deny(unused)]
    |         ^^^^^^
    = note: `#[deny(dead_code)]` implied by `#[deny(unused)]`
 
 error: struct is never constructed: `B`
-  --> $DIR/lint-dead-code-unused-enum.rs:4:1
+  --> $DIR/unused-enum.rs:4:1
    |
 LL | struct B;
    | ^^^^^^^^^
 
 error: enum is never used: `E`
-  --> $DIR/lint-dead-code-unused-enum.rs:6:1
+  --> $DIR/unused-enum.rs:6:1
    |
 LL | enum E {
    | ^^^^^^
diff --git a/src/test/ui/lint/lint-dead-code-unused-variant.rs b/src/test/ui/lint/dead-code/unused-struct-variant.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-unused-variant.rs
rename to src/test/ui/lint/dead-code/unused-struct-variant.rs
diff --git a/src/test/ui/lint/lint-dead-code-unused-variant.stderr b/src/test/ui/lint/dead-code/unused-struct-variant.stderr
similarity index 73%
rename from src/test/ui/lint/lint-dead-code-unused-variant.stderr
rename to src/test/ui/lint/dead-code/unused-struct-variant.stderr
index 919996ec3002..0037592e3de0 100644
--- a/src/test/ui/lint/lint-dead-code-unused-variant.stderr
+++ b/src/test/ui/lint/dead-code/unused-struct-variant.stderr
@@ -1,11 +1,11 @@
 error: variant is never constructed: `Bar`
-  --> $DIR/lint-dead-code-unused-variant.rs:8:5
+  --> $DIR/unused-struct-variant.rs:8:5
    |
 LL |     Bar(B),
    |     ^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint-dead-code-unused-variant.rs:1:9
+  --> $DIR/unused-struct-variant.rs:1:9
    |
 LL | #![deny(unused)]
    |         ^^^^^^
diff --git a/src/test/ui/lint/lint-dead-code-unused-variant-pub.rs b/src/test/ui/lint/dead-code/unused-variant-pub.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-unused-variant-pub.rs
rename to src/test/ui/lint/dead-code/unused-variant-pub.rs
diff --git a/src/test/ui/lint/lint-dead-code-variant.rs b/src/test/ui/lint/dead-code/unused-variant.rs
similarity index 100%
rename from src/test/ui/lint/lint-dead-code-variant.rs
rename to src/test/ui/lint/dead-code/unused-variant.rs
diff --git a/src/test/ui/lint/lint-dead-code-variant.stderr b/src/test/ui/lint/dead-code/unused-variant.stderr
similarity index 72%
rename from src/test/ui/lint/lint-dead-code-variant.stderr
rename to src/test/ui/lint/dead-code/unused-variant.stderr
index a79432dc68d6..2167b9d910d9 100644
--- a/src/test/ui/lint/lint-dead-code-variant.stderr
+++ b/src/test/ui/lint/dead-code/unused-variant.stderr
@@ -1,11 +1,11 @@
 error: variant is never constructed: `Variant1`
-  --> $DIR/lint-dead-code-variant.rs:5:5
+  --> $DIR/unused-variant.rs:5:5
    |
 LL |     Variant1,
    |     ^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint-dead-code-variant.rs:1:9
+  --> $DIR/unused-variant.rs:1:9
    |
 LL | #![deny(dead_code)]
    |         ^^^^^^^^^
diff --git a/src/test/ui/fail-no-dead-code-core.rs b/src/test/ui/lint/dead-code/with-core-crate.rs
similarity index 100%
rename from src/test/ui/fail-no-dead-code-core.rs
rename to src/test/ui/lint/dead-code/with-core-crate.rs
diff --git a/src/test/ui/fail-no-dead-code-core.stderr b/src/test/ui/lint/dead-code/with-core-crate.stderr
similarity index 70%
rename from src/test/ui/fail-no-dead-code-core.stderr
rename to src/test/ui/lint/dead-code/with-core-crate.stderr
index 2540242f9f68..30caac3cd014 100644
--- a/src/test/ui/fail-no-dead-code-core.stderr
+++ b/src/test/ui/lint/dead-code/with-core-crate.stderr
@@ -1,11 +1,11 @@
 error: function is never used: `foo`
-  --> $DIR/fail-no-dead-code-core.rs:7:1
+  --> $DIR/with-core-crate.rs:7:1
    |
 LL | fn foo() {
    | ^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/fail-no-dead-code-core.rs:1:9
+  --> $DIR/with-core-crate.rs:1:9
    |
 LL | #![deny(dead_code)]
    |         ^^^^^^^^^
diff --git a/src/test/ui/dead-code-impl.rs b/src/test/ui/lint/dead-code/with-impl.rs
similarity index 100%
rename from src/test/ui/dead-code-impl.rs
rename to src/test/ui/lint/dead-code/with-impl.rs