diff --git a/tests/ui/monomorphize-abi-alignment.rs b/tests/ui/codegen/mono-respects-abi-alignment.rs
similarity index 100%
rename from tests/ui/monomorphize-abi-alignment.rs
rename to tests/ui/codegen/mono-respects-abi-alignment.rs
diff --git a/tests/ui/msvc-opt-minsize.rs b/tests/ui/codegen/msvc-opt-level-z-no-corruption.rs
similarity index 100%
rename from tests/ui/msvc-opt-minsize.rs
rename to tests/ui/codegen/msvc-opt-level-z-no-corruption.rs
diff --git a/tests/ui/auxiliary/msvc-data-only-lib.rs b/tests/ui/linkage-attr/auxiliary/msvc-static-data-import-lib.rs
similarity index 100%
rename from tests/ui/auxiliary/msvc-data-only-lib.rs
rename to tests/ui/linkage-attr/auxiliary/msvc-static-data-import-lib.rs
diff --git a/tests/ui/msvc-data-only.rs b/tests/ui/linkage-attr/msvc-static-data-import.rs
similarity index 100%
rename from tests/ui/msvc-data-only.rs
rename to tests/ui/linkage-attr/msvc-static-data-import.rs
diff --git a/tests/ui/multiline-comment.rs b/tests/ui/parser/multiline-comments-basic.rs
similarity index 100%
rename from tests/ui/multiline-comment.rs
rename to tests/ui/parser/multiline-comments-basic.rs
diff --git a/tests/ui/multibyte.rs b/tests/ui/parser/unicode-multibyte-chars-no-ice.rs
similarity index 100%
rename from tests/ui/multibyte.rs
rename to tests/ui/parser/unicode-multibyte-chars-no-ice.rs