diff --git a/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.rs b/src/test/ui/impl-trait/issues/infinite-impl-trait-issue-38064.rs
similarity index 100%
rename from src/test/ui/impl-trait/infinite-impl-trait-issue-38064.rs
rename to src/test/ui/impl-trait/issues/infinite-impl-trait-issue-38064.rs
diff --git a/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.stderr b/src/test/ui/impl-trait/issues/infinite-impl-trait-issue-38064.stderr
similarity index 100%
rename from src/test/ui/impl-trait/infinite-impl-trait-issue-38064.stderr
rename to src/test/ui/impl-trait/issues/infinite-impl-trait-issue-38064.stderr
diff --git a/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.rs b/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.rs
rename to src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.rs
diff --git a/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr b/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
similarity index 100%
rename from src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr
rename to src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
diff --git a/src/test/ui/impl-trait/issue-42479.rs b/src/test/ui/impl-trait/issues/issue-42479.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-42479.rs
rename to src/test/ui/impl-trait/issues/issue-42479.rs
diff --git a/src/test/ui/impl-trait/issue-49376.rs b/src/test/ui/impl-trait/issues/issue-49376.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-49376.rs
rename to src/test/ui/impl-trait/issues/issue-49376.rs
diff --git a/src/test/ui/impl-trait/issue-52128.rs b/src/test/ui/impl-trait/issues/issue-52128.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-52128.rs
rename to src/test/ui/impl-trait/issues/issue-52128.rs
diff --git a/src/test/ui/impl-trait/issue-53457.rs b/src/test/ui/impl-trait/issues/issue-53457.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-53457.rs
rename to src/test/ui/impl-trait/issues/issue-53457.rs
diff --git a/src/test/ui/impl-trait/issue-55608-captures-empty-region.rs b/src/test/ui/impl-trait/issues/issue-55608-captures-empty-region.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-55608-captures-empty-region.rs
rename to src/test/ui/impl-trait/issues/issue-55608-captures-empty-region.rs
diff --git a/src/test/ui/impl-trait/issue-57464-unexpected-regions.rs b/src/test/ui/impl-trait/issues/issue-57464-unexpected-regions.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-57464-unexpected-regions.rs
rename to src/test/ui/impl-trait/issues/issue-57464-unexpected-regions.rs
diff --git a/src/test/ui/impl-trait/issue-57979-deeply-nested-impl-trait-in-assoc-proj.rs b/src/test/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-57979-deeply-nested-impl-trait-in-assoc-proj.rs
rename to src/test/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.rs
diff --git a/src/test/ui/impl-trait/issue-57979-deeply-nested-impl-trait-in-assoc-proj.stderr b/src/test/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.stderr
similarity index 100%
rename from src/test/ui/impl-trait/issue-57979-deeply-nested-impl-trait-in-assoc-proj.stderr
rename to src/test/ui/impl-trait/issues/issue-57979-deeply-nested-impl-trait-in-assoc-proj.stderr
diff --git a/src/test/ui/impl-trait/issue-57979-impl-trait-in-path.rs b/src/test/ui/impl-trait/issues/issue-57979-impl-trait-in-path.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-57979-impl-trait-in-path.rs
rename to src/test/ui/impl-trait/issues/issue-57979-impl-trait-in-path.rs
diff --git a/src/test/ui/impl-trait/issue-57979-impl-trait-in-path.stderr b/src/test/ui/impl-trait/issues/issue-57979-impl-trait-in-path.stderr
similarity index 100%
rename from src/test/ui/impl-trait/issue-57979-impl-trait-in-path.stderr
rename to src/test/ui/impl-trait/issues/issue-57979-impl-trait-in-path.stderr
diff --git a/src/test/ui/impl-trait/issue-57979-nested-impl-trait-in-assoc-proj.rs b/src/test/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.rs
similarity index 100%
rename from src/test/ui/impl-trait/issue-57979-nested-impl-trait-in-assoc-proj.rs
rename to src/test/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.rs
diff --git a/src/test/ui/impl-trait/issue-57979-nested-impl-trait-in-assoc-proj.stderr b/src/test/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.stderr
similarity index 100%
rename from src/test/ui/impl-trait/issue-57979-nested-impl-trait-in-assoc-proj.stderr
rename to src/test/ui/impl-trait/issues/issue-57979-nested-impl-trait-in-assoc-proj.stderr
diff --git a/src/test/ui/impl-trait/universal-issue-48703.rs b/src/test/ui/impl-trait/issues/universal-issue-48703.rs
similarity index 100%
rename from src/test/ui/impl-trait/universal-issue-48703.rs
rename to src/test/ui/impl-trait/issues/universal-issue-48703.rs
diff --git a/src/test/ui/impl-trait/universal-issue-48703.stderr b/src/test/ui/impl-trait/issues/universal-issue-48703.stderr
similarity index 100%
rename from src/test/ui/impl-trait/universal-issue-48703.stderr
rename to src/test/ui/impl-trait/issues/universal-issue-48703.stderr
diff --git a/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.rs b/src/test/ui/impl-trait/issues/universal-turbofish-in-method-issue-50950.rs
similarity index 100%
rename from src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.rs
rename to src/test/ui/impl-trait/issues/universal-turbofish-in-method-issue-50950.rs
diff --git a/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.stderr b/src/test/ui/impl-trait/issues/universal-turbofish-in-method-issue-50950.stderr
similarity index 100%
rename from src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.stderr
rename to src/test/ui/impl-trait/issues/universal-turbofish-in-method-issue-50950.stderr