diff --git a/src/test/ui/hrtb/complex.rs b/src/test/ui/higher-rank-trait-bounds/complex.rs
similarity index 100%
rename from src/test/ui/hrtb/complex.rs
rename to src/test/ui/higher-rank-trait-bounds/complex.rs
diff --git a/src/test/ui/hrtb/due-to-where-clause.rs b/src/test/ui/higher-rank-trait-bounds/due-to-where-clause.rs
similarity index 100%
rename from src/test/ui/hrtb/due-to-where-clause.rs
rename to src/test/ui/higher-rank-trait-bounds/due-to-where-clause.rs
diff --git a/src/test/ui/hrtb/due-to-where-clause.stderr b/src/test/ui/higher-rank-trait-bounds/due-to-where-clause.stderr
similarity index 100%
rename from src/test/ui/hrtb/due-to-where-clause.stderr
rename to src/test/ui/higher-rank-trait-bounds/due-to-where-clause.stderr
diff --git a/src/test/ui/hrtb/hrtb-cache-issue-54302.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-cache-issue-54302.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.rs
diff --git a/src/test/ui/hrtb/hrtb-cache-issue-54302.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-cache-issue-54302.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-cache-issue-54302.stderr
diff --git a/src/test/ui/hrtb/hrtb-conflate-regions.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-conflate-regions.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-conflate-regions.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-conflate-regions.rs
diff --git a/src/test/ui/hrtb/hrtb-conflate-regions.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-conflate-regions.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-conflate-regions.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-conflate-regions.stderr
diff --git a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-debruijn-in-receiver.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.rs
diff --git a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-in-receiver.stderr
diff --git a/src/test/ui/hrtb/hrtb-exists-forall-fn.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-exists-forall-fn.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.rs
diff --git a/src/test/ui/hrtb/hrtb-exists-forall-fn.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-exists-forall-fn.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-fn.stderr
diff --git a/src/test/ui/hrtb/hrtb-exists-forall-trait-contravariant.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-exists-forall-trait-contravariant.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.rs
diff --git a/src/test/ui/hrtb/hrtb-exists-forall-trait-contravariant.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-exists-forall-trait-contravariant.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-contravariant.stderr
diff --git a/src/test/ui/hrtb/hrtb-exists-forall-trait-covariant.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-covariant.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-exists-forall-trait-covariant.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-covariant.rs
diff --git a/src/test/ui/hrtb/hrtb-exists-forall-trait-invariant.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-exists-forall-trait-invariant.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.rs
diff --git a/src/test/ui/hrtb/hrtb-exists-forall-trait-invariant.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-exists-forall-trait-invariant.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-exists-forall-trait-invariant.stderr
diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.rs
diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits-transitive.stderr
diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-higher-ranker-supertraits.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.rs
diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-higher-ranker-supertraits.stderr
diff --git a/src/test/ui/hrtb/hrtb-identity-fn-borrows.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-identity-fn-borrows.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.rs
diff --git a/src/test/ui/hrtb/hrtb-identity-fn-borrows.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-identity-fn-borrows.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-identity-fn-borrows.stderr
diff --git a/src/test/ui/hrtb/hrtb-just-for-static.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-just-for-static.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-just-for-static.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-just-for-static.rs
diff --git a/src/test/ui/hrtb/hrtb-just-for-static.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-just-for-static.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-just-for-static.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-just-for-static.stderr
diff --git a/src/test/ui/hrtb/hrtb-perfect-forwarding.polonius.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.polonius.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-perfect-forwarding.polonius.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.polonius.stderr
diff --git a/src/test/ui/hrtb/hrtb-perfect-forwarding.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.rs
similarity index 100%
rename from src/test/ui/hrtb/hrtb-perfect-forwarding.rs
rename to src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.rs
diff --git a/src/test/ui/hrtb/hrtb-perfect-forwarding.stderr b/src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.stderr
similarity index 100%
rename from src/test/ui/hrtb/hrtb-perfect-forwarding.stderr
rename to src/test/ui/higher-rank-trait-bounds/hrtb-perfect-forwarding.stderr
diff --git a/src/test/ui/hrtb/issue-30786.rs b/src/test/ui/higher-rank-trait-bounds/issue-30786.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-30786.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-30786.rs
diff --git a/src/test/ui/hrtb/issue-30786.stderr b/src/test/ui/higher-rank-trait-bounds/issue-30786.stderr
similarity index 100%
rename from src/test/ui/hrtb/issue-30786.stderr
rename to src/test/ui/higher-rank-trait-bounds/issue-30786.stderr
diff --git a/src/test/ui/hrtb/issue-46989.rs b/src/test/ui/higher-rank-trait-bounds/issue-46989.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-46989.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-46989.rs
diff --git a/src/test/ui/hrtb/issue-46989.stderr b/src/test/ui/higher-rank-trait-bounds/issue-46989.stderr
similarity index 100%
rename from src/test/ui/hrtb/issue-46989.stderr
rename to src/test/ui/higher-rank-trait-bounds/issue-46989.stderr
diff --git a/src/test/ui/hrtb/issue-57639.rs b/src/test/ui/higher-rank-trait-bounds/issue-57639.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-57639.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-57639.rs
diff --git a/src/test/ui/hrtb/issue-58451.rs b/src/test/ui/higher-rank-trait-bounds/issue-58451.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-58451.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-58451.rs
diff --git a/src/test/ui/hrtb/issue-58451.stderr b/src/test/ui/higher-rank-trait-bounds/issue-58451.stderr
similarity index 100%
rename from src/test/ui/hrtb/issue-58451.stderr
rename to src/test/ui/higher-rank-trait-bounds/issue-58451.stderr
diff --git a/src/test/ui/hrtb/issue-62203-hrtb-ice.rs b/src/test/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-62203-hrtb-ice.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.rs
diff --git a/src/test/ui/hrtb/issue-62203-hrtb-ice.stderr b/src/test/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr
similarity index 100%
rename from src/test/ui/hrtb/issue-62203-hrtb-ice.stderr
rename to src/test/ui/higher-rank-trait-bounds/issue-62203-hrtb-ice.stderr
diff --git a/src/test/ui/hrtb/issue-88446.rs b/src/test/ui/higher-rank-trait-bounds/issue-88446.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-88446.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-88446.rs
diff --git a/src/test/ui/hrtb/issue-90177.rs b/src/test/ui/higher-rank-trait-bounds/issue-90177.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-90177.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-90177.rs
diff --git a/src/test/ui/hrtb/issue-95034.rs b/src/test/ui/higher-rank-trait-bounds/issue-95034.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-95034.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-95034.rs
diff --git a/src/test/ui/hrtb/issue-95034.stderr b/src/test/ui/higher-rank-trait-bounds/issue-95034.stderr
similarity index 100%
rename from src/test/ui/hrtb/issue-95034.stderr
rename to src/test/ui/higher-rank-trait-bounds/issue-95034.stderr
diff --git a/src/test/ui/hrtb/issue-95230.rs b/src/test/ui/higher-rank-trait-bounds/issue-95230.rs
similarity index 100%
rename from src/test/ui/hrtb/issue-95230.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-95230.rs