diff --git a/tests/ui/README.md b/tests/ui/README.md
index faf1721e0b03..947949ff7181 100644
--- a/tests/ui/README.md
+++ b/tests/ui/README.md
@@ -172,10 +172,6 @@ See:
 - [`std::box::Boxed`](https://doc.rust-lang.org/std/boxed/struct.Box.html)
 - [Tracking issue for `box_patterns` feature #29641](https://github.com/rust-lang/rust/issues/29641)
 
-## `tests/ui/btreemap/`: B-Tree Maps
-
-Tests focused on `BTreeMap` collections and their compiler interactions. E.g. collection patterns, iterator behavior, and trait implementations specific to `BTreeMap`. See [`std::collections::BTreeMap`](https://doc.rust-lang.org/std/collections/struct.BTreeMap.html).
-
 ## `tests/ui/builtin-superkinds/`: Built-in Trait Hierarchy Tests
 
 Tests for built-in trait hierarchy (Send, Sync, Sized, etc.) and their supertrait relationships. E.g. auto traits and marker trait constraints.
@@ -262,12 +258,10 @@ This directory only contains one highly specific test. Other coinduction tests c
 
 ## `tests/ui/collections`
 
-These tests exercise the `collections` library.
+These tests exercise the `collections` library. For example, `BTreeMap` and `HashMap`.
 
 See [`std::collections`](https://doc.rust-lang.org/std/collections/index.html)
 
-**FIXME**: consider merge with `tests/ui/btreemap` and `tests/ui/hashmap`
-
 ## `tests/ui/command/`: `std::process::Command`
 
 This directory is actually for the standard library [`std::process::Command`](https://doc.rust-lang.org/std/process/struct.Command.html) type, where some tests are too difficult or inconvenient to write as unit tests or integration tests within the standard library itself.
@@ -684,10 +678,6 @@ Tests on range patterns where one of the bounds is not a direct value.
 
 **FIXME**: Overlaps with `ui/range`. `impossible_range.rs` is particularly suspected to be a duplicate test.
 
-## `tests/ui/hashmap/`
-
-Tests for the standard library collection [`std::collections::HashMap`](https://doc.rust-lang.org/std/collections/struct.HashMap.html).
-
 ## `tests/ui/higher-ranked/`
 
 Tests for higher-ranked trait bounds.
diff --git a/tests/ui/btreemap/btreemap-index-mut-2.rs b/tests/ui/collections/btreemap/btreemap-index-mut-2.rs
similarity index 100%
rename from tests/ui/btreemap/btreemap-index-mut-2.rs
rename to tests/ui/collections/btreemap/btreemap-index-mut-2.rs
diff --git a/tests/ui/btreemap/btreemap-index-mut-2.stderr b/tests/ui/collections/btreemap/btreemap-index-mut-2.stderr
similarity index 100%
rename from tests/ui/btreemap/btreemap-index-mut-2.stderr
rename to tests/ui/collections/btreemap/btreemap-index-mut-2.stderr
diff --git a/tests/ui/btreemap/btreemap-index-mut.rs b/tests/ui/collections/btreemap/btreemap-index-mut.rs
similarity index 100%
rename from tests/ui/btreemap/btreemap-index-mut.rs
rename to tests/ui/collections/btreemap/btreemap-index-mut.rs
diff --git a/tests/ui/btreemap/btreemap-index-mut.stderr b/tests/ui/collections/btreemap/btreemap-index-mut.stderr
similarity index 100%
rename from tests/ui/btreemap/btreemap-index-mut.stderr
rename to tests/ui/collections/btreemap/btreemap-index-mut.stderr
diff --git a/tests/ui/btreemap/btreemap_dropck.rs b/tests/ui/collections/btreemap/btreemap_dropck.rs
similarity index 100%
rename from tests/ui/btreemap/btreemap_dropck.rs
rename to tests/ui/collections/btreemap/btreemap_dropck.rs
diff --git a/tests/ui/btreemap/btreemap_dropck.stderr b/tests/ui/collections/btreemap/btreemap_dropck.stderr
similarity index 100%
rename from tests/ui/btreemap/btreemap_dropck.stderr
rename to tests/ui/collections/btreemap/btreemap_dropck.stderr
diff --git a/tests/ui/btreemap/btreemap_into_iterator_lifetime.rs b/tests/ui/collections/btreemap/btreemap_into_iterator_lifetime.rs
similarity index 100%
rename from tests/ui/btreemap/btreemap_into_iterator_lifetime.rs
rename to tests/ui/collections/btreemap/btreemap_into_iterator_lifetime.rs
diff --git a/tests/ui/hashmap/hashmap-capacity-overflow.rs b/tests/ui/collections/hashmap/hashmap-capacity-overflow.rs
similarity index 100%
rename from tests/ui/hashmap/hashmap-capacity-overflow.rs
rename to tests/ui/collections/hashmap/hashmap-capacity-overflow.rs
diff --git a/tests/ui/hashmap/hashmap-index-mut.rs b/tests/ui/collections/hashmap/hashmap-index-mut.rs
similarity index 100%
rename from tests/ui/hashmap/hashmap-index-mut.rs
rename to tests/ui/collections/hashmap/hashmap-index-mut.rs
diff --git a/tests/ui/hashmap/hashmap-index-mut.stderr b/tests/ui/collections/hashmap/hashmap-index-mut.stderr
similarity index 100%
rename from tests/ui/hashmap/hashmap-index-mut.stderr
rename to tests/ui/collections/hashmap/hashmap-index-mut.stderr
diff --git a/tests/ui/hashmap/hashmap-iter-value-lifetime.rs b/tests/ui/collections/hashmap/hashmap-iter-value-lifetime.rs
similarity index 100%
rename from tests/ui/hashmap/hashmap-iter-value-lifetime.rs
rename to tests/ui/collections/hashmap/hashmap-iter-value-lifetime.rs
diff --git a/tests/ui/hashmap/hashmap-iter-value-lifetime.stderr b/tests/ui/collections/hashmap/hashmap-iter-value-lifetime.stderr
similarity index 100%
rename from tests/ui/hashmap/hashmap-iter-value-lifetime.stderr
rename to tests/ui/collections/hashmap/hashmap-iter-value-lifetime.stderr
diff --git a/tests/ui/hashmap/hashmap-lifetimes.rs b/tests/ui/collections/hashmap/hashmap-lifetimes.rs
similarity index 100%
rename from tests/ui/hashmap/hashmap-lifetimes.rs
rename to tests/ui/collections/hashmap/hashmap-lifetimes.rs
diff --git a/tests/ui/hashmap/hashmap-lifetimes.stderr b/tests/ui/collections/hashmap/hashmap-lifetimes.stderr
similarity index 100%
rename from tests/ui/hashmap/hashmap-lifetimes.stderr
rename to tests/ui/collections/hashmap/hashmap-lifetimes.stderr
diff --git a/tests/ui/hashmap/hashmap-memory.rs b/tests/ui/collections/hashmap/hashmap-memory.rs
similarity index 100%
rename from tests/ui/hashmap/hashmap-memory.rs
rename to tests/ui/collections/hashmap/hashmap-memory.rs
diff --git a/tests/ui/hashmap/hashmap-path-key.rs b/tests/ui/collections/hashmap/hashmap-path-key.rs
similarity index 100%
rename from tests/ui/hashmap/hashmap-path-key.rs
rename to tests/ui/collections/hashmap/hashmap-path-key.rs
diff --git a/tests/ui/hashmap/hashset-enum-variant.rs b/tests/ui/collections/hashmap/hashset-enum-variant.rs
similarity index 100%
rename from tests/ui/hashmap/hashset-enum-variant.rs
rename to tests/ui/collections/hashmap/hashset-enum-variant.rs
diff --git a/tests/ui/hashmap/hashset_generics.rs b/tests/ui/collections/hashmap/hashset_generics.rs
similarity index 100%
rename from tests/ui/hashmap/hashset_generics.rs
rename to tests/ui/collections/hashmap/hashset_generics.rs
diff --git a/tests/ui/hashmap/hashset_generics.stderr b/tests/ui/collections/hashmap/hashset_generics.stderr
similarity index 100%
rename from tests/ui/hashmap/hashset_generics.stderr
rename to tests/ui/collections/hashmap/hashset_generics.stderr