diff --git a/src/test/parse-fail/mod_file_disambig.rs b/src/test/compile-fail/mod_file_disambig.rs similarity index 100% rename from src/test/parse-fail/mod_file_disambig.rs rename to src/test/compile-fail/mod_file_disambig.rs diff --git a/src/test/parse-fail/mod_file_not_owning.rs b/src/test/compile-fail/mod_file_not_owning.rs similarity index 100% rename from src/test/parse-fail/mod_file_not_owning.rs rename to src/test/compile-fail/mod_file_not_owning.rs diff --git a/src/test/compile-fail/ascii-only-character-escape.rs b/src/test/parse-fail/ascii-only-character-escape.rs similarity index 100% rename from src/test/compile-fail/ascii-only-character-escape.rs rename to src/test/parse-fail/ascii-only-character-escape.rs diff --git a/src/test/compile-fail/attr-before-eof.rs b/src/test/parse-fail/attr-before-eof.rs similarity index 100% rename from src/test/compile-fail/attr-before-eof.rs rename to src/test/parse-fail/attr-before-eof.rs diff --git a/src/test/compile-fail/attr-before-ext.rs b/src/test/parse-fail/attr-before-ext.rs similarity index 100% rename from src/test/compile-fail/attr-before-ext.rs rename to src/test/parse-fail/attr-before-ext.rs diff --git a/src/test/compile-fail/attr-before-let.rs b/src/test/parse-fail/attr-before-let.rs similarity index 100% rename from src/test/compile-fail/attr-before-let.rs rename to src/test/parse-fail/attr-before-let.rs diff --git a/src/test/compile-fail/attr-before-stmt.rs b/src/test/parse-fail/attr-before-stmt.rs similarity index 100% rename from src/test/compile-fail/attr-before-stmt.rs rename to src/test/parse-fail/attr-before-stmt.rs diff --git a/src/test/compile-fail/attr-dangling-in-fn.rs b/src/test/parse-fail/attr-dangling-in-fn.rs similarity index 100% rename from src/test/compile-fail/attr-dangling-in-fn.rs rename to src/test/parse-fail/attr-dangling-in-fn.rs diff --git a/src/test/compile-fail/attr-dangling-in-mod.rs b/src/test/parse-fail/attr-dangling-in-mod.rs similarity index 100% rename from src/test/compile-fail/attr-dangling-in-mod.rs rename to src/test/parse-fail/attr-dangling-in-mod.rs diff --git a/src/test/compile-fail/attr.rs b/src/test/parse-fail/attr.rs similarity index 100% rename from src/test/compile-fail/attr.rs rename to src/test/parse-fail/attr.rs diff --git a/src/test/compile-fail/attrs-after-extern-mod.rs b/src/test/parse-fail/attrs-after-extern-mod.rs similarity index 100% rename from src/test/compile-fail/attrs-after-extern-mod.rs rename to src/test/parse-fail/attrs-after-extern-mod.rs diff --git a/src/test/compile-fail/bad-char-literals.rs b/src/test/parse-fail/bad-char-literals.rs similarity index 100% rename from src/test/compile-fail/bad-char-literals.rs rename to src/test/parse-fail/bad-char-literals.rs diff --git a/src/test/compile-fail/bad-lit-suffixes.rs b/src/test/parse-fail/bad-lit-suffixes.rs similarity index 100% rename from src/test/compile-fail/bad-lit-suffixes.rs rename to src/test/parse-fail/bad-lit-suffixes.rs diff --git a/src/test/compile-fail/bad-value-ident-false.rs b/src/test/parse-fail/bad-value-ident-false.rs similarity index 100% rename from src/test/compile-fail/bad-value-ident-false.rs rename to src/test/parse-fail/bad-value-ident-false.rs diff --git a/src/test/compile-fail/bad-value-ident-true.rs b/src/test/parse-fail/bad-value-ident-true.rs similarity index 100% rename from src/test/compile-fail/bad-value-ident-true.rs rename to src/test/parse-fail/bad-value-ident-true.rs diff --git a/src/test/compile-fail/doc-before-attr.rs b/src/test/parse-fail/doc-before-attr.rs similarity index 100% rename from src/test/compile-fail/doc-before-attr.rs rename to src/test/parse-fail/doc-before-attr.rs diff --git a/src/test/compile-fail/doc-before-eof.rs b/src/test/parse-fail/doc-before-eof.rs similarity index 100% rename from src/test/compile-fail/doc-before-eof.rs rename to src/test/parse-fail/doc-before-eof.rs diff --git a/src/test/compile-fail/doc-before-extern-rbrace.rs b/src/test/parse-fail/doc-before-extern-rbrace.rs similarity index 100% rename from src/test/compile-fail/doc-before-extern-rbrace.rs rename to src/test/parse-fail/doc-before-extern-rbrace.rs diff --git a/src/test/compile-fail/doc-before-macro.rs b/src/test/parse-fail/doc-before-macro.rs similarity index 100% rename from src/test/compile-fail/doc-before-macro.rs rename to src/test/parse-fail/doc-before-macro.rs diff --git a/src/test/compile-fail/doc-before-rbrace.rs b/src/test/parse-fail/doc-before-rbrace.rs similarity index 100% rename from src/test/compile-fail/doc-before-rbrace.rs rename to src/test/parse-fail/doc-before-rbrace.rs diff --git a/src/test/compile-fail/doc-before-semi.rs b/src/test/parse-fail/doc-before-semi.rs similarity index 100% rename from src/test/compile-fail/doc-before-semi.rs rename to src/test/parse-fail/doc-before-semi.rs diff --git a/src/test/compile-fail/extern-crate-as-no-string-help.rs b/src/test/parse-fail/extern-crate-as-no-string-help.rs similarity index 100% rename from src/test/compile-fail/extern-crate-as-no-string-help.rs rename to src/test/parse-fail/extern-crate-as-no-string-help.rs diff --git a/src/test/compile-fail/generic-non-trailing-defaults.rs b/src/test/parse-fail/generic-non-trailing-defaults.rs similarity index 100% rename from src/test/compile-fail/generic-non-trailing-defaults.rs rename to src/test/parse-fail/generic-non-trailing-defaults.rs diff --git a/src/test/compile-fail/int-literal-too-large-span.rs b/src/test/parse-fail/int-literal-too-large-span.rs similarity index 100% rename from src/test/compile-fail/int-literal-too-large-span.rs rename to src/test/parse-fail/int-literal-too-large-span.rs diff --git a/src/test/compile-fail/issue-10412.rs b/src/test/parse-fail/issue-10412.rs similarity index 100% rename from src/test/compile-fail/issue-10412.rs rename to src/test/parse-fail/issue-10412.rs diff --git a/src/test/compile-fail/issue-12560-1.rs b/src/test/parse-fail/issue-12560-1.rs similarity index 100% rename from src/test/compile-fail/issue-12560-1.rs rename to src/test/parse-fail/issue-12560-1.rs diff --git a/src/test/compile-fail/issue-14182.rs b/src/test/parse-fail/issue-14182.rs similarity index 100% rename from src/test/compile-fail/issue-14182.rs rename to src/test/parse-fail/issue-14182.rs diff --git a/src/test/compile-fail/issue-17383.rs b/src/test/parse-fail/issue-17383.rs similarity index 100% rename from src/test/compile-fail/issue-17383.rs rename to src/test/parse-fail/issue-17383.rs diff --git a/src/test/compile-fail/issue-17718-const-mut.rs b/src/test/parse-fail/issue-17718-const-mut.rs similarity index 100% rename from src/test/compile-fail/issue-17718-const-mut.rs rename to src/test/parse-fail/issue-17718-const-mut.rs diff --git a/src/test/compile-fail/issue-1802-2.rs b/src/test/parse-fail/issue-1802-2.rs similarity index 100% rename from src/test/compile-fail/issue-1802-2.rs rename to src/test/parse-fail/issue-1802-2.rs diff --git a/src/test/compile-fail/issue-5544-a.rs b/src/test/parse-fail/issue-5544-a.rs similarity index 100% rename from src/test/compile-fail/issue-5544-a.rs rename to src/test/parse-fail/issue-5544-a.rs diff --git a/src/test/compile-fail/issue-5544-b.rs b/src/test/parse-fail/issue-5544-b.rs similarity index 100% rename from src/test/compile-fail/issue-5544-b.rs rename to src/test/parse-fail/issue-5544-b.rs diff --git a/src/test/compile-fail/issue-8537.rs b/src/test/parse-fail/issue-8537.rs similarity index 100% rename from src/test/compile-fail/issue-8537.rs rename to src/test/parse-fail/issue-8537.rs diff --git a/src/test/compile-fail/keyword-as-as-identifier.rs b/src/test/parse-fail/keyword-as-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-as-as-identifier.rs rename to src/test/parse-fail/keyword-as-as-identifier.rs diff --git a/src/test/compile-fail/keyword-break-as-identifier.rs b/src/test/parse-fail/keyword-break-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-break-as-identifier.rs rename to src/test/parse-fail/keyword-break-as-identifier.rs diff --git a/src/test/compile-fail/keyword-else-as-identifier.rs b/src/test/parse-fail/keyword-else-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-else-as-identifier.rs rename to src/test/parse-fail/keyword-else-as-identifier.rs diff --git a/src/test/compile-fail/keyword-enum-as-identifier.rs b/src/test/parse-fail/keyword-enum-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-enum-as-identifier.rs rename to src/test/parse-fail/keyword-enum-as-identifier.rs diff --git a/src/test/compile-fail/keyword-extern-as-identifier.rs b/src/test/parse-fail/keyword-extern-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-extern-as-identifier.rs rename to src/test/parse-fail/keyword-extern-as-identifier.rs diff --git a/src/test/compile-fail/keyword-fn-as-identifier.rs b/src/test/parse-fail/keyword-fn-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-fn-as-identifier.rs rename to src/test/parse-fail/keyword-fn-as-identifier.rs diff --git a/src/test/compile-fail/keyword-for-as-identifier.rs b/src/test/parse-fail/keyword-for-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-for-as-identifier.rs rename to src/test/parse-fail/keyword-for-as-identifier.rs diff --git a/src/test/compile-fail/keyword-if-as-identifier.rs b/src/test/parse-fail/keyword-if-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-if-as-identifier.rs rename to src/test/parse-fail/keyword-if-as-identifier.rs diff --git a/src/test/compile-fail/keyword-impl-as-identifier.rs b/src/test/parse-fail/keyword-impl-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-impl-as-identifier.rs rename to src/test/parse-fail/keyword-impl-as-identifier.rs diff --git a/src/test/compile-fail/keyword-let-as-identifier.rs b/src/test/parse-fail/keyword-let-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-let-as-identifier.rs rename to src/test/parse-fail/keyword-let-as-identifier.rs diff --git a/src/test/compile-fail/keyword-loop-as-identifier.rs b/src/test/parse-fail/keyword-loop-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-loop-as-identifier.rs rename to src/test/parse-fail/keyword-loop-as-identifier.rs diff --git a/src/test/compile-fail/keyword-match-as-identifier.rs b/src/test/parse-fail/keyword-match-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-match-as-identifier.rs rename to src/test/parse-fail/keyword-match-as-identifier.rs diff --git a/src/test/compile-fail/keyword-mod-as-identifier.rs b/src/test/parse-fail/keyword-mod-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-mod-as-identifier.rs rename to src/test/parse-fail/keyword-mod-as-identifier.rs diff --git a/src/test/compile-fail/keyword-pub-as-identifier.rs b/src/test/parse-fail/keyword-pub-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-pub-as-identifier.rs rename to src/test/parse-fail/keyword-pub-as-identifier.rs diff --git a/src/test/compile-fail/keyword-return-as-identifier.rs b/src/test/parse-fail/keyword-return-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-return-as-identifier.rs rename to src/test/parse-fail/keyword-return-as-identifier.rs diff --git a/src/test/compile-fail/keyword-self-as-identifier.rs b/src/test/parse-fail/keyword-self-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-self-as-identifier.rs rename to src/test/parse-fail/keyword-self-as-identifier.rs diff --git a/src/test/compile-fail/keyword-static-as-identifier.rs b/src/test/parse-fail/keyword-static-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-static-as-identifier.rs rename to src/test/parse-fail/keyword-static-as-identifier.rs diff --git a/src/test/compile-fail/keyword-struct-as-identifier.rs b/src/test/parse-fail/keyword-struct-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-struct-as-identifier.rs rename to src/test/parse-fail/keyword-struct-as-identifier.rs diff --git a/src/test/compile-fail/keyword-super-as-identifier.rs b/src/test/parse-fail/keyword-super-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-super-as-identifier.rs rename to src/test/parse-fail/keyword-super-as-identifier.rs diff --git a/src/test/compile-fail/keyword-super.rs b/src/test/parse-fail/keyword-super.rs similarity index 100% rename from src/test/compile-fail/keyword-super.rs rename to src/test/parse-fail/keyword-super.rs diff --git a/src/test/compile-fail/keyword-trait-as-identifier.rs b/src/test/parse-fail/keyword-trait-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-trait-as-identifier.rs rename to src/test/parse-fail/keyword-trait-as-identifier.rs diff --git a/src/test/compile-fail/keyword-type-as-identifier.rs b/src/test/parse-fail/keyword-type-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-type-as-identifier.rs rename to src/test/parse-fail/keyword-type-as-identifier.rs diff --git a/src/test/compile-fail/keyword-unsafe-as-identifier.rs b/src/test/parse-fail/keyword-unsafe-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-unsafe-as-identifier.rs rename to src/test/parse-fail/keyword-unsafe-as-identifier.rs diff --git a/src/test/compile-fail/keyword-use-as-identifier.rs b/src/test/parse-fail/keyword-use-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-use-as-identifier.rs rename to src/test/parse-fail/keyword-use-as-identifier.rs diff --git a/src/test/compile-fail/keyword-while-as-identifier.rs b/src/test/parse-fail/keyword-while-as-identifier.rs similarity index 100% rename from src/test/compile-fail/keyword-while-as-identifier.rs rename to src/test/parse-fail/keyword-while-as-identifier.rs diff --git a/src/test/compile-fail/keyword.rs b/src/test/parse-fail/keyword.rs similarity index 100% rename from src/test/compile-fail/keyword.rs rename to src/test/parse-fail/keyword.rs diff --git a/src/test/compile-fail/keywords-followed-by-double-colon.rs b/src/test/parse-fail/keywords-followed-by-double-colon.rs similarity index 100% rename from src/test/compile-fail/keywords-followed-by-double-colon.rs rename to src/test/parse-fail/keywords-followed-by-double-colon.rs diff --git a/src/test/compile-fail/lex-bad-numeric-literals.rs b/src/test/parse-fail/lex-bad-numeric-literals.rs similarity index 100% rename from src/test/compile-fail/lex-bad-numeric-literals.rs rename to src/test/parse-fail/lex-bad-numeric-literals.rs diff --git a/src/test/compile-fail/lex-bare-cr-string-literal-doc-comment.rs b/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs similarity index 100% rename from src/test/compile-fail/lex-bare-cr-string-literal-doc-comment.rs rename to src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs diff --git a/src/test/compile-fail/lifetime-no-keyword.rs b/src/test/parse-fail/lifetime-no-keyword.rs similarity index 100% rename from src/test/compile-fail/lifetime-no-keyword.rs rename to src/test/parse-fail/lifetime-no-keyword.rs diff --git a/src/test/compile-fail/lifetime-obsoleted-self.rs b/src/test/parse-fail/lifetime-obsoleted-self.rs similarity index 100% rename from src/test/compile-fail/lifetime-obsoleted-self.rs rename to src/test/parse-fail/lifetime-obsoleted-self.rs diff --git a/src/test/compile-fail/macros-no-semicolon-items.rs b/src/test/parse-fail/macros-no-semicolon-items.rs similarity index 100% rename from src/test/compile-fail/macros-no-semicolon-items.rs rename to src/test/parse-fail/macros-no-semicolon-items.rs diff --git a/src/test/compile-fail/no-binary-float-literal.rs b/src/test/parse-fail/no-binary-float-literal.rs similarity index 100% rename from src/test/compile-fail/no-binary-float-literal.rs rename to src/test/parse-fail/no-binary-float-literal.rs diff --git a/src/test/compile-fail/no-hex-float-literal.rs b/src/test/parse-fail/no-hex-float-literal.rs similarity index 100% rename from src/test/compile-fail/no-hex-float-literal.rs rename to src/test/parse-fail/no-hex-float-literal.rs diff --git a/src/test/compile-fail/no-unsafe-self.rs b/src/test/parse-fail/no-unsafe-self.rs similarity index 100% rename from src/test/compile-fail/no-unsafe-self.rs rename to src/test/parse-fail/no-unsafe-self.rs diff --git a/src/test/compile-fail/non-str-meta.rs b/src/test/parse-fail/non-str-meta.rs similarity index 100% rename from src/test/compile-fail/non-str-meta.rs rename to src/test/parse-fail/non-str-meta.rs diff --git a/src/test/compile-fail/obsolete-for-sized.rs b/src/test/parse-fail/obsolete-for-sized.rs similarity index 100% rename from src/test/compile-fail/obsolete-for-sized.rs rename to src/test/parse-fail/obsolete-for-sized.rs diff --git a/src/test/compile-fail/obsolete-proc.rs b/src/test/parse-fail/obsolete-proc.rs similarity index 100% rename from src/test/compile-fail/obsolete-proc.rs rename to src/test/parse-fail/obsolete-proc.rs diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/parse-fail/qquote-1.rs similarity index 100% rename from src/test/compile-fail/qquote-1.rs rename to src/test/parse-fail/qquote-1.rs diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/parse-fail/qquote-2.rs similarity index 100% rename from src/test/compile-fail/qquote-2.rs rename to src/test/parse-fail/qquote-2.rs diff --git a/src/test/compile-fail/regions-fn-bound.rs b/src/test/parse-fail/regions-fn-bound.rs similarity index 100% rename from src/test/compile-fail/regions-fn-bound.rs rename to src/test/parse-fail/regions-fn-bound.rs diff --git a/src/test/compile-fail/require-parens-for-chained-comparison.rs b/src/test/parse-fail/require-parens-for-chained-comparison.rs similarity index 100% rename from src/test/compile-fail/require-parens-for-chained-comparison.rs rename to src/test/parse-fail/require-parens-for-chained-comparison.rs diff --git a/src/test/compile-fail/struct-no-fields-2.rs b/src/test/parse-fail/struct-no-fields-2.rs similarity index 100% rename from src/test/compile-fail/struct-no-fields-2.rs rename to src/test/parse-fail/struct-no-fields-2.rs diff --git a/src/test/compile-fail/struct-no-fields-3.rs b/src/test/parse-fail/struct-no-fields-3.rs similarity index 100% rename from src/test/compile-fail/struct-no-fields-3.rs rename to src/test/parse-fail/struct-no-fields-3.rs diff --git a/src/test/compile-fail/struct-no-fields-4.rs b/src/test/parse-fail/struct-no-fields-4.rs similarity index 100% rename from src/test/compile-fail/struct-no-fields-4.rs rename to src/test/parse-fail/struct-no-fields-4.rs diff --git a/src/test/compile-fail/struct-no-fields-5.rs b/src/test/parse-fail/struct-no-fields-5.rs similarity index 100% rename from src/test/compile-fail/struct-no-fields-5.rs rename to src/test/parse-fail/struct-no-fields-5.rs diff --git a/src/test/compile-fail/struct-variant-no-fields.rs b/src/test/parse-fail/struct-variant-no-fields.rs similarity index 100% rename from src/test/compile-fail/struct-variant-no-fields.rs rename to src/test/parse-fail/struct-variant-no-fields.rs diff --git a/src/test/compile-fail/struct-variant-no-pub.rs b/src/test/parse-fail/struct-variant-no-pub.rs similarity index 100% rename from src/test/compile-fail/struct-variant-no-pub.rs rename to src/test/parse-fail/struct-variant-no-pub.rs diff --git a/src/test/compile-fail/syntax-trait-polarity.rs b/src/test/parse-fail/syntax-trait-polarity.rs similarity index 100% rename from src/test/compile-fail/syntax-trait-polarity.rs rename to src/test/parse-fail/syntax-trait-polarity.rs diff --git a/src/test/compile-fail/tag-variant-disr-non-nullary.rs b/src/test/parse-fail/tag-variant-disr-non-nullary.rs similarity index 100% rename from src/test/compile-fail/tag-variant-disr-non-nullary.rs rename to src/test/parse-fail/tag-variant-disr-non-nullary.rs diff --git a/src/test/compile-fail/trailing-carriage-return-in-string.rs b/src/test/parse-fail/trailing-carriage-return-in-string.rs similarity index 100% rename from src/test/compile-fail/trailing-carriage-return-in-string.rs rename to src/test/parse-fail/trailing-carriage-return-in-string.rs diff --git a/src/test/compile-fail/trailing-plus-in-bounds.rs b/src/test/parse-fail/trailing-plus-in-bounds.rs similarity index 100% rename from src/test/compile-fail/trailing-plus-in-bounds.rs rename to src/test/parse-fail/trailing-plus-in-bounds.rs diff --git a/src/test/compile-fail/trait-bounds-not-on-impl.rs b/src/test/parse-fail/trait-bounds-not-on-impl.rs similarity index 100% rename from src/test/compile-fail/trait-bounds-not-on-impl.rs rename to src/test/parse-fail/trait-bounds-not-on-impl.rs diff --git a/src/test/compile-fail/type-parameters-in-field-exprs.rs b/src/test/parse-fail/type-parameters-in-field-exprs.rs similarity index 100% rename from src/test/compile-fail/type-parameters-in-field-exprs.rs rename to src/test/parse-fail/type-parameters-in-field-exprs.rs diff --git a/src/test/compile-fail/unsized2.rs b/src/test/parse-fail/unsized2.rs similarity index 100% rename from src/test/compile-fail/unsized2.rs rename to src/test/parse-fail/unsized2.rs diff --git a/src/test/compile-fail/virtual-structs.rs b/src/test/parse-fail/virtual-structs.rs similarity index 100% rename from src/test/compile-fail/virtual-structs.rs rename to src/test/parse-fail/virtual-structs.rs diff --git a/src/test/compile-fail/where-clauses-no-bounds-or-predicates.rs b/src/test/parse-fail/where-clauses-no-bounds-or-predicates.rs similarity index 100% rename from src/test/compile-fail/where-clauses-no-bounds-or-predicates.rs rename to src/test/parse-fail/where-clauses-no-bounds-or-predicates.rs