diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate.rs b/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs
similarity index 100%
rename from src/test/ui/lint/auxiliary/lint_unused_extern_crate.rs
rename to src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs
diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate2.rs b/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs
similarity index 100%
rename from src/test/ui/lint/auxiliary/lint_unused_extern_crate2.rs
rename to src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs
diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate3.rs b/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs
similarity index 100%
rename from src/test/ui/lint/auxiliary/lint_unused_extern_crate3.rs
rename to src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs
diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate4.rs b/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs
similarity index 100%
rename from src/test/ui/lint/auxiliary/lint_unused_extern_crate4.rs
rename to src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs
diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate5.rs b/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs
similarity index 100%
rename from src/test/ui/lint/auxiliary/lint_unused_extern_crate5.rs
rename to src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs
diff --git a/src/test/ui/unused/issue-30730.rs b/src/test/ui/lint/unused/issue-30730.rs
similarity index 100%
rename from src/test/ui/unused/issue-30730.rs
rename to src/test/ui/lint/unused/issue-30730.rs
diff --git a/src/test/ui/unused/issue-30730.stderr b/src/test/ui/lint/unused/issue-30730.stderr
similarity index 100%
rename from src/test/ui/unused/issue-30730.stderr
rename to src/test/ui/lint/unused/issue-30730.stderr
diff --git a/src/test/ui/unused/issue-46576.rs b/src/test/ui/lint/unused/issue-46576.rs
similarity index 100%
rename from src/test/ui/unused/issue-46576.rs
rename to src/test/ui/lint/unused/issue-46576.rs
diff --git a/src/test/ui/unused/issue-46576.stderr b/src/test/ui/lint/unused/issue-46576.stderr
similarity index 100%
rename from src/test/ui/unused/issue-46576.stderr
rename to src/test/ui/lint/unused/issue-46576.stderr
diff --git a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs b/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs
similarity index 100%
rename from src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs
rename to src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs
diff --git a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr b/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr
similarity index 100%
rename from src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr
rename to src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr
diff --git a/src/test/ui/lint/issue-54180-unused-ref-field.fixed b/src/test/ui/lint/unused/issue-54180-unused-ref-field.fixed
similarity index 100%
rename from src/test/ui/lint/issue-54180-unused-ref-field.fixed
rename to src/test/ui/lint/unused/issue-54180-unused-ref-field.fixed
diff --git a/src/test/ui/lint/issue-54180-unused-ref-field.rs b/src/test/ui/lint/unused/issue-54180-unused-ref-field.rs
similarity index 100%
rename from src/test/ui/lint/issue-54180-unused-ref-field.rs
rename to src/test/ui/lint/unused/issue-54180-unused-ref-field.rs
diff --git a/src/test/ui/lint/issue-54180-unused-ref-field.stderr b/src/test/ui/lint/unused/issue-54180-unused-ref-field.stderr
similarity index 100%
rename from src/test/ui/lint/issue-54180-unused-ref-field.stderr
rename to src/test/ui/lint/unused/issue-54180-unused-ref-field.stderr
diff --git a/src/test/ui/lint/issue-54538-unused-parens-lint.fixed b/src/test/ui/lint/unused/issue-54538-unused-parens-lint.fixed
similarity index 100%
rename from src/test/ui/lint/issue-54538-unused-parens-lint.fixed
rename to src/test/ui/lint/unused/issue-54538-unused-parens-lint.fixed
diff --git a/src/test/ui/lint/issue-54538-unused-parens-lint.rs b/src/test/ui/lint/unused/issue-54538-unused-parens-lint.rs
similarity index 100%
rename from src/test/ui/lint/issue-54538-unused-parens-lint.rs
rename to src/test/ui/lint/unused/issue-54538-unused-parens-lint.rs
diff --git a/src/test/ui/lint/issue-54538-unused-parens-lint.stderr b/src/test/ui/lint/unused/issue-54538-unused-parens-lint.stderr
similarity index 100%
rename from src/test/ui/lint/issue-54538-unused-parens-lint.stderr
rename to src/test/ui/lint/unused/issue-54538-unused-parens-lint.stderr
diff --git a/src/test/ui/unused/issue-59896.rs b/src/test/ui/lint/unused/issue-59896.rs
similarity index 100%
rename from src/test/ui/unused/issue-59896.rs
rename to src/test/ui/lint/unused/issue-59896.rs
diff --git a/src/test/ui/unused/issue-59896.stderr b/src/test/ui/lint/unused/issue-59896.stderr
similarity index 100%
rename from src/test/ui/unused/issue-59896.stderr
rename to src/test/ui/lint/unused/issue-59896.stderr
diff --git a/src/test/ui/lint/issue-67691-unused-field-in-or-pattern.rs b/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs
similarity index 100%
rename from src/test/ui/lint/issue-67691-unused-field-in-or-pattern.rs
rename to src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs
diff --git a/src/test/ui/lint/issue-67691-unused-field-in-or-pattern.stderr b/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr
similarity index 100%
rename from src/test/ui/lint/issue-67691-unused-field-in-or-pattern.stderr
rename to src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr
diff --git a/src/test/ui/unused/issue-70041.rs b/src/test/ui/lint/unused/issue-70041.rs
similarity index 100%
rename from src/test/ui/unused/issue-70041.rs
rename to src/test/ui/lint/unused/issue-70041.rs
diff --git a/src/test/ui/unused/issue-70041.stderr b/src/test/ui/lint/unused/issue-70041.stderr
similarity index 100%
rename from src/test/ui/unused/issue-70041.stderr
rename to src/test/ui/lint/unused/issue-70041.stderr
diff --git a/src/test/ui/lint/issue-71290-unused-paren-binop.rs b/src/test/ui/lint/unused/issue-71290-unused-paren-binop.rs
similarity index 100%
rename from src/test/ui/lint/issue-71290-unused-paren-binop.rs
rename to src/test/ui/lint/unused/issue-71290-unused-paren-binop.rs
diff --git a/src/test/ui/lint/issue-74883-unused-paren-baren-yield.rs b/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs
similarity index 100%
rename from src/test/ui/lint/issue-74883-unused-paren-baren-yield.rs
rename to src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs
diff --git a/src/test/ui/lint/issue-74883-unused-paren-baren-yield.stderr b/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr
similarity index 100%
rename from src/test/ui/lint/issue-74883-unused-paren-baren-yield.stderr
rename to src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr
diff --git a/src/test/ui/lint/issue-81314-unused-span-ident.fixed b/src/test/ui/lint/unused/issue-81314-unused-span-ident.fixed
similarity index 100%
rename from src/test/ui/lint/issue-81314-unused-span-ident.fixed
rename to src/test/ui/lint/unused/issue-81314-unused-span-ident.fixed
diff --git a/src/test/ui/lint/issue-81314-unused-span-ident.rs b/src/test/ui/lint/unused/issue-81314-unused-span-ident.rs
similarity index 100%
rename from src/test/ui/lint/issue-81314-unused-span-ident.rs
rename to src/test/ui/lint/unused/issue-81314-unused-span-ident.rs
diff --git a/src/test/ui/lint/issue-81314-unused-span-ident.stderr b/src/test/ui/lint/unused/issue-81314-unused-span-ident.stderr
similarity index 100%
rename from src/test/ui/lint/issue-81314-unused-span-ident.stderr
rename to src/test/ui/lint/unused/issue-81314-unused-span-ident.stderr
diff --git a/src/test/ui/unused/issue-85913.rs b/src/test/ui/lint/unused/issue-85913.rs
similarity index 100%
rename from src/test/ui/unused/issue-85913.rs
rename to src/test/ui/lint/unused/issue-85913.rs
diff --git a/src/test/ui/unused/issue-85913.stderr b/src/test/ui/lint/unused/issue-85913.stderr
similarity index 100%
rename from src/test/ui/unused/issue-85913.stderr
rename to src/test/ui/lint/unused/issue-85913.stderr
diff --git a/src/test/ui/lint/lint-unused-extern-crate.rs b/src/test/ui/lint/unused/lint-unused-extern-crate.rs
similarity index 100%
rename from src/test/ui/lint/lint-unused-extern-crate.rs
rename to src/test/ui/lint/unused/lint-unused-extern-crate.rs
diff --git a/src/test/ui/lint/lint-unused-extern-crate.stderr b/src/test/ui/lint/unused/lint-unused-extern-crate.stderr
similarity index 100%
rename from src/test/ui/lint/lint-unused-extern-crate.stderr
rename to src/test/ui/lint/unused/lint-unused-extern-crate.stderr
diff --git a/src/test/ui/lint/lint-unused-imports.rs b/src/test/ui/lint/unused/lint-unused-imports.rs
similarity index 100%
rename from src/test/ui/lint/lint-unused-imports.rs
rename to src/test/ui/lint/unused/lint-unused-imports.rs
diff --git a/src/test/ui/lint/lint-unused-imports.stderr b/src/test/ui/lint/unused/lint-unused-imports.stderr
similarity index 100%
rename from src/test/ui/lint/lint-unused-imports.stderr
rename to src/test/ui/lint/unused/lint-unused-imports.stderr
diff --git a/src/test/ui/lint/lint-unused-mut-self.fixed b/src/test/ui/lint/unused/lint-unused-mut-self.fixed
similarity index 100%
rename from src/test/ui/lint/lint-unused-mut-self.fixed
rename to src/test/ui/lint/unused/lint-unused-mut-self.fixed
diff --git a/src/test/ui/lint/lint-unused-mut-self.rs b/src/test/ui/lint/unused/lint-unused-mut-self.rs
similarity index 100%
rename from src/test/ui/lint/lint-unused-mut-self.rs
rename to src/test/ui/lint/unused/lint-unused-mut-self.rs
diff --git a/src/test/ui/lint/lint-unused-mut-self.stderr b/src/test/ui/lint/unused/lint-unused-mut-self.stderr
similarity index 100%
rename from src/test/ui/lint/lint-unused-mut-self.stderr
rename to src/test/ui/lint/unused/lint-unused-mut-self.stderr
diff --git a/src/test/ui/lint/lint-unused-mut-variables.rs b/src/test/ui/lint/unused/lint-unused-mut-variables.rs
similarity index 100%
rename from src/test/ui/lint/lint-unused-mut-variables.rs
rename to src/test/ui/lint/unused/lint-unused-mut-variables.rs
diff --git a/src/test/ui/lint/lint-unused-mut-variables.stderr b/src/test/ui/lint/unused/lint-unused-mut-variables.stderr
similarity index 100%
rename from src/test/ui/lint/lint-unused-mut-variables.stderr
rename to src/test/ui/lint/unused/lint-unused-mut-variables.stderr
diff --git a/src/test/ui/lint/lint-unused-variables.rs b/src/test/ui/lint/unused/lint-unused-variables.rs
similarity index 100%
rename from src/test/ui/lint/lint-unused-variables.rs
rename to src/test/ui/lint/unused/lint-unused-variables.rs
diff --git a/src/test/ui/lint/lint-unused-variables.stderr b/src/test/ui/lint/unused/lint-unused-variables.stderr
similarity index 100%
rename from src/test/ui/lint/lint-unused-variables.stderr
rename to src/test/ui/lint/unused/lint-unused-variables.stderr
diff --git a/src/test/ui/lint/must-use-ops.rs b/src/test/ui/lint/unused/must-use-ops.rs
similarity index 100%
rename from src/test/ui/lint/must-use-ops.rs
rename to src/test/ui/lint/unused/must-use-ops.rs
diff --git a/src/test/ui/lint/must-use-ops.stderr b/src/test/ui/lint/unused/must-use-ops.stderr
similarity index 100%
rename from src/test/ui/lint/must-use-ops.stderr
rename to src/test/ui/lint/unused/must-use-ops.stderr
diff --git a/src/test/ui/lint/must_use-array.rs b/src/test/ui/lint/unused/must_use-array.rs
similarity index 100%
rename from src/test/ui/lint/must_use-array.rs
rename to src/test/ui/lint/unused/must_use-array.rs
diff --git a/src/test/ui/lint/must_use-array.stderr b/src/test/ui/lint/unused/must_use-array.stderr
similarity index 100%
rename from src/test/ui/lint/must_use-array.stderr
rename to src/test/ui/lint/unused/must_use-array.stderr
diff --git a/src/test/ui/lint/must_use-in-stdlib-traits.rs b/src/test/ui/lint/unused/must_use-in-stdlib-traits.rs
similarity index 100%
rename from src/test/ui/lint/must_use-in-stdlib-traits.rs
rename to src/test/ui/lint/unused/must_use-in-stdlib-traits.rs
diff --git a/src/test/ui/lint/must_use-in-stdlib-traits.stderr b/src/test/ui/lint/unused/must_use-in-stdlib-traits.stderr
similarity index 100%
rename from src/test/ui/lint/must_use-in-stdlib-traits.stderr
rename to src/test/ui/lint/unused/must_use-in-stdlib-traits.stderr
diff --git a/src/test/ui/lint/must_use-trait.rs b/src/test/ui/lint/unused/must_use-trait.rs
similarity index 100%
rename from src/test/ui/lint/must_use-trait.rs
rename to src/test/ui/lint/unused/must_use-trait.rs
diff --git a/src/test/ui/lint/must_use-trait.stderr b/src/test/ui/lint/unused/must_use-trait.stderr
similarity index 100%
rename from src/test/ui/lint/must_use-trait.stderr
rename to src/test/ui/lint/unused/must_use-trait.stderr
diff --git a/src/test/ui/lint/must_use-tuple.rs b/src/test/ui/lint/unused/must_use-tuple.rs
similarity index 100%
rename from src/test/ui/lint/must_use-tuple.rs
rename to src/test/ui/lint/unused/must_use-tuple.rs
diff --git a/src/test/ui/lint/must_use-tuple.stderr b/src/test/ui/lint/unused/must_use-tuple.stderr
similarity index 100%
rename from src/test/ui/lint/must_use-tuple.stderr
rename to src/test/ui/lint/unused/must_use-tuple.stderr
diff --git a/src/test/ui/lint/must_use-unit.rs b/src/test/ui/lint/unused/must_use-unit.rs
similarity index 100%
rename from src/test/ui/lint/must_use-unit.rs
rename to src/test/ui/lint/unused/must_use-unit.rs
diff --git a/src/test/ui/lint/must_use-unit.stderr b/src/test/ui/lint/unused/must_use-unit.stderr
similarity index 100%
rename from src/test/ui/lint/must_use-unit.stderr
rename to src/test/ui/lint/unused/must_use-unit.stderr
diff --git a/src/test/ui/lint/no-unused-parens-return-block.rs b/src/test/ui/lint/unused/no-unused-parens-return-block.rs
similarity index 100%
rename from src/test/ui/lint/no-unused-parens-return-block.rs
rename to src/test/ui/lint/unused/no-unused-parens-return-block.rs
diff --git a/src/test/ui/unused/unused-attr-macro-rules.rs b/src/test/ui/lint/unused/unused-attr-macro-rules.rs
similarity index 100%
rename from src/test/ui/unused/unused-attr-macro-rules.rs
rename to src/test/ui/lint/unused/unused-attr-macro-rules.rs
diff --git a/src/test/ui/unused/unused-attr-macro-rules.stderr b/src/test/ui/lint/unused/unused-attr-macro-rules.stderr
similarity index 100%
rename from src/test/ui/unused/unused-attr-macro-rules.stderr
rename to src/test/ui/lint/unused/unused-attr-macro-rules.stderr
diff --git a/src/test/ui/unused/unused-attr.rs b/src/test/ui/lint/unused/unused-attr.rs
similarity index 100%
rename from src/test/ui/unused/unused-attr.rs
rename to src/test/ui/lint/unused/unused-attr.rs
diff --git a/src/test/ui/unused/unused-attr.stderr b/src/test/ui/lint/unused/unused-attr.stderr
similarity index 100%
rename from src/test/ui/unused/unused-attr.stderr
rename to src/test/ui/lint/unused/unused-attr.stderr
diff --git a/src/test/ui/unused/unused-closure.rs b/src/test/ui/lint/unused/unused-closure.rs
similarity index 100%
rename from src/test/ui/unused/unused-closure.rs
rename to src/test/ui/lint/unused/unused-closure.rs
diff --git a/src/test/ui/unused/unused-closure.stderr b/src/test/ui/lint/unused/unused-closure.stderr
similarity index 100%
rename from src/test/ui/unused/unused-closure.stderr
rename to src/test/ui/lint/unused/unused-closure.stderr
diff --git a/src/test/ui/unused/unused-doc-comments-edge-cases.rs b/src/test/ui/lint/unused/unused-doc-comments-edge-cases.rs
similarity index 100%
rename from src/test/ui/unused/unused-doc-comments-edge-cases.rs
rename to src/test/ui/lint/unused/unused-doc-comments-edge-cases.rs
diff --git a/src/test/ui/unused/unused-doc-comments-edge-cases.stderr b/src/test/ui/lint/unused/unused-doc-comments-edge-cases.stderr
similarity index 100%
rename from src/test/ui/unused/unused-doc-comments-edge-cases.stderr
rename to src/test/ui/lint/unused/unused-doc-comments-edge-cases.stderr
diff --git a/src/test/ui/unused/unused-doc-comments-for-macros.rs b/src/test/ui/lint/unused/unused-doc-comments-for-macros.rs
similarity index 100%
rename from src/test/ui/unused/unused-doc-comments-for-macros.rs
rename to src/test/ui/lint/unused/unused-doc-comments-for-macros.rs
diff --git a/src/test/ui/unused/unused-doc-comments-for-macros.stderr b/src/test/ui/lint/unused/unused-doc-comments-for-macros.stderr
similarity index 100%
rename from src/test/ui/unused/unused-doc-comments-for-macros.stderr
rename to src/test/ui/lint/unused/unused-doc-comments-for-macros.stderr
diff --git a/src/test/ui/unused/unused-macro-rules.rs b/src/test/ui/lint/unused/unused-macro-rules.rs
similarity index 100%
rename from src/test/ui/unused/unused-macro-rules.rs
rename to src/test/ui/lint/unused/unused-macro-rules.rs
diff --git a/src/test/ui/unused/unused-macro-rules.stderr b/src/test/ui/lint/unused/unused-macro-rules.stderr
similarity index 100%
rename from src/test/ui/unused/unused-macro-rules.stderr
rename to src/test/ui/lint/unused/unused-macro-rules.stderr
diff --git a/src/test/ui/unused/unused-macro-with-bad-frag-spec.rs b/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.rs
similarity index 100%
rename from src/test/ui/unused/unused-macro-with-bad-frag-spec.rs
rename to src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.rs
diff --git a/src/test/ui/unused/unused-macro-with-bad-frag-spec.stderr b/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr
similarity index 100%
rename from src/test/ui/unused/unused-macro-with-bad-frag-spec.stderr
rename to src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr
diff --git a/src/test/ui/unused/unused-macro-with-follow-violation.rs b/src/test/ui/lint/unused/unused-macro-with-follow-violation.rs
similarity index 100%
rename from src/test/ui/unused/unused-macro-with-follow-violation.rs
rename to src/test/ui/lint/unused/unused-macro-with-follow-violation.rs
diff --git a/src/test/ui/unused/unused-macro-with-follow-violation.stderr b/src/test/ui/lint/unused/unused-macro-with-follow-violation.stderr
similarity index 100%
rename from src/test/ui/unused/unused-macro-with-follow-violation.stderr
rename to src/test/ui/lint/unused/unused-macro-with-follow-violation.stderr
diff --git a/src/test/ui/unused/unused-macro.rs b/src/test/ui/lint/unused/unused-macro.rs
similarity index 100%
rename from src/test/ui/unused/unused-macro.rs
rename to src/test/ui/lint/unused/unused-macro.rs
diff --git a/src/test/ui/unused/unused-macro.stderr b/src/test/ui/lint/unused/unused-macro.stderr
similarity index 100%
rename from src/test/ui/unused/unused-macro.stderr
rename to src/test/ui/lint/unused/unused-macro.stderr
diff --git a/src/test/ui/unused/unused-mut-warning-captured-var.fixed b/src/test/ui/lint/unused/unused-mut-warning-captured-var.fixed
similarity index 100%
rename from src/test/ui/unused/unused-mut-warning-captured-var.fixed
rename to src/test/ui/lint/unused/unused-mut-warning-captured-var.fixed
diff --git a/src/test/ui/unused/unused-mut-warning-captured-var.rs b/src/test/ui/lint/unused/unused-mut-warning-captured-var.rs
similarity index 100%
rename from src/test/ui/unused/unused-mut-warning-captured-var.rs
rename to src/test/ui/lint/unused/unused-mut-warning-captured-var.rs
diff --git a/src/test/ui/unused/unused-mut-warning-captured-var.stderr b/src/test/ui/lint/unused/unused-mut-warning-captured-var.stderr
similarity index 100%
rename from src/test/ui/unused/unused-mut-warning-captured-var.stderr
rename to src/test/ui/lint/unused/unused-mut-warning-captured-var.stderr
diff --git a/src/test/ui/unused/unused-result.rs b/src/test/ui/lint/unused/unused-result.rs
similarity index 100%
rename from src/test/ui/unused/unused-result.rs
rename to src/test/ui/lint/unused/unused-result.rs
diff --git a/src/test/ui/unused/unused-result.stderr b/src/test/ui/lint/unused/unused-result.stderr
similarity index 100%
rename from src/test/ui/unused/unused-result.stderr
rename to src/test/ui/lint/unused/unused-result.stderr
diff --git a/src/test/ui/unused/useless-comment.rs b/src/test/ui/lint/unused/useless-comment.rs
similarity index 100%
rename from src/test/ui/unused/useless-comment.rs
rename to src/test/ui/lint/unused/useless-comment.rs
diff --git a/src/test/ui/unused/useless-comment.stderr b/src/test/ui/lint/unused/useless-comment.stderr
similarity index 100%
rename from src/test/ui/unused/useless-comment.stderr
rename to src/test/ui/lint/unused/useless-comment.stderr