diff --git a/tests/ui/parser/attr-bad-meta-2.rs b/tests/ui/parser/attribute/attr-bad-meta-2.rs
similarity index 100%
rename from tests/ui/parser/attr-bad-meta-2.rs
rename to tests/ui/parser/attribute/attr-bad-meta-2.rs
diff --git a/tests/ui/parser/attr-bad-meta-2.stderr b/tests/ui/parser/attribute/attr-bad-meta-2.stderr
similarity index 100%
rename from tests/ui/parser/attr-bad-meta-2.stderr
rename to tests/ui/parser/attribute/attr-bad-meta-2.stderr
diff --git a/tests/ui/parser/attr-bad-meta-3.rs b/tests/ui/parser/attribute/attr-bad-meta-3.rs
similarity index 100%
rename from tests/ui/parser/attr-bad-meta-3.rs
rename to tests/ui/parser/attribute/attr-bad-meta-3.rs
diff --git a/tests/ui/parser/attr-bad-meta-3.stderr b/tests/ui/parser/attribute/attr-bad-meta-3.stderr
similarity index 100%
rename from tests/ui/parser/attr-bad-meta-3.stderr
rename to tests/ui/parser/attribute/attr-bad-meta-3.stderr
diff --git a/tests/ui/parser/attr-bad-meta.rs b/tests/ui/parser/attribute/attr-bad-meta.rs
similarity index 100%
rename from tests/ui/parser/attr-bad-meta.rs
rename to tests/ui/parser/attribute/attr-bad-meta.rs
diff --git a/tests/ui/parser/attr-bad-meta.stderr b/tests/ui/parser/attribute/attr-bad-meta.stderr
similarity index 100%
rename from tests/ui/parser/attr-bad-meta.stderr
rename to tests/ui/parser/attribute/attr-bad-meta.stderr
diff --git a/tests/ui/parser/attr-before-eof.rs b/tests/ui/parser/attribute/attr-before-eof.rs
similarity index 100%
rename from tests/ui/parser/attr-before-eof.rs
rename to tests/ui/parser/attribute/attr-before-eof.rs
diff --git a/tests/ui/parser/attr-before-eof.stderr b/tests/ui/parser/attribute/attr-before-eof.stderr
similarity index 100%
rename from tests/ui/parser/attr-before-eof.stderr
rename to tests/ui/parser/attribute/attr-before-eof.stderr
diff --git a/tests/ui/parser/attr-dangling-in-fn.rs b/tests/ui/parser/attribute/attr-dangling-in-fn.rs
similarity index 100%
rename from tests/ui/parser/attr-dangling-in-fn.rs
rename to tests/ui/parser/attribute/attr-dangling-in-fn.rs
diff --git a/tests/ui/parser/attr-dangling-in-fn.stderr b/tests/ui/parser/attribute/attr-dangling-in-fn.stderr
similarity index 100%
rename from tests/ui/parser/attr-dangling-in-fn.stderr
rename to tests/ui/parser/attribute/attr-dangling-in-fn.stderr
diff --git a/tests/ui/parser/attr-dangling-in-mod.rs b/tests/ui/parser/attribute/attr-dangling-in-mod.rs
similarity index 100%
rename from tests/ui/parser/attr-dangling-in-mod.rs
rename to tests/ui/parser/attribute/attr-dangling-in-mod.rs
diff --git a/tests/ui/parser/attr-dangling-in-mod.stderr b/tests/ui/parser/attribute/attr-dangling-in-mod.stderr
similarity index 100%
rename from tests/ui/parser/attr-dangling-in-mod.stderr
rename to tests/ui/parser/attribute/attr-dangling-in-mod.stderr
diff --git a/tests/ui/parser/attr-stmt-expr-attr-bad.rs b/tests/ui/parser/attribute/attr-stmt-expr-attr-bad.rs
similarity index 100%
rename from tests/ui/parser/attr-stmt-expr-attr-bad.rs
rename to tests/ui/parser/attribute/attr-stmt-expr-attr-bad.rs
diff --git a/tests/ui/parser/attr-stmt-expr-attr-bad.stderr b/tests/ui/parser/attribute/attr-stmt-expr-attr-bad.stderr
similarity index 100%
rename from tests/ui/parser/attr-stmt-expr-attr-bad.stderr
rename to tests/ui/parser/attribute/attr-stmt-expr-attr-bad.stderr
diff --git a/tests/ui/parser/attr-with-a-semicolon.rs b/tests/ui/parser/attribute/attr-with-a-semicolon.rs
similarity index 100%
rename from tests/ui/parser/attr-with-a-semicolon.rs
rename to tests/ui/parser/attribute/attr-with-a-semicolon.rs
diff --git a/tests/ui/parser/attr-with-a-semicolon.stderr b/tests/ui/parser/attribute/attr-with-a-semicolon.stderr
similarity index 100%
rename from tests/ui/parser/attr-with-a-semicolon.stderr
rename to tests/ui/parser/attribute/attr-with-a-semicolon.stderr
diff --git a/tests/ui/parser/attr.rs b/tests/ui/parser/attribute/attr.rs
similarity index 100%
rename from tests/ui/parser/attr.rs
rename to tests/ui/parser/attribute/attr.rs
diff --git a/tests/ui/parser/attr.stderr b/tests/ui/parser/attribute/attr.stderr
similarity index 100%
rename from tests/ui/parser/attr.stderr
rename to tests/ui/parser/attribute/attr.stderr
diff --git a/tests/ui/parser/attribute-with-no-generics-in-parameter-list.rs b/tests/ui/parser/attribute/attribute-with-no-generics-in-parameter-list.rs
similarity index 100%
rename from tests/ui/parser/attribute-with-no-generics-in-parameter-list.rs
rename to tests/ui/parser/attribute/attribute-with-no-generics-in-parameter-list.rs
diff --git a/tests/ui/parser/attribute-with-no-generics-in-parameter-list.stderr b/tests/ui/parser/attribute/attribute-with-no-generics-in-parameter-list.stderr
similarity index 100%
rename from tests/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
rename to tests/ui/parser/attribute/attribute-with-no-generics-in-parameter-list.stderr
diff --git a/tests/ui/parser/attrs-after-extern-mod.rs b/tests/ui/parser/attribute/attrs-after-extern-mod.rs
similarity index 100%
rename from tests/ui/parser/attrs-after-extern-mod.rs
rename to tests/ui/parser/attribute/attrs-after-extern-mod.rs
diff --git a/tests/ui/parser/attrs-after-extern-mod.stderr b/tests/ui/parser/attribute/attrs-after-extern-mod.stderr
similarity index 100%
rename from tests/ui/parser/attrs-after-extern-mod.stderr
rename to tests/ui/parser/attribute/attrs-after-extern-mod.stderr