diff --git a/src/test/ui/token/bounds-obj-parens.rs b/src/test/ui/parser/bounds-obj-parens.rs similarity index 100% rename from src/test/ui/token/bounds-obj-parens.rs rename to src/test/ui/parser/bounds-obj-parens.rs diff --git a/src/test/ui/token/bounds-obj-parens.stderr b/src/test/ui/parser/bounds-obj-parens.stderr similarity index 100% rename from src/test/ui/token/bounds-obj-parens.stderr rename to src/test/ui/parser/bounds-obj-parens.stderr diff --git a/src/test/ui/span/impl-parsing.rs b/src/test/ui/parser/impl-parsing.rs similarity index 100% rename from src/test/ui/span/impl-parsing.rs rename to src/test/ui/parser/impl-parsing.rs diff --git a/src/test/ui/span/impl-parsing.stderr b/src/test/ui/parser/impl-parsing.stderr similarity index 100% rename from src/test/ui/span/impl-parsing.stderr rename to src/test/ui/parser/impl-parsing.stderr diff --git a/src/test/ui/issue-10636-1.rs b/src/test/ui/parser/issue-10636-1.rs similarity index 100% rename from src/test/ui/issue-10636-1.rs rename to src/test/ui/parser/issue-10636-1.rs diff --git a/src/test/ui/issue-10636-1.stderr b/src/test/ui/parser/issue-10636-1.stderr similarity index 100% rename from src/test/ui/issue-10636-1.stderr rename to src/test/ui/parser/issue-10636-1.stderr diff --git a/src/test/ui/token/issue-10636-2.rs b/src/test/ui/parser/issue-10636-2.rs similarity index 100% rename from src/test/ui/token/issue-10636-2.rs rename to src/test/ui/parser/issue-10636-2.rs diff --git a/src/test/ui/token/issue-10636-2.stderr b/src/test/ui/parser/issue-10636-2.stderr similarity index 100% rename from src/test/ui/token/issue-10636-2.stderr rename to src/test/ui/parser/issue-10636-2.stderr diff --git a/src/test/ui/token/issue-15980.rs b/src/test/ui/parser/issue-15980.rs similarity index 100% rename from src/test/ui/token/issue-15980.rs rename to src/test/ui/parser/issue-15980.rs diff --git a/src/test/ui/token/issue-15980.stderr b/src/test/ui/parser/issue-15980.stderr similarity index 100% rename from src/test/ui/token/issue-15980.stderr rename to src/test/ui/parser/issue-15980.stderr diff --git a/src/test/ui/issue-2354.rs b/src/test/ui/parser/issue-2354.rs similarity index 100% rename from src/test/ui/issue-2354.rs rename to src/test/ui/parser/issue-2354.rs diff --git a/src/test/ui/issue-2354.stderr b/src/test/ui/parser/issue-2354.stderr similarity index 100% rename from src/test/ui/issue-2354.stderr rename to src/test/ui/parser/issue-2354.stderr diff --git a/src/test/ui/token/issue-41155.rs b/src/test/ui/parser/issue-41155.rs similarity index 100% rename from src/test/ui/token/issue-41155.rs rename to src/test/ui/parser/issue-41155.rs diff --git a/src/test/ui/token/issue-41155.stderr b/src/test/ui/parser/issue-41155.stderr similarity index 100% rename from src/test/ui/token/issue-41155.stderr rename to src/test/ui/parser/issue-41155.stderr diff --git a/src/test/ui/token/macro-incomplete-parse.rs b/src/test/ui/parser/macro-incomplete-parse.rs similarity index 100% rename from src/test/ui/token/macro-incomplete-parse.rs rename to src/test/ui/parser/macro-incomplete-parse.rs diff --git a/src/test/ui/token/macro-incomplete-parse.stderr b/src/test/ui/parser/macro-incomplete-parse.stderr similarity index 100% rename from src/test/ui/token/macro-incomplete-parse.stderr rename to src/test/ui/parser/macro-incomplete-parse.stderr diff --git a/src/test/ui/did_you_mean/match-refactor-to-expr.rs b/src/test/ui/parser/match-refactor-to-expr.rs similarity index 100% rename from src/test/ui/did_you_mean/match-refactor-to-expr.rs rename to src/test/ui/parser/match-refactor-to-expr.rs diff --git a/src/test/ui/did_you_mean/match-refactor-to-expr.stderr b/src/test/ui/parser/match-refactor-to-expr.stderr similarity index 100% rename from src/test/ui/did_you_mean/match-refactor-to-expr.stderr rename to src/test/ui/parser/match-refactor-to-expr.stderr diff --git a/src/test/ui/raw/raw-literal-keywords.rs b/src/test/ui/parser/raw/raw-literal-keywords.rs similarity index 100% rename from src/test/ui/raw/raw-literal-keywords.rs rename to src/test/ui/parser/raw/raw-literal-keywords.rs diff --git a/src/test/ui/raw/raw-literal-keywords.stderr b/src/test/ui/parser/raw/raw-literal-keywords.stderr similarity index 100% rename from src/test/ui/raw/raw-literal-keywords.stderr rename to src/test/ui/parser/raw/raw-literal-keywords.stderr diff --git a/src/test/ui/raw/raw-literal-self.rs b/src/test/ui/parser/raw/raw-literal-self.rs similarity index 100% rename from src/test/ui/raw/raw-literal-self.rs rename to src/test/ui/parser/raw/raw-literal-self.rs diff --git a/src/test/ui/raw/raw-literal-self.stderr b/src/test/ui/parser/raw/raw-literal-self.stderr similarity index 100% rename from src/test/ui/raw/raw-literal-self.stderr rename to src/test/ui/parser/raw/raw-literal-self.stderr diff --git a/src/test/ui/raw/raw-literal-underscore.rs b/src/test/ui/parser/raw/raw-literal-underscore.rs similarity index 100% rename from src/test/ui/raw/raw-literal-underscore.rs rename to src/test/ui/parser/raw/raw-literal-underscore.rs diff --git a/src/test/ui/raw/raw-literal-underscore.stderr b/src/test/ui/parser/raw/raw-literal-underscore.stderr similarity index 100% rename from src/test/ui/raw/raw-literal-underscore.stderr rename to src/test/ui/parser/raw/raw-literal-underscore.stderr diff --git a/src/test/ui/raw/raw_string.rs b/src/test/ui/parser/raw/raw_string.rs similarity index 100% rename from src/test/ui/raw/raw_string.rs rename to src/test/ui/parser/raw/raw_string.rs diff --git a/src/test/ui/raw/raw_string.stderr b/src/test/ui/parser/raw/raw_string.stderr similarity index 100% rename from src/test/ui/raw/raw_string.stderr rename to src/test/ui/parser/raw/raw_string.stderr diff --git a/src/test/ui/token/trailing-plus-in-bounds.rs b/src/test/ui/parser/trailing-plus-in-bounds.rs similarity index 100% rename from src/test/ui/token/trailing-plus-in-bounds.rs rename to src/test/ui/parser/trailing-plus-in-bounds.rs diff --git a/src/test/ui/token/trailing-plus-in-bounds.stderr b/src/test/ui/parser/trailing-plus-in-bounds.stderr similarity index 100% rename from src/test/ui/token/trailing-plus-in-bounds.stderr rename to src/test/ui/parser/trailing-plus-in-bounds.stderr