diff --git a/src/test/ui/feature-gate-custom_test_frameworks.rs b/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.rs
similarity index 100%
rename from src/test/ui/feature-gate-custom_test_frameworks.rs
rename to src/test/ui/feature-gates/feature-gate-custom_test_frameworks.rs
diff --git a/src/test/ui/feature-gate-custom_test_frameworks.stderr b/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
similarity index 100%
rename from src/test/ui/feature-gate-custom_test_frameworks.stderr
rename to src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
diff --git a/src/test/ui/feature-gate-doc_cfg-cfg-rustdoc.rs b/src/test/ui/feature-gates/feature-gate-doc_cfg-cfg-rustdoc.rs
similarity index 100%
rename from src/test/ui/feature-gate-doc_cfg-cfg-rustdoc.rs
rename to src/test/ui/feature-gates/feature-gate-doc_cfg-cfg-rustdoc.rs
diff --git a/src/test/ui/feature-gate-doc_cfg-cfg-rustdoc.stderr b/src/test/ui/feature-gates/feature-gate-doc_cfg-cfg-rustdoc.stderr
similarity index 100%
rename from src/test/ui/feature-gate-doc_cfg-cfg-rustdoc.stderr
rename to src/test/ui/feature-gates/feature-gate-doc_cfg-cfg-rustdoc.stderr
diff --git a/src/test/ui/feature-gate-underscore_const_names.rs b/src/test/ui/feature-gates/feature-gate-underscore_const_names.rs
similarity index 100%
rename from src/test/ui/feature-gate-underscore_const_names.rs
rename to src/test/ui/feature-gates/feature-gate-underscore_const_names.rs
diff --git a/src/test/ui/feature-gate-underscore_const_names.stderr b/src/test/ui/feature-gates/feature-gate-underscore_const_names.stderr
similarity index 100%
rename from src/test/ui/feature-gate-underscore_const_names.stderr
rename to src/test/ui/feature-gates/feature-gate-underscore_const_names.stderr
diff --git a/src/test/ui/feature-gate-unsized_locals.rs b/src/test/ui/feature-gates/feature-gate-unsized_locals.rs
similarity index 100%
rename from src/test/ui/feature-gate-unsized_locals.rs
rename to src/test/ui/feature-gates/feature-gate-unsized_locals.rs
diff --git a/src/test/ui/feature-gate-unsized_locals.stderr b/src/test/ui/feature-gates/feature-gate-unsized_locals.stderr
similarity index 100%
rename from src/test/ui/feature-gate-unsized_locals.stderr
rename to src/test/ui/feature-gates/feature-gate-unsized_locals.stderr