diff --git a/src/test/ui/feature-gate-rustc-attrs-1.rs b/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.rs
similarity index 100%
rename from src/test/ui/feature-gate-rustc-attrs-1.rs
rename to src/test/ui/feature-gates/feature-gate-rustc-attrs-1.rs
diff --git a/src/test/ui/feature-gate-rustc-attrs-1.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr
similarity index 100%
rename from src/test/ui/feature-gate-rustc-attrs-1.stderr
rename to src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr
diff --git a/src/test/ui/feature-gate-uniform-paths.rs b/src/test/ui/feature-gates/feature-gate-uniform-paths.rs
similarity index 100%
rename from src/test/ui/feature-gate-uniform-paths.rs
rename to src/test/ui/feature-gates/feature-gate-uniform-paths.rs
diff --git a/src/test/ui/feature-gate-uniform-paths.stderr b/src/test/ui/feature-gates/feature-gate-uniform-paths.stderr
similarity index 100%
rename from src/test/ui/feature-gate-uniform-paths.stderr
rename to src/test/ui/feature-gates/feature-gate-uniform-paths.stderr
diff --git a/src/test/ui/feature-gate-unrestricted-attribute-tokens.rs b/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.rs
similarity index 100%
rename from src/test/ui/feature-gate-unrestricted-attribute-tokens.rs
rename to src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.rs
diff --git a/src/test/ui/feature-gate-unrestricted-attribute-tokens.stderr b/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.stderr
similarity index 100%
rename from src/test/ui/feature-gate-unrestricted-attribute-tokens.stderr
rename to src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.stderr