diff --git a/tests/ui/parser/recover-assoc-const-constraint.rs b/tests/ui/parser/recover/recover-assoc-const-constraint.rs
similarity index 100%
rename from tests/ui/parser/recover-assoc-const-constraint.rs
rename to tests/ui/parser/recover/recover-assoc-const-constraint.rs
diff --git a/tests/ui/parser/recover-assoc-const-constraint.stderr b/tests/ui/parser/recover/recover-assoc-const-constraint.stderr
similarity index 100%
rename from tests/ui/parser/recover-assoc-const-constraint.stderr
rename to tests/ui/parser/recover/recover-assoc-const-constraint.stderr
diff --git a/tests/ui/parser/recover-assoc-eq-missing-term.rs b/tests/ui/parser/recover/recover-assoc-eq-missing-term.rs
similarity index 100%
rename from tests/ui/parser/recover-assoc-eq-missing-term.rs
rename to tests/ui/parser/recover/recover-assoc-eq-missing-term.rs
diff --git a/tests/ui/parser/recover-assoc-eq-missing-term.stderr b/tests/ui/parser/recover/recover-assoc-eq-missing-term.stderr
similarity index 100%
rename from tests/ui/parser/recover-assoc-eq-missing-term.stderr
rename to tests/ui/parser/recover/recover-assoc-eq-missing-term.stderr
diff --git a/tests/ui/parser/recover-assoc-lifetime-constraint.rs b/tests/ui/parser/recover/recover-assoc-lifetime-constraint.rs
similarity index 100%
rename from tests/ui/parser/recover-assoc-lifetime-constraint.rs
rename to tests/ui/parser/recover/recover-assoc-lifetime-constraint.rs
diff --git a/tests/ui/parser/recover-assoc-lifetime-constraint.stderr b/tests/ui/parser/recover/recover-assoc-lifetime-constraint.stderr
similarity index 100%
rename from tests/ui/parser/recover-assoc-lifetime-constraint.stderr
rename to tests/ui/parser/recover/recover-assoc-lifetime-constraint.stderr
diff --git a/tests/ui/parser/recover-const-async-fn-ptr.rs b/tests/ui/parser/recover/recover-const-async-fn-ptr.rs
similarity index 100%
rename from tests/ui/parser/recover-const-async-fn-ptr.rs
rename to tests/ui/parser/recover/recover-const-async-fn-ptr.rs
diff --git a/tests/ui/parser/recover-const-async-fn-ptr.stderr b/tests/ui/parser/recover/recover-const-async-fn-ptr.stderr
similarity index 100%
rename from tests/ui/parser/recover-const-async-fn-ptr.stderr
rename to tests/ui/parser/recover/recover-const-async-fn-ptr.stderr
diff --git a/tests/ui/parser/recover-enum.rs b/tests/ui/parser/recover/recover-enum.rs
similarity index 100%
rename from tests/ui/parser/recover-enum.rs
rename to tests/ui/parser/recover/recover-enum.rs
diff --git a/tests/ui/parser/recover-enum.stderr b/tests/ui/parser/recover/recover-enum.stderr
similarity index 100%
rename from tests/ui/parser/recover-enum.stderr
rename to tests/ui/parser/recover/recover-enum.stderr
diff --git a/tests/ui/parser/recover-enum2.rs b/tests/ui/parser/recover/recover-enum2.rs
similarity index 100%
rename from tests/ui/parser/recover-enum2.rs
rename to tests/ui/parser/recover/recover-enum2.rs
diff --git a/tests/ui/parser/recover-enum2.stderr b/tests/ui/parser/recover/recover-enum2.stderr
similarity index 100%
rename from tests/ui/parser/recover-enum2.stderr
rename to tests/ui/parser/recover/recover-enum2.stderr
diff --git a/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs b/tests/ui/parser/recover/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
similarity index 100%
rename from tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
rename to tests/ui/parser/recover/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
diff --git a/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr b/tests/ui/parser/recover/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
similarity index 100%
rename from tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
rename to tests/ui/parser/recover/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
diff --git a/tests/ui/parser/recover-field-extra-angle-brackets.rs b/tests/ui/parser/recover/recover-field-extra-angle-brackets.rs
similarity index 100%
rename from tests/ui/parser/recover-field-extra-angle-brackets.rs
rename to tests/ui/parser/recover/recover-field-extra-angle-brackets.rs
diff --git a/tests/ui/parser/recover-field-extra-angle-brackets.stderr b/tests/ui/parser/recover/recover-field-extra-angle-brackets.stderr
similarity index 100%
rename from tests/ui/parser/recover-field-extra-angle-brackets.stderr
rename to tests/ui/parser/recover/recover-field-extra-angle-brackets.stderr
diff --git a/tests/ui/parser/recover-field-semi.rs b/tests/ui/parser/recover/recover-field-semi.rs
similarity index 100%
rename from tests/ui/parser/recover-field-semi.rs
rename to tests/ui/parser/recover/recover-field-semi.rs
diff --git a/tests/ui/parser/recover-field-semi.stderr b/tests/ui/parser/recover/recover-field-semi.stderr
similarity index 100%
rename from tests/ui/parser/recover-field-semi.stderr
rename to tests/ui/parser/recover/recover-field-semi.stderr
diff --git a/tests/ui/parser/recover-fn-ptr-with-generics.rs b/tests/ui/parser/recover/recover-fn-ptr-with-generics.rs
similarity index 100%
rename from tests/ui/parser/recover-fn-ptr-with-generics.rs
rename to tests/ui/parser/recover/recover-fn-ptr-with-generics.rs
diff --git a/tests/ui/parser/recover-fn-ptr-with-generics.stderr b/tests/ui/parser/recover/recover-fn-ptr-with-generics.stderr
similarity index 100%
rename from tests/ui/parser/recover-fn-ptr-with-generics.stderr
rename to tests/ui/parser/recover/recover-fn-ptr-with-generics.stderr
diff --git a/tests/ui/parser/recover-fn-trait-from-fn-kw.rs b/tests/ui/parser/recover/recover-fn-trait-from-fn-kw.rs
similarity index 100%
rename from tests/ui/parser/recover-fn-trait-from-fn-kw.rs
rename to tests/ui/parser/recover/recover-fn-trait-from-fn-kw.rs
diff --git a/tests/ui/parser/recover-fn-trait-from-fn-kw.stderr b/tests/ui/parser/recover/recover-fn-trait-from-fn-kw.stderr
similarity index 100%
rename from tests/ui/parser/recover-fn-trait-from-fn-kw.stderr
rename to tests/ui/parser/recover/recover-fn-trait-from-fn-kw.stderr
diff --git a/tests/ui/parser/recover-for-loop-parens-around-head.rs b/tests/ui/parser/recover/recover-for-loop-parens-around-head.rs
similarity index 100%
rename from tests/ui/parser/recover-for-loop-parens-around-head.rs
rename to tests/ui/parser/recover/recover-for-loop-parens-around-head.rs
diff --git a/tests/ui/parser/recover-for-loop-parens-around-head.stderr b/tests/ui/parser/recover/recover-for-loop-parens-around-head.stderr
similarity index 100%
rename from tests/ui/parser/recover-for-loop-parens-around-head.stderr
rename to tests/ui/parser/recover/recover-for-loop-parens-around-head.stderr
diff --git a/tests/ui/parser/recover-from-bad-variant.rs b/tests/ui/parser/recover/recover-from-bad-variant.rs
similarity index 100%
rename from tests/ui/parser/recover-from-bad-variant.rs
rename to tests/ui/parser/recover/recover-from-bad-variant.rs
diff --git a/tests/ui/parser/recover-from-bad-variant.stderr b/tests/ui/parser/recover/recover-from-bad-variant.stderr
similarity index 100%
rename from tests/ui/parser/recover-from-bad-variant.stderr
rename to tests/ui/parser/recover/recover-from-bad-variant.stderr
diff --git a/tests/ui/parser/recover-from-homoglyph.rs b/tests/ui/parser/recover/recover-from-homoglyph.rs
similarity index 100%
rename from tests/ui/parser/recover-from-homoglyph.rs
rename to tests/ui/parser/recover/recover-from-homoglyph.rs
diff --git a/tests/ui/parser/recover-from-homoglyph.stderr b/tests/ui/parser/recover/recover-from-homoglyph.stderr
similarity index 100%
rename from tests/ui/parser/recover-from-homoglyph.stderr
rename to tests/ui/parser/recover/recover-from-homoglyph.stderr
diff --git a/tests/ui/parser/recover-labeled-non-block-expr.fixed b/tests/ui/parser/recover/recover-labeled-non-block-expr.fixed
similarity index 100%
rename from tests/ui/parser/recover-labeled-non-block-expr.fixed
rename to tests/ui/parser/recover/recover-labeled-non-block-expr.fixed
diff --git a/tests/ui/parser/recover-labeled-non-block-expr.rs b/tests/ui/parser/recover/recover-labeled-non-block-expr.rs
similarity index 100%
rename from tests/ui/parser/recover-labeled-non-block-expr.rs
rename to tests/ui/parser/recover/recover-labeled-non-block-expr.rs
diff --git a/tests/ui/parser/recover-labeled-non-block-expr.stderr b/tests/ui/parser/recover/recover-labeled-non-block-expr.stderr
similarity index 100%
rename from tests/ui/parser/recover-labeled-non-block-expr.stderr
rename to tests/ui/parser/recover/recover-labeled-non-block-expr.stderr
diff --git a/tests/ui/parser/recover-missing-semi-before-item.fixed b/tests/ui/parser/recover/recover-missing-semi-before-item.fixed
similarity index 100%
rename from tests/ui/parser/recover-missing-semi-before-item.fixed
rename to tests/ui/parser/recover/recover-missing-semi-before-item.fixed
diff --git a/tests/ui/parser/recover-missing-semi-before-item.rs b/tests/ui/parser/recover/recover-missing-semi-before-item.rs
similarity index 100%
rename from tests/ui/parser/recover-missing-semi-before-item.rs
rename to tests/ui/parser/recover/recover-missing-semi-before-item.rs
diff --git a/tests/ui/parser/recover-missing-semi-before-item.stderr b/tests/ui/parser/recover/recover-missing-semi-before-item.stderr
similarity index 100%
rename from tests/ui/parser/recover-missing-semi-before-item.stderr
rename to tests/ui/parser/recover/recover-missing-semi-before-item.stderr
diff --git a/tests/ui/parser/recover-missing-semi.rs b/tests/ui/parser/recover/recover-missing-semi.rs
similarity index 100%
rename from tests/ui/parser/recover-missing-semi.rs
rename to tests/ui/parser/recover/recover-missing-semi.rs
diff --git a/tests/ui/parser/recover-missing-semi.stderr b/tests/ui/parser/recover/recover-missing-semi.stderr
similarity index 100%
rename from tests/ui/parser/recover-missing-semi.stderr
rename to tests/ui/parser/recover/recover-missing-semi.stderr
diff --git a/tests/ui/parser/recover-quantified-closure.rs b/tests/ui/parser/recover/recover-quantified-closure.rs
similarity index 100%
rename from tests/ui/parser/recover-quantified-closure.rs
rename to tests/ui/parser/recover/recover-quantified-closure.rs
diff --git a/tests/ui/parser/recover-quantified-closure.stderr b/tests/ui/parser/recover/recover-quantified-closure.stderr
similarity index 100%
rename from tests/ui/parser/recover-quantified-closure.stderr
rename to tests/ui/parser/recover/recover-quantified-closure.stderr
diff --git a/tests/ui/parser/recover-range-pats.rs b/tests/ui/parser/recover/recover-range-pats.rs
similarity index 100%
rename from tests/ui/parser/recover-range-pats.rs
rename to tests/ui/parser/recover/recover-range-pats.rs
diff --git a/tests/ui/parser/recover-range-pats.stderr b/tests/ui/parser/recover/recover-range-pats.stderr
similarity index 100%
rename from tests/ui/parser/recover-range-pats.stderr
rename to tests/ui/parser/recover/recover-range-pats.stderr
diff --git a/tests/ui/parser/recover-ref-dyn-mut.rs b/tests/ui/parser/recover/recover-ref-dyn-mut.rs
similarity index 100%
rename from tests/ui/parser/recover-ref-dyn-mut.rs
rename to tests/ui/parser/recover/recover-ref-dyn-mut.rs
diff --git a/tests/ui/parser/recover-ref-dyn-mut.stderr b/tests/ui/parser/recover/recover-ref-dyn-mut.stderr
similarity index 100%
rename from tests/ui/parser/recover-ref-dyn-mut.stderr
rename to tests/ui/parser/recover/recover-ref-dyn-mut.stderr
diff --git a/tests/ui/parser/recover-struct.rs b/tests/ui/parser/recover/recover-struct.rs
similarity index 100%
rename from tests/ui/parser/recover-struct.rs
rename to tests/ui/parser/recover/recover-struct.rs
diff --git a/tests/ui/parser/recover-struct.stderr b/tests/ui/parser/recover/recover-struct.stderr
similarity index 100%
rename from tests/ui/parser/recover-struct.stderr
rename to tests/ui/parser/recover/recover-struct.stderr
diff --git a/tests/ui/parser/recover-tuple-pat.rs b/tests/ui/parser/recover/recover-tuple-pat.rs
similarity index 100%
rename from tests/ui/parser/recover-tuple-pat.rs
rename to tests/ui/parser/recover/recover-tuple-pat.rs
diff --git a/tests/ui/parser/recover-tuple-pat.stderr b/tests/ui/parser/recover/recover-tuple-pat.stderr
similarity index 100%
rename from tests/ui/parser/recover-tuple-pat.stderr
rename to tests/ui/parser/recover/recover-tuple-pat.stderr
diff --git a/tests/ui/parser/recover-tuple.rs b/tests/ui/parser/recover/recover-tuple.rs
similarity index 100%
rename from tests/ui/parser/recover-tuple.rs
rename to tests/ui/parser/recover/recover-tuple.rs
diff --git a/tests/ui/parser/recover-tuple.stderr b/tests/ui/parser/recover/recover-tuple.stderr
similarity index 100%
rename from tests/ui/parser/recover-tuple.stderr
rename to tests/ui/parser/recover/recover-tuple.stderr
diff --git a/tests/ui/parser/recover-unticked-labels.fixed b/tests/ui/parser/recover/recover-unticked-labels.fixed
similarity index 100%
rename from tests/ui/parser/recover-unticked-labels.fixed
rename to tests/ui/parser/recover/recover-unticked-labels.fixed
diff --git a/tests/ui/parser/recover-unticked-labels.rs b/tests/ui/parser/recover/recover-unticked-labels.rs
similarity index 100%
rename from tests/ui/parser/recover-unticked-labels.rs
rename to tests/ui/parser/recover/recover-unticked-labels.rs
diff --git a/tests/ui/parser/recover-unticked-labels.stderr b/tests/ui/parser/recover/recover-unticked-labels.stderr
similarity index 100%
rename from tests/ui/parser/recover-unticked-labels.stderr
rename to tests/ui/parser/recover/recover-unticked-labels.stderr
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.fixed b/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.fixed
similarity index 100%
rename from tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.fixed
rename to tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.fixed
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.rs b/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.rs
similarity index 100%
rename from tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.rs
rename to tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.rs
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.stderr b/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.stderr
similarity index 100%
rename from tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.stderr
rename to tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-0.stderr
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.rs b/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-1.rs
similarity index 100%
rename from tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.rs
rename to tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-1.rs
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.stderr b/tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-1.stderr
similarity index 100%
rename from tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.stderr
rename to tests/ui/parser/recover/recover-where-clause-before-tuple-struct-body-1.stderr