diff --git a/src/test/ui/feature-gate/allow-features-empty.rs b/src/test/ui/feature-gates/allow-features-empty.rs
similarity index 100%
rename from src/test/ui/feature-gate/allow-features-empty.rs
rename to src/test/ui/feature-gates/allow-features-empty.rs
diff --git a/src/test/ui/feature-gate/allow-features-empty.stderr b/src/test/ui/feature-gates/allow-features-empty.stderr
similarity index 100%
rename from src/test/ui/feature-gate/allow-features-empty.stderr
rename to src/test/ui/feature-gates/allow-features-empty.stderr
diff --git a/src/test/ui/feature-gate/allow-features.rs b/src/test/ui/feature-gates/allow-features.rs
similarity index 100%
rename from src/test/ui/feature-gate/allow-features.rs
rename to src/test/ui/feature-gates/allow-features.rs
diff --git a/src/test/ui/feature-gate/allow-features.stderr b/src/test/ui/feature-gates/allow-features.stderr
similarity index 100%
rename from src/test/ui/feature-gate/allow-features.stderr
rename to src/test/ui/feature-gates/allow-features.stderr
diff --git a/src/test/ui/feature-gate/duplicate-features.rs b/src/test/ui/feature-gates/duplicate-features.rs
similarity index 100%
rename from src/test/ui/feature-gate/duplicate-features.rs
rename to src/test/ui/feature-gates/duplicate-features.rs
diff --git a/src/test/ui/feature-gate/duplicate-features.stderr b/src/test/ui/feature-gates/duplicate-features.stderr
similarity index 100%
rename from src/test/ui/feature-gate/duplicate-features.stderr
rename to src/test/ui/feature-gates/duplicate-features.stderr
diff --git a/src/test/ui/feature-gate/feature-gate-c_variadic.rs b/src/test/ui/feature-gates/feature-gate-c_variadic.rs
similarity index 100%
rename from src/test/ui/feature-gate/feature-gate-c_variadic.rs
rename to src/test/ui/feature-gates/feature-gate-c_variadic.rs
diff --git a/src/test/ui/feature-gate/feature-gate-c_variadic.stderr b/src/test/ui/feature-gates/feature-gate-c_variadic.stderr
similarity index 100%
rename from src/test/ui/feature-gate/feature-gate-c_variadic.stderr
rename to src/test/ui/feature-gates/feature-gate-c_variadic.stderr
diff --git a/src/test/ui/feature-gate-inline_const.rs b/src/test/ui/feature-gates/feature-gate-inline_const.rs
similarity index 100%
rename from src/test/ui/feature-gate-inline_const.rs
rename to src/test/ui/feature-gates/feature-gate-inline_const.rs
diff --git a/src/test/ui/feature-gate-inline_const.stderr b/src/test/ui/feature-gates/feature-gate-inline_const.stderr
similarity index 100%
rename from src/test/ui/feature-gate-inline_const.stderr
rename to src/test/ui/feature-gates/feature-gate-inline_const.stderr
diff --git a/src/test/ui/feature-gate-isa_attribute.rs b/src/test/ui/feature-gates/feature-gate-isa_attribute.rs
similarity index 100%
rename from src/test/ui/feature-gate-isa_attribute.rs
rename to src/test/ui/feature-gates/feature-gate-isa_attribute.rs
diff --git a/src/test/ui/feature-gate-isa_attribute.stderr b/src/test/ui/feature-gates/feature-gate-isa_attribute.stderr
similarity index 100%
rename from src/test/ui/feature-gate-isa_attribute.stderr
rename to src/test/ui/feature-gates/feature-gate-isa_attribute.stderr
diff --git a/src/test/ui/feature-gate-optimize_attribute.rs b/src/test/ui/feature-gates/feature-gate-optimize_attribute.rs
similarity index 100%
rename from src/test/ui/feature-gate-optimize_attribute.rs
rename to src/test/ui/feature-gates/feature-gate-optimize_attribute.rs
diff --git a/src/test/ui/feature-gate-optimize_attribute.stderr b/src/test/ui/feature-gates/feature-gate-optimize_attribute.stderr
similarity index 100%
rename from src/test/ui/feature-gate-optimize_attribute.stderr
rename to src/test/ui/feature-gates/feature-gate-optimize_attribute.stderr
diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs b/src/test/ui/feature-gates/feature-gate-static-nobundle-2.rs
similarity index 100%
rename from src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
rename to src/test/ui/feature-gates/feature-gate-static-nobundle-2.rs
diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr b/src/test/ui/feature-gates/feature-gate-static-nobundle-2.stderr
similarity index 100%
rename from src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
rename to src/test/ui/feature-gates/feature-gate-static-nobundle-2.stderr
diff --git a/src/test/ui/feature-gated-feature-in-macro-arg.rs b/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.rs
similarity index 100%
rename from src/test/ui/feature-gated-feature-in-macro-arg.rs
rename to src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.rs
diff --git a/src/test/ui/feature-gated-feature-in-macro-arg.stderr b/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.stderr
similarity index 100%
rename from src/test/ui/feature-gated-feature-in-macro-arg.stderr
rename to src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-bench.rs b/src/test/ui/feature-gates/issue-43106-gating-of-bench.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-bench.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-bench.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-bench.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-bench.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.rs b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs b/src/test/ui/feature-gates/issue-43106-gating-of-deprecated.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-deprecated.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs b/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-derive-2.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-derive-2.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive.rs b/src/test/ui/feature-gates/issue-43106-gating-of-derive.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-derive.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-derive.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-derive.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-derive.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs b/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs b/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-macro_use.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-macro_use.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs b/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs b/src/test/ui/feature-gates/issue-43106-gating-of-rustc_deprecated.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-rustc_deprecated.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-rustc_deprecated.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-rustc_deprecated.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-stable.rs b/src/test/ui/feature-gates/issue-43106-gating-of-stable.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-stable.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-stable.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-stable.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-stable.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-test.rs b/src/test/ui/feature-gates/issue-43106-gating-of-test.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-test.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-test.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-test.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-test.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-test.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-test.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs b/src/test/ui/feature-gates/issue-43106-gating-of-unstable.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs
rename to src/test/ui/feature-gates/issue-43106-gating-of-unstable.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-unstable.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
rename to src/test/ui/feature-gates/issue-43106-gating-of-unstable.stderr
diff --git a/src/test/ui/feature-gate/issue-49983-see-issue-0.rs b/src/test/ui/feature-gates/issue-49983-see-issue-0.rs
similarity index 100%
rename from src/test/ui/feature-gate/issue-49983-see-issue-0.rs
rename to src/test/ui/feature-gates/issue-49983-see-issue-0.rs
diff --git a/src/test/ui/feature-gate/issue-49983-see-issue-0.stderr b/src/test/ui/feature-gates/issue-49983-see-issue-0.stderr
similarity index 100%
rename from src/test/ui/feature-gate/issue-49983-see-issue-0.stderr
rename to src/test/ui/feature-gates/issue-49983-see-issue-0.stderr
diff --git a/src/test/ui/feature-gate/rustc-private.rs b/src/test/ui/feature-gates/rustc-private.rs
similarity index 100%
rename from src/test/ui/feature-gate/rustc-private.rs
rename to src/test/ui/feature-gates/rustc-private.rs
diff --git a/src/test/ui/feature-gate/rustc-private.stderr b/src/test/ui/feature-gates/rustc-private.stderr
similarity index 100%
rename from src/test/ui/feature-gate/rustc-private.stderr
rename to src/test/ui/feature-gates/rustc-private.stderr
diff --git a/src/test/ui/feature-gate/stability-attribute-consistency.rs b/src/test/ui/feature-gates/stability-attribute-consistency.rs
similarity index 100%
rename from src/test/ui/feature-gate/stability-attribute-consistency.rs
rename to src/test/ui/feature-gates/stability-attribute-consistency.rs
diff --git a/src/test/ui/feature-gate/stability-attribute-consistency.stderr b/src/test/ui/feature-gates/stability-attribute-consistency.stderr
similarity index 100%
rename from src/test/ui/feature-gate/stability-attribute-consistency.stderr
rename to src/test/ui/feature-gates/stability-attribute-consistency.stderr
diff --git a/src/test/ui/feature-gate/unknown-feature.rs b/src/test/ui/feature-gates/unknown-feature.rs
similarity index 100%
rename from src/test/ui/feature-gate/unknown-feature.rs
rename to src/test/ui/feature-gates/unknown-feature.rs
diff --git a/src/test/ui/feature-gate/unknown-feature.stderr b/src/test/ui/feature-gates/unknown-feature.stderr
similarity index 100%
rename from src/test/ui/feature-gate/unknown-feature.stderr
rename to src/test/ui/feature-gates/unknown-feature.stderr
diff --git a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs b/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.rs
similarity index 100%
rename from src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs
rename to src/test/ui/feature-gates/unstable-attribute-allow-issue-0.rs
diff --git a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr b/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.stderr
similarity index 100%
rename from src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr
rename to src/test/ui/feature-gates/unstable-attribute-allow-issue-0.stderr