diff --git a/tests/ui/README.md b/tests/ui/README.md
index a9f1c61c6b66..11003bbef992 100644
--- a/tests/ui/README.md
+++ b/tests/ui/README.md
@@ -1561,12 +1561,6 @@ Tests on various well-formedness checks, e.g. [Type-checking normal functions](h
 
 Tests on `where` clauses. See [Where clauses | Reference](https://doc.rust-lang.org/reference/items/generics.html#where-clauses).
 
-## `tests/ui/while/`
-
-Tests on the `while` keyword and the `while` construct.
-
-**FIXME**: merge with `ui/for-loop-while`.
-
 ## `tests/ui/windows-subsystem/`: `#![windows_subsystem = ""]`
 
 See [the `windows_subsystem` attribute](https://doc.rust-lang.org/reference/runtime.html#the-windows_subsystem-attribute).
diff --git a/tests/ui/while/while-else-err.rs b/tests/ui/for-loop-while/while-else-err.rs
similarity index 100%
rename from tests/ui/while/while-else-err.rs
rename to tests/ui/for-loop-while/while-else-err.rs
diff --git a/tests/ui/while/while-else-err.stderr b/tests/ui/for-loop-while/while-else-err.stderr
similarity index 100%
rename from tests/ui/while/while-else-err.stderr
rename to tests/ui/for-loop-while/while-else-err.stderr
diff --git a/tests/ui/while/while-else-let-else-err.rs b/tests/ui/for-loop-while/while-else-let-else-err.rs
similarity index 100%
rename from tests/ui/while/while-else-let-else-err.rs
rename to tests/ui/for-loop-while/while-else-let-else-err.rs
diff --git a/tests/ui/while/while-else-let-else-err.stderr b/tests/ui/for-loop-while/while-else-let-else-err.stderr
similarity index 100%
rename from tests/ui/while/while-else-let-else-err.stderr
rename to tests/ui/for-loop-while/while-else-let-else-err.stderr
diff --git a/tests/ui/while/while-let-scope-issue-40235.rs b/tests/ui/for-loop-while/while-let-scope.rs
similarity index 80%
rename from tests/ui/while/while-let-scope-issue-40235.rs
rename to tests/ui/for-loop-while/while-let-scope.rs
index 7d5dfc64a905..e72cc5bf0c35 100644
--- a/tests/ui/while/while-let-scope-issue-40235.rs
+++ b/tests/ui/for-loop-while/while-let-scope.rs
@@ -1,4 +1,5 @@
 //@ check-pass
+// regression test for #40235
 #![allow(unused_variables)]
 fn foo() {}