diff --git a/src/test/ui/auxiliary/arc_wake.rs b/src/test/ui/async-await/auxiliary/arc_wake.rs
similarity index 100%
rename from src/test/ui/auxiliary/arc_wake.rs
rename to src/test/ui/async-await/auxiliary/arc_wake.rs
diff --git a/src/test/run-pass/async-await-drop-order-for-async-fn-parameters.rs b/src/test/ui/async-await/drop-order-for-async-fn-parameters.rs
similarity index 100%
rename from src/test/run-pass/async-await-drop-order-for-async-fn-parameters.rs
rename to src/test/ui/async-await/drop-order-for-async-fn-parameters.rs
diff --git a/src/test/ui/async-await-drop-order-locals-are-hidden.rs b/src/test/ui/async-await/drop-order-locals-are-hidden.rs
similarity index 100%
rename from src/test/ui/async-await-drop-order-locals-are-hidden.rs
rename to src/test/ui/async-await/drop-order-locals-are-hidden.rs
diff --git a/src/test/ui/async-await-drop-order-locals-are-hidden.stderr b/src/test/ui/async-await/drop-order-locals-are-hidden.stderr
similarity index 77%
rename from src/test/ui/async-await-drop-order-locals-are-hidden.stderr
rename to src/test/ui/async-await/drop-order-locals-are-hidden.stderr
index b988b85d63d1b..ca0da6b7c962a 100644
--- a/src/test/ui/async-await-drop-order-locals-are-hidden.stderr
+++ b/src/test/ui/async-await/drop-order-locals-are-hidden.stderr
@@ -1,11 +1,11 @@
 error[E0425]: cannot find value `__arg1` in this scope
-  --> $DIR/async-await-drop-order-locals-are-hidden.rs:7:16
+  --> $DIR/drop-order-locals-are-hidden.rs:7:16
    |
 LL |     assert_eq!(__arg1, (1, 2, 3));
    |                ^^^^^^ not found in this scope
 
 error[E0425]: cannot find value `__arg2` in this scope
-  --> $DIR/async-await-drop-order-locals-are-hidden.rs:8:16
+  --> $DIR/drop-order-locals-are-hidden.rs:8:16
    |
 LL |     assert_eq!(__arg2, 4);
    |                ^^^^^^ not found in this scope