diff --git a/tests/ui/async-await/pin-reborrow-arg.rs b/tests/ui/async-await/pin-ergonomics/reborrow-arg.rs
similarity index 100%
rename from tests/ui/async-await/pin-reborrow-arg.rs
rename to tests/ui/async-await/pin-ergonomics/reborrow-arg.rs
diff --git a/tests/ui/async-await/pin-reborrow-const-as-mut.rs b/tests/ui/async-await/pin-ergonomics/reborrow-const-as-mut.rs
similarity index 100%
rename from tests/ui/async-await/pin-reborrow-const-as-mut.rs
rename to tests/ui/async-await/pin-ergonomics/reborrow-const-as-mut.rs
diff --git a/tests/ui/async-await/pin-reborrow-const-as-mut.stderr b/tests/ui/async-await/pin-ergonomics/reborrow-const-as-mut.stderr
similarity index 100%
rename from tests/ui/async-await/pin-reborrow-const-as-mut.stderr
rename to tests/ui/async-await/pin-ergonomics/reborrow-const-as-mut.stderr
diff --git a/tests/ui/async-await/pin-reborrow-once.rs b/tests/ui/async-await/pin-ergonomics/reborrow-once.rs
similarity index 100%
rename from tests/ui/async-await/pin-reborrow-once.rs
rename to tests/ui/async-await/pin-ergonomics/reborrow-once.rs
diff --git a/tests/ui/async-await/pin-reborrow-once.stderr b/tests/ui/async-await/pin-ergonomics/reborrow-once.stderr
similarity index 100%
rename from tests/ui/async-await/pin-reborrow-once.stderr
rename to tests/ui/async-await/pin-ergonomics/reborrow-once.stderr
diff --git a/tests/ui/async-await/pin-reborrow-self.rs b/tests/ui/async-await/pin-ergonomics/reborrow-self.rs
similarity index 100%
rename from tests/ui/async-await/pin-reborrow-self.rs
rename to tests/ui/async-await/pin-ergonomics/reborrow-self.rs
diff --git a/tests/ui/async-await/pin-reborrow-shorter.rs b/tests/ui/async-await/pin-ergonomics/reborrow-shorter.rs
similarity index 100%
rename from tests/ui/async-await/pin-reborrow-shorter.rs
rename to tests/ui/async-await/pin-ergonomics/reborrow-shorter.rs
diff --git a/tests/ui/async-await/pin-sugar-ambiguity.rs b/tests/ui/async-await/pin-ergonomics/sugar-ambiguity.rs
similarity index 100%
rename from tests/ui/async-await/pin-sugar-ambiguity.rs
rename to tests/ui/async-await/pin-ergonomics/sugar-ambiguity.rs
diff --git a/tests/ui/async-await/pin-sugar-no-const.rs b/tests/ui/async-await/pin-ergonomics/sugar-no-const.rs
similarity index 100%
rename from tests/ui/async-await/pin-sugar-no-const.rs
rename to tests/ui/async-await/pin-ergonomics/sugar-no-const.rs
diff --git a/tests/ui/async-await/pin-sugar-no-const.stderr b/tests/ui/async-await/pin-ergonomics/sugar-no-const.stderr
similarity index 100%
rename from tests/ui/async-await/pin-sugar-no-const.stderr
rename to tests/ui/async-await/pin-ergonomics/sugar-no-const.stderr
diff --git a/tests/ui/async-await/pin-sugar.rs b/tests/ui/async-await/pin-ergonomics/sugar.rs
similarity index 100%
rename from tests/ui/async-await/pin-sugar.rs
rename to tests/ui/async-await/pin-ergonomics/sugar.rs