diff --git a/src/test/ui/issues/issue-63398.rs b/src/test/ui/async-await/issues/non-async-enclosing-span.rs
similarity index 52%
rename from src/test/ui/issues/issue-63398.rs
rename to src/test/ui/async-await/issues/non-async-enclosing-span.rs
index a031687845652..838911d9b6e8f 100644
--- a/src/test/ui/issues/issue-63398.rs
+++ b/src/test/ui/async-await/issues/non-async-enclosing-span.rs
@@ -4,8 +4,9 @@
 async fn do_the_thing() -> u8 {
     8
 }
-
-fn main() {
+// #63398: point at the enclosing scope and not the previously seen closure
+fn main() {  //~ NOTE this is not `async`
     let x = move || {};
     let y = do_the_thing().await; //~ ERROR `await` is only allowed inside `async` functions
+    //~^ NOTE only allowed inside `async` functions and blocks
 }
diff --git a/src/test/ui/issues/issue-63398.stderr b/src/test/ui/async-await/issues/non-async-enclosing-span.stderr
similarity index 87%
rename from src/test/ui/issues/issue-63398.stderr
rename to src/test/ui/async-await/issues/non-async-enclosing-span.stderr
index b2ba46ce317cd..f492c1a8045b5 100644
--- a/src/test/ui/issues/issue-63398.stderr
+++ b/src/test/ui/async-await/issues/non-async-enclosing-span.stderr
@@ -1,5 +1,5 @@
 error[E0728]: `await` is only allowed inside `async` functions and blocks
-  --> $DIR/issue-63398.rs:10:13
+  --> $DIR/non-async-enclosing-span.rs:10:13
    |
 LL | fn main() {
    |    ---- this is not `async`