diff --git a/tests/ui/parser/removed-syntax-box.rs b/tests/ui/parser/removed-syntax/removed-syntax-box.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-box.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-box.rs
diff --git a/tests/ui/parser/removed-syntax-box.stderr b/tests/ui/parser/removed-syntax/removed-syntax-box.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-box.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-box.stderr
diff --git a/tests/ui/parser/removed-syntax-closure-lifetime.rs b/tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-closure-lifetime.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.rs
diff --git a/tests/ui/parser/removed-syntax-closure-lifetime.stderr b/tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-closure-lifetime.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-closure-lifetime.stderr
diff --git a/tests/ui/parser/removed-syntax-enum-newtype.rs b/tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-enum-newtype.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.rs
diff --git a/tests/ui/parser/removed-syntax-enum-newtype.stderr b/tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-enum-newtype.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-enum-newtype.stderr
diff --git a/tests/ui/parser/removed-syntax-field-let-2.rs b/tests/ui/parser/removed-syntax/removed-syntax-field-let-2.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-field-let-2.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-field-let-2.rs
diff --git a/tests/ui/parser/removed-syntax-field-let-2.stderr b/tests/ui/parser/removed-syntax/removed-syntax-field-let-2.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-field-let-2.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-field-let-2.stderr
diff --git a/tests/ui/parser/removed-syntax-field-let.rs b/tests/ui/parser/removed-syntax/removed-syntax-field-let.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-field-let.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-field-let.rs
diff --git a/tests/ui/parser/removed-syntax-field-let.stderr b/tests/ui/parser/removed-syntax/removed-syntax-field-let.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-field-let.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-field-let.stderr
diff --git a/tests/ui/parser/removed-syntax-field-semicolon.rs b/tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-field-semicolon.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.rs
diff --git a/tests/ui/parser/removed-syntax-field-semicolon.stderr b/tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-field-semicolon.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-field-semicolon.stderr
diff --git a/tests/ui/parser/removed-syntax-fixed-vec.rs b/tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-fixed-vec.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.rs
diff --git a/tests/ui/parser/removed-syntax-fixed-vec.stderr b/tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-fixed-vec.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-fixed-vec.stderr
diff --git a/tests/ui/parser/removed-syntax-fn-sigil.rs b/tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-fn-sigil.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.rs
diff --git a/tests/ui/parser/removed-syntax-fn-sigil.stderr b/tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-fn-sigil.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-fn-sigil.stderr
diff --git a/tests/ui/parser/removed-syntax-mode.rs b/tests/ui/parser/removed-syntax/removed-syntax-mode.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-mode.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-mode.rs
diff --git a/tests/ui/parser/removed-syntax-mode.stderr b/tests/ui/parser/removed-syntax/removed-syntax-mode.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-mode.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-mode.stderr
diff --git a/tests/ui/parser/removed-syntax-mut-vec-expr.rs b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-mut-vec-expr.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.rs
diff --git a/tests/ui/parser/removed-syntax-mut-vec-expr.stderr b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-mut-vec-expr.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-mut-vec-expr.stderr
diff --git a/tests/ui/parser/removed-syntax-mut-vec-ty.rs b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-mut-vec-ty.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.rs
diff --git a/tests/ui/parser/removed-syntax-mut-vec-ty.stderr b/tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-mut-vec-ty.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-mut-vec-ty.stderr
diff --git a/tests/ui/parser/removed-syntax-ptr-lifetime.rs b/tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-ptr-lifetime.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.rs
diff --git a/tests/ui/parser/removed-syntax-ptr-lifetime.stderr b/tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-ptr-lifetime.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-ptr-lifetime.stderr
diff --git a/tests/ui/parser/removed-syntax-record.rs b/tests/ui/parser/removed-syntax/removed-syntax-record.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-record.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-record.rs
diff --git a/tests/ui/parser/removed-syntax-record.stderr b/tests/ui/parser/removed-syntax/removed-syntax-record.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-record.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-record.stderr
diff --git a/tests/ui/parser/removed-syntax-static-fn.rs b/tests/ui/parser/removed-syntax/removed-syntax-static-fn.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-static-fn.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-static-fn.rs
diff --git a/tests/ui/parser/removed-syntax-static-fn.stderr b/tests/ui/parser/removed-syntax/removed-syntax-static-fn.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-static-fn.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-static-fn.stderr
diff --git a/tests/ui/parser/removed-syntax-uniq-mut-expr.rs b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-uniq-mut-expr.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.rs
diff --git a/tests/ui/parser/removed-syntax-uniq-mut-expr.stderr b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-uniq-mut-expr.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-expr.stderr
diff --git a/tests/ui/parser/removed-syntax-uniq-mut-ty.rs b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-uniq-mut-ty.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.rs
diff --git a/tests/ui/parser/removed-syntax-uniq-mut-ty.stderr b/tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-uniq-mut-ty.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-uniq-mut-ty.stderr
diff --git a/tests/ui/parser/removed-syntax-with-1.rs b/tests/ui/parser/removed-syntax/removed-syntax-with-1.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-with-1.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-with-1.rs
diff --git a/tests/ui/parser/removed-syntax-with-1.stderr b/tests/ui/parser/removed-syntax/removed-syntax-with-1.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-with-1.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-with-1.stderr
diff --git a/tests/ui/parser/removed-syntax-with-2.rs b/tests/ui/parser/removed-syntax/removed-syntax-with-2.rs
similarity index 100%
rename from tests/ui/parser/removed-syntax-with-2.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-with-2.rs
diff --git a/tests/ui/parser/removed-syntax-with-2.stderr b/tests/ui/parser/removed-syntax/removed-syntax-with-2.stderr
similarity index 100%
rename from tests/ui/parser/removed-syntax-with-2.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-with-2.stderr