diff --git a/src/test/ui/block-arg-call-as.rs b/src/test/ui/closures/old-closure-arg-call-as.rs
similarity index 100%
rename from src/test/ui/block-arg-call-as.rs
rename to src/test/ui/closures/old-closure-arg-call-as.rs
diff --git a/src/test/ui/block-arg.rs b/src/test/ui/closures/old-closure-arg.rs
similarity index 100%
rename from src/test/ui/block-arg.rs
rename to src/test/ui/closures/old-closure-arg.rs
diff --git a/src/test/ui/block-explicit-types.rs b/src/test/ui/closures/old-closure-explicit-types.rs
similarity index 100%
rename from src/test/ui/block-explicit-types.rs
rename to src/test/ui/closures/old-closure-explicit-types.rs
diff --git a/src/test/ui/block-expr-precedence.rs b/src/test/ui/closures/old-closure-expr-precedence.rs
similarity index 100%
rename from src/test/ui/block-expr-precedence.rs
rename to src/test/ui/closures/old-closure-expr-precedence.rs
diff --git a/src/test/ui/block-expr-precedence.stderr b/src/test/ui/closures/old-closure-expr-precedence.stderr
similarity index 82%
rename from src/test/ui/block-expr-precedence.stderr
rename to src/test/ui/closures/old-closure-expr-precedence.stderr
index c28980bf1478..fabece1ad4a1 100644
--- a/src/test/ui/block-expr-precedence.stderr
+++ b/src/test/ui/closures/old-closure-expr-precedence.stderr
@@ -1,5 +1,5 @@
 warning: unnecessary trailing semicolons
-  --> $DIR/block-expr-precedence.rs:60:21
+  --> $DIR/old-closure-expr-precedence.rs:60:21
    |
 LL |   if (true) { 12; };;; -num;
    |                     ^^ help: remove these semicolons
diff --git a/src/test/ui/block-expression-remove-semicolon.fixed b/src/test/ui/closures/old-closure-expression-remove-semicolon.fixed
similarity index 100%
rename from src/test/ui/block-expression-remove-semicolon.fixed
rename to src/test/ui/closures/old-closure-expression-remove-semicolon.fixed
diff --git a/src/test/ui/block-expression-remove-semicolon.rs b/src/test/ui/closures/old-closure-expression-remove-semicolon.rs
similarity index 100%
rename from src/test/ui/block-expression-remove-semicolon.rs
rename to src/test/ui/closures/old-closure-expression-remove-semicolon.rs
diff --git a/src/test/ui/block-expression-remove-semicolon.stderr b/src/test/ui/closures/old-closure-expression-remove-semicolon.stderr
similarity index 85%
rename from src/test/ui/block-expression-remove-semicolon.stderr
rename to src/test/ui/closures/old-closure-expression-remove-semicolon.stderr
index 74dc4d595a92..ab7983dc9e48 100644
--- a/src/test/ui/block-expression-remove-semicolon.stderr
+++ b/src/test/ui/closures/old-closure-expression-remove-semicolon.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/block-expression-remove-semicolon.rs:8:19
+  --> $DIR/old-closure-expression-remove-semicolon.rs:8:19
    |
 LL |       let _x: i32 = {
    |  ___________________^
diff --git a/src/test/ui/block-fn-coerce.rs b/src/test/ui/closures/old-closure-fn-coerce.rs
similarity index 100%
rename from src/test/ui/block-fn-coerce.rs
rename to src/test/ui/closures/old-closure-fn-coerce.rs
diff --git a/src/test/ui/block-iter-1.rs b/src/test/ui/closures/old-closure-iter-1.rs
similarity index 100%
rename from src/test/ui/block-iter-1.rs
rename to src/test/ui/closures/old-closure-iter-1.rs
diff --git a/src/test/ui/block-iter-2.rs b/src/test/ui/closures/old-closure-iter-2.rs
similarity index 100%
rename from src/test/ui/block-iter-2.rs
rename to src/test/ui/closures/old-closure-iter-2.rs