diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.rs b/src/test/ui/generics/generic-arg-mismatch-recover.rs
similarity index 100%
rename from src/test/ui/generic/generic-arg-mismatch-recover.rs
rename to src/test/ui/generics/generic-arg-mismatch-recover.rs
diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.stderr b/src/test/ui/generics/generic-arg-mismatch-recover.stderr
similarity index 100%
rename from src/test/ui/generic/generic-arg-mismatch-recover.stderr
rename to src/test/ui/generics/generic-arg-mismatch-recover.stderr
diff --git a/src/test/ui/generic/generic-extern-lifetime.rs b/src/test/ui/generics/generic-extern-lifetime.rs
similarity index 100%
rename from src/test/ui/generic/generic-extern-lifetime.rs
rename to src/test/ui/generics/generic-extern-lifetime.rs
diff --git a/src/test/ui/generic/generic-extern-lifetime.stderr b/src/test/ui/generics/generic-extern-lifetime.stderr
similarity index 100%
rename from src/test/ui/generic/generic-extern-lifetime.stderr
rename to src/test/ui/generics/generic-extern-lifetime.stderr
diff --git a/src/test/ui/generic/generic-extern.rs b/src/test/ui/generics/generic-extern.rs
similarity index 100%
rename from src/test/ui/generic/generic-extern.rs
rename to src/test/ui/generics/generic-extern.rs
diff --git a/src/test/ui/generic/generic-extern.stderr b/src/test/ui/generics/generic-extern.stderr
similarity index 100%
rename from src/test/ui/generic/generic-extern.stderr
rename to src/test/ui/generics/generic-extern.stderr
diff --git a/src/test/ui/generic/generic-impl-less-params-with-defaults.rs b/src/test/ui/generics/generic-impl-less-params-with-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-impl-less-params-with-defaults.rs
rename to src/test/ui/generics/generic-impl-less-params-with-defaults.rs
diff --git a/src/test/ui/generic/generic-impl-less-params-with-defaults.stderr b/src/test/ui/generics/generic-impl-less-params-with-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-impl-less-params-with-defaults.stderr
rename to src/test/ui/generics/generic-impl-less-params-with-defaults.stderr
diff --git a/src/test/ui/generic/generic-impl-more-params-with-defaults.rs b/src/test/ui/generics/generic-impl-more-params-with-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-impl-more-params-with-defaults.rs
rename to src/test/ui/generics/generic-impl-more-params-with-defaults.rs
diff --git a/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr b/src/test/ui/generics/generic-impl-more-params-with-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-impl-more-params-with-defaults.stderr
rename to src/test/ui/generics/generic-impl-more-params-with-defaults.stderr
diff --git a/src/test/ui/generic/generic-lifetime-trait-impl.rs b/src/test/ui/generics/generic-lifetime-trait-impl.rs
similarity index 100%
rename from src/test/ui/generic/generic-lifetime-trait-impl.rs
rename to src/test/ui/generics/generic-lifetime-trait-impl.rs
diff --git a/src/test/ui/generic/generic-lifetime-trait-impl.stderr b/src/test/ui/generics/generic-lifetime-trait-impl.stderr
similarity index 100%
rename from src/test/ui/generic/generic-lifetime-trait-impl.stderr
rename to src/test/ui/generics/generic-lifetime-trait-impl.stderr
diff --git a/src/test/ui/generic/generic-no-mangle.fixed b/src/test/ui/generics/generic-no-mangle.fixed
similarity index 100%
rename from src/test/ui/generic/generic-no-mangle.fixed
rename to src/test/ui/generics/generic-no-mangle.fixed
diff --git a/src/test/ui/generic/generic-no-mangle.rs b/src/test/ui/generics/generic-no-mangle.rs
similarity index 100%
rename from src/test/ui/generic/generic-no-mangle.rs
rename to src/test/ui/generics/generic-no-mangle.rs
diff --git a/src/test/ui/generic/generic-no-mangle.stderr b/src/test/ui/generics/generic-no-mangle.stderr
similarity index 100%
rename from src/test/ui/generic/generic-no-mangle.stderr
rename to src/test/ui/generics/generic-no-mangle.stderr
diff --git a/src/test/ui/generic/generic-non-trailing-defaults.rs b/src/test/ui/generics/generic-non-trailing-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-non-trailing-defaults.rs
rename to src/test/ui/generics/generic-non-trailing-defaults.rs
diff --git a/src/test/ui/generic/generic-non-trailing-defaults.stderr b/src/test/ui/generics/generic-non-trailing-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-non-trailing-defaults.stderr
rename to src/test/ui/generics/generic-non-trailing-defaults.stderr
diff --git a/src/test/ui/generic/generic-param-attrs.rs b/src/test/ui/generics/generic-param-attrs.rs
similarity index 100%
rename from src/test/ui/generic/generic-param-attrs.rs
rename to src/test/ui/generics/generic-param-attrs.rs
diff --git a/src/test/ui/generic/generic-type-less-params-with-defaults.rs b/src/test/ui/generics/generic-type-less-params-with-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-type-less-params-with-defaults.rs
rename to src/test/ui/generics/generic-type-less-params-with-defaults.rs
diff --git a/src/test/ui/generic/generic-type-less-params-with-defaults.stderr b/src/test/ui/generics/generic-type-less-params-with-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-type-less-params-with-defaults.stderr
rename to src/test/ui/generics/generic-type-less-params-with-defaults.stderr
diff --git a/src/test/ui/generic/generic-type-more-params-with-defaults.rs b/src/test/ui/generics/generic-type-more-params-with-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-type-more-params-with-defaults.rs
rename to src/test/ui/generics/generic-type-more-params-with-defaults.rs
diff --git a/src/test/ui/generic/generic-type-more-params-with-defaults.stderr b/src/test/ui/generics/generic-type-more-params-with-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-type-more-params-with-defaults.stderr
rename to src/test/ui/generics/generic-type-more-params-with-defaults.stderr
diff --git a/src/test/ui/generic/generic-type-params-forward-mention.rs b/src/test/ui/generics/generic-type-params-forward-mention.rs
similarity index 100%
rename from src/test/ui/generic/generic-type-params-forward-mention.rs
rename to src/test/ui/generics/generic-type-params-forward-mention.rs
diff --git a/src/test/ui/generic/generic-type-params-forward-mention.stderr b/src/test/ui/generics/generic-type-params-forward-mention.stderr
similarity index 100%
rename from src/test/ui/generic/generic-type-params-forward-mention.stderr
rename to src/test/ui/generics/generic-type-params-forward-mention.stderr
diff --git a/src/test/ui/generic/generic-type-params-name-repr.rs b/src/test/ui/generics/generic-type-params-name-repr.rs
similarity index 100%
rename from src/test/ui/generic/generic-type-params-name-repr.rs
rename to src/test/ui/generics/generic-type-params-name-repr.rs
diff --git a/src/test/ui/generic/generic-type-params-name-repr.stderr b/src/test/ui/generics/generic-type-params-name-repr.stderr
similarity index 100%
rename from src/test/ui/generic/generic-type-params-name-repr.stderr
rename to src/test/ui/generics/generic-type-params-name-repr.stderr
diff --git a/src/test/ui/generic/param-in-ct-in-ty-param-default.rs b/src/test/ui/generics/param-in-ct-in-ty-param-default.rs
similarity index 100%
rename from src/test/ui/generic/param-in-ct-in-ty-param-default.rs
rename to src/test/ui/generics/param-in-ct-in-ty-param-default.rs
diff --git a/src/test/ui/generic/param-in-ct-in-ty-param-default.stderr b/src/test/ui/generics/param-in-ct-in-ty-param-default.stderr
similarity index 100%
rename from src/test/ui/generic/param-in-ct-in-ty-param-default.stderr
rename to src/test/ui/generics/param-in-ct-in-ty-param-default.stderr