diff --git a/src/test/ui/associated-const/associated-const-ambiguity-report.rs b/src/test/ui/associated-consts/associated-const-ambiguity-report.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-ambiguity-report.rs
rename to src/test/ui/associated-consts/associated-const-ambiguity-report.rs
diff --git a/src/test/ui/associated-const/associated-const-ambiguity-report.stderr b/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-ambiguity-report.stderr
rename to src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
diff --git a/src/test/ui/associated-const/associated-const-array-len.rs b/src/test/ui/associated-consts/associated-const-array-len.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-array-len.rs
rename to src/test/ui/associated-consts/associated-const-array-len.rs
diff --git a/src/test/ui/associated-const/associated-const-array-len.stderr b/src/test/ui/associated-consts/associated-const-array-len.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-array-len.stderr
rename to src/test/ui/associated-consts/associated-const-array-len.stderr
diff --git a/src/test/ui/associated-const/associated-const-dead-code.rs b/src/test/ui/associated-consts/associated-const-dead-code.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-dead-code.rs
rename to src/test/ui/associated-consts/associated-const-dead-code.rs
diff --git a/src/test/ui/associated-const/associated-const-dead-code.stderr b/src/test/ui/associated-consts/associated-const-dead-code.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-dead-code.stderr
rename to src/test/ui/associated-consts/associated-const-dead-code.stderr
diff --git a/src/test/ui/associated-const/associated-const-generic-obligations.rs b/src/test/ui/associated-consts/associated-const-generic-obligations.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-generic-obligations.rs
rename to src/test/ui/associated-consts/associated-const-generic-obligations.rs
diff --git a/src/test/ui/associated-const/associated-const-generic-obligations.stderr b/src/test/ui/associated-consts/associated-const-generic-obligations.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-generic-obligations.stderr
rename to src/test/ui/associated-consts/associated-const-generic-obligations.stderr
diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs b/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs
rename to src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr b/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr
rename to src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-type.rs b/src/test/ui/associated-consts/associated-const-impl-wrong-type.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-impl-wrong-type.rs
rename to src/test/ui/associated-consts/associated-const-impl-wrong-type.rs
diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr b/src/test/ui/associated-consts/associated-const-impl-wrong-type.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-impl-wrong-type.stderr
rename to src/test/ui/associated-consts/associated-const-impl-wrong-type.stderr
diff --git a/src/test/ui/associated-const/associated-const-in-trait.rs b/src/test/ui/associated-consts/associated-const-in-trait.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-in-trait.rs
rename to src/test/ui/associated-consts/associated-const-in-trait.rs
diff --git a/src/test/ui/associated-const/associated-const-in-trait.stderr b/src/test/ui/associated-consts/associated-const-in-trait.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-in-trait.stderr
rename to src/test/ui/associated-consts/associated-const-in-trait.stderr
diff --git a/src/test/ui/associated-const/associated-const-no-item.rs b/src/test/ui/associated-consts/associated-const-no-item.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-no-item.rs
rename to src/test/ui/associated-consts/associated-const-no-item.rs
diff --git a/src/test/ui/associated-const/associated-const-no-item.stderr b/src/test/ui/associated-consts/associated-const-no-item.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-no-item.stderr
rename to src/test/ui/associated-consts/associated-const-no-item.stderr
diff --git a/src/test/ui/associated-const/associated-const-private-impl.rs b/src/test/ui/associated-consts/associated-const-private-impl.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-private-impl.rs
rename to src/test/ui/associated-consts/associated-const-private-impl.rs
diff --git a/src/test/ui/associated-const/associated-const-private-impl.stderr b/src/test/ui/associated-consts/associated-const-private-impl.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-private-impl.stderr
rename to src/test/ui/associated-consts/associated-const-private-impl.stderr
diff --git a/src/test/ui/associated-const/associated-const-trait-bound.rs b/src/test/ui/associated-consts/associated-const-trait-bound.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-trait-bound.rs
rename to src/test/ui/associated-consts/associated-const-trait-bound.rs
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arms.rs b/src/test/ui/associated-consts/associated-const-type-parameter-arms.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arms.rs
rename to src/test/ui/associated-consts/associated-const-type-parameter-arms.rs
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arms.stderr b/src/test/ui/associated-consts/associated-const-type-parameter-arms.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arms.stderr
rename to src/test/ui/associated-consts/associated-const-type-parameter-arms.stderr
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs b/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs
rename to src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr b/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr
rename to src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays.rs b/src/test/ui/associated-consts/associated-const-type-parameter-arrays.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arrays.rs
rename to src/test/ui/associated-consts/associated-const-type-parameter-arrays.rs
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr b/src/test/ui/associated-consts/associated-const-type-parameter-arrays.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr
rename to src/test/ui/associated-consts/associated-const-type-parameter-arrays.stderr
diff --git a/src/test/ui/associated-const/defaults-cyclic-fail.rs b/src/test/ui/associated-consts/defaults-cyclic-fail.rs
similarity index 100%
rename from src/test/ui/associated-const/defaults-cyclic-fail.rs
rename to src/test/ui/associated-consts/defaults-cyclic-fail.rs
diff --git a/src/test/ui/associated-const/defaults-cyclic-fail.stderr b/src/test/ui/associated-consts/defaults-cyclic-fail.stderr
similarity index 100%
rename from src/test/ui/associated-const/defaults-cyclic-fail.stderr
rename to src/test/ui/associated-consts/defaults-cyclic-fail.stderr
diff --git a/src/test/ui/associated-const/defaults-cyclic-pass.rs b/src/test/ui/associated-consts/defaults-cyclic-pass.rs
similarity index 100%
rename from src/test/ui/associated-const/defaults-cyclic-pass.rs
rename to src/test/ui/associated-consts/defaults-cyclic-pass.rs
diff --git a/src/test/ui/associated-const/defaults-not-assumed-fail.rs b/src/test/ui/associated-consts/defaults-not-assumed-fail.rs
similarity index 100%
rename from src/test/ui/associated-const/defaults-not-assumed-fail.rs
rename to src/test/ui/associated-consts/defaults-not-assumed-fail.rs
diff --git a/src/test/ui/associated-const/defaults-not-assumed-fail.stderr b/src/test/ui/associated-consts/defaults-not-assumed-fail.stderr
similarity index 100%
rename from src/test/ui/associated-const/defaults-not-assumed-fail.stderr
rename to src/test/ui/associated-consts/defaults-not-assumed-fail.stderr
diff --git a/src/test/ui/associated-const/defaults-not-assumed-pass.rs b/src/test/ui/associated-consts/defaults-not-assumed-pass.rs
similarity index 100%
rename from src/test/ui/associated-const/defaults-not-assumed-pass.rs
rename to src/test/ui/associated-consts/defaults-not-assumed-pass.rs
diff --git a/src/test/ui/associated-const/issue-63496.rs b/src/test/ui/associated-consts/issue-63496.rs
similarity index 100%
rename from src/test/ui/associated-const/issue-63496.rs
rename to src/test/ui/associated-consts/issue-63496.rs
diff --git a/src/test/ui/associated-const/issue-63496.stderr b/src/test/ui/associated-consts/issue-63496.stderr
similarity index 100%
rename from src/test/ui/associated-const/issue-63496.stderr
rename to src/test/ui/associated-consts/issue-63496.stderr
diff --git a/src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.noopt.stderr b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
similarity index 100%
rename from src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.noopt.stderr
rename to src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
diff --git a/src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.opt.stderr b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
similarity index 100%
rename from src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.opt.stderr
rename to src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
diff --git a/src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
similarity index 100%
rename from src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
rename to src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.rs b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
similarity index 100%
rename from src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.rs
rename to src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs