diff --git a/src/test/ui/cast-char.rs b/src/test/ui/cast/cast-char.rs
similarity index 100%
rename from src/test/ui/cast-char.rs
rename to src/test/ui/cast/cast-char.rs
diff --git a/src/test/ui/cast-char.stderr b/src/test/ui/cast/cast-char.stderr
similarity index 100%
rename from src/test/ui/cast-char.stderr
rename to src/test/ui/cast/cast-char.stderr
diff --git a/src/test/ui/cast-does-fallback.rs b/src/test/ui/cast/cast-does-fallback.rs
similarity index 100%
rename from src/test/ui/cast-does-fallback.rs
rename to src/test/ui/cast/cast-does-fallback.rs
diff --git a/src/test/ui/cast-region-to-uint.rs b/src/test/ui/cast/cast-region-to-uint.rs
similarity index 100%
rename from src/test/ui/cast-region-to-uint.rs
rename to src/test/ui/cast/cast-region-to-uint.rs
diff --git a/src/test/ui/cast-rfc0401-vtable-kinds.rs b/src/test/ui/cast/cast-rfc0401-vtable-kinds.rs
similarity index 100%
rename from src/test/ui/cast-rfc0401-vtable-kinds.rs
rename to src/test/ui/cast/cast-rfc0401-vtable-kinds.rs
diff --git a/src/test/ui/cast-rfc0401.rs b/src/test/ui/cast/cast-rfc0401.rs
similarity index 100%
rename from src/test/ui/cast-rfc0401.rs
rename to src/test/ui/cast/cast-rfc0401.rs
diff --git a/src/test/ui/cast-to-infer-ty.rs b/src/test/ui/cast/cast-to-infer-ty.rs
similarity index 100%
rename from src/test/ui/cast-to-infer-ty.rs
rename to src/test/ui/cast/cast-to-infer-ty.rs
diff --git a/src/test/ui/cast.rs b/src/test/ui/cast/cast.rs
similarity index 100%
rename from src/test/ui/cast.rs
rename to src/test/ui/cast/cast.rs
diff --git a/src/test/ui/casts-differing-anon.rs b/src/test/ui/cast/casts-differing-anon.rs
similarity index 100%
rename from src/test/ui/casts-differing-anon.rs
rename to src/test/ui/cast/casts-differing-anon.rs
diff --git a/src/test/ui/casts-differing-anon.stderr b/src/test/ui/cast/casts-differing-anon.stderr
similarity index 100%
rename from src/test/ui/casts-differing-anon.stderr
rename to src/test/ui/cast/casts-differing-anon.stderr
diff --git a/src/test/ui/casts-issue-46365.rs b/src/test/ui/cast/casts-issue-46365.rs
similarity index 100%
rename from src/test/ui/casts-issue-46365.rs
rename to src/test/ui/cast/casts-issue-46365.rs
diff --git a/src/test/ui/casts-issue-46365.stderr b/src/test/ui/cast/casts-issue-46365.stderr
similarity index 100%
rename from src/test/ui/casts-issue-46365.stderr
rename to src/test/ui/cast/casts-issue-46365.stderr