diff --git a/tests/ui/derives/derive-eq-check-all-variants.rs b/tests/ui/derives/eq-ord/derive-eq-check-all-variants.rs
similarity index 100%
rename from tests/ui/derives/derive-eq-check-all-variants.rs
rename to tests/ui/derives/eq-ord/derive-eq-check-all-variants.rs
diff --git a/tests/ui/derives/derive-eq-check-all-variants.stderr b/tests/ui/derives/eq-ord/derive-eq-check-all-variants.stderr
similarity index 100%
rename from tests/ui/derives/derive-eq-check-all-variants.stderr
rename to tests/ui/derives/eq-ord/derive-eq-check-all-variants.stderr
diff --git a/tests/ui/derives/derive-partial-ord-discriminant-64bit.rs b/tests/ui/derives/eq-ord/derive-partial-ord-discriminant-64bit.rs
similarity index 100%
rename from tests/ui/derives/derive-partial-ord-discriminant-64bit.rs
rename to tests/ui/derives/eq-ord/derive-partial-ord-discriminant-64bit.rs
diff --git a/tests/ui/derives/derive-partial-ord-discriminant.rs b/tests/ui/derives/eq-ord/derive-partial-ord-discriminant.rs
similarity index 100%
rename from tests/ui/derives/derive-partial-ord-discriminant.rs
rename to tests/ui/derives/eq-ord/derive-partial-ord-discriminant.rs
diff --git a/tests/ui/derives/derive-partial-ord.rs b/tests/ui/derives/eq-ord/derive-partial-ord.rs
similarity index 100%
rename from tests/ui/derives/derive-partial-ord.rs
rename to tests/ui/derives/eq-ord/derive-partial-ord.rs
diff --git a/tests/ui/deriving/derive-partialord-correctness.rs b/tests/ui/derives/eq-ord/derive-partialord-correctness.rs
similarity index 100%
rename from tests/ui/deriving/derive-partialord-correctness.rs
rename to tests/ui/derives/eq-ord/derive-partialord-correctness.rs
diff --git a/tests/ui/derives/derives-span-Eq.rs b/tests/ui/derives/eq-ord/derives-span-Eq.rs
similarity index 100%
rename from tests/ui/derives/derives-span-Eq.rs
rename to tests/ui/derives/eq-ord/derives-span-Eq.rs
diff --git a/tests/ui/derives/derives-span-Eq.stderr b/tests/ui/derives/eq-ord/derives-span-Eq.stderr
similarity index 100%
rename from tests/ui/derives/derives-span-Eq.stderr
rename to tests/ui/derives/eq-ord/derives-span-Eq.stderr
diff --git a/tests/ui/derives/derives-span-Ord.rs b/tests/ui/derives/eq-ord/derives-span-Ord.rs
similarity index 100%
rename from tests/ui/derives/derives-span-Ord.rs
rename to tests/ui/derives/eq-ord/derives-span-Ord.rs
diff --git a/tests/ui/derives/derives-span-Ord.stderr b/tests/ui/derives/eq-ord/derives-span-Ord.stderr
similarity index 100%
rename from tests/ui/derives/derives-span-Ord.stderr
rename to tests/ui/derives/eq-ord/derives-span-Ord.stderr
diff --git a/tests/ui/derives/derives-span-PartialEq.rs b/tests/ui/derives/eq-ord/derives-span-PartialEq.rs
similarity index 100%
rename from tests/ui/derives/derives-span-PartialEq.rs
rename to tests/ui/derives/eq-ord/derives-span-PartialEq.rs
diff --git a/tests/ui/derives/derives-span-PartialEq.stderr b/tests/ui/derives/eq-ord/derives-span-PartialEq.stderr
similarity index 100%
rename from tests/ui/derives/derives-span-PartialEq.stderr
rename to tests/ui/derives/eq-ord/derives-span-PartialEq.stderr
diff --git a/tests/ui/derives/derives-span-PartialOrd.rs b/tests/ui/derives/eq-ord/derives-span-PartialOrd.rs
similarity index 100%
rename from tests/ui/derives/derives-span-PartialOrd.rs
rename to tests/ui/derives/eq-ord/derives-span-PartialOrd.rs
diff --git a/tests/ui/derives/derives-span-PartialOrd.stderr b/tests/ui/derives/eq-ord/derives-span-PartialOrd.stderr
similarity index 100%
rename from tests/ui/derives/derives-span-PartialOrd.stderr
rename to tests/ui/derives/eq-ord/derives-span-PartialOrd.stderr
diff --git a/tests/ui/deriving/deriving-cmp-generic-enum.rs b/tests/ui/derives/eq-ord/deriving-cmp-generic-enum.rs
similarity index 100%
rename from tests/ui/deriving/deriving-cmp-generic-enum.rs
rename to tests/ui/derives/eq-ord/deriving-cmp-generic-enum.rs
diff --git a/tests/ui/deriving/deriving-cmp-generic-struct-enum.rs b/tests/ui/derives/eq-ord/deriving-cmp-generic-struct-enum.rs
similarity index 100%
rename from tests/ui/deriving/deriving-cmp-generic-struct-enum.rs
rename to tests/ui/derives/eq-ord/deriving-cmp-generic-struct-enum.rs
diff --git a/tests/ui/deriving/deriving-cmp-generic-struct.rs b/tests/ui/derives/eq-ord/deriving-cmp-generic-struct.rs
similarity index 100%
rename from tests/ui/deriving/deriving-cmp-generic-struct.rs
rename to tests/ui/derives/eq-ord/deriving-cmp-generic-struct.rs
diff --git a/tests/ui/deriving/deriving-cmp-generic-tuple-struct.rs b/tests/ui/derives/eq-ord/deriving-cmp-generic-tuple-struct.rs
similarity index 100%
rename from tests/ui/deriving/deriving-cmp-generic-tuple-struct.rs
rename to tests/ui/derives/eq-ord/deriving-cmp-generic-tuple-struct.rs
diff --git a/tests/ui/deriving/deriving-cmp-shortcircuit.rs b/tests/ui/derives/eq-ord/deriving-cmp-shortcircuit.rs
similarity index 100%
rename from tests/ui/deriving/deriving-cmp-shortcircuit.rs
rename to tests/ui/derives/eq-ord/deriving-cmp-shortcircuit.rs
diff --git a/tests/ui/deriving/deriving-eq-ord-boxed-slice.rs b/tests/ui/derives/eq-ord/deriving-eq-ord-boxed-slice.rs
similarity index 100%
rename from tests/ui/deriving/deriving-eq-ord-boxed-slice.rs
rename to tests/ui/derives/eq-ord/deriving-eq-ord-boxed-slice.rs
diff --git a/tests/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs b/tests/ui/derives/eq-ord/deriving-self-lifetime-totalord-totaleq.rs
similarity index 100%
rename from tests/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
rename to tests/ui/derives/eq-ord/deriving-self-lifetime-totalord-totaleq.rs
diff --git a/tests/ui/deriving/do-not-suggest-calling-fn-in-derive-macro.rs b/tests/ui/derives/eq-ord/do-not-suggest-calling-fn-in-derive-macro.rs
similarity index 100%
rename from tests/ui/deriving/do-not-suggest-calling-fn-in-derive-macro.rs
rename to tests/ui/derives/eq-ord/do-not-suggest-calling-fn-in-derive-macro.rs
diff --git a/tests/ui/deriving/do-not-suggest-calling-fn-in-derive-macro.stderr b/tests/ui/derives/eq-ord/do-not-suggest-calling-fn-in-derive-macro.stderr
similarity index 100%
rename from tests/ui/deriving/do-not-suggest-calling-fn-in-derive-macro.stderr
rename to tests/ui/derives/eq-ord/do-not-suggest-calling-fn-in-derive-macro.stderr
diff --git a/tests/ui/deriving/internal_eq_trait_method_impls.rs b/tests/ui/derives/eq-ord/internal_eq_trait_method_impls.rs
similarity index 100%
rename from tests/ui/deriving/internal_eq_trait_method_impls.rs
rename to tests/ui/derives/eq-ord/internal_eq_trait_method_impls.rs
diff --git a/tests/ui/deriving/internal_eq_trait_method_impls.stderr b/tests/ui/derives/eq-ord/internal_eq_trait_method_impls.stderr
similarity index 100%
rename from tests/ui/deriving/internal_eq_trait_method_impls.stderr
rename to tests/ui/derives/eq-ord/internal_eq_trait_method_impls.stderr
diff --git a/tests/ui/derives/invalid-derive-comparison-34229.rs b/tests/ui/derives/eq-ord/invalid-derive-comparison-34229.rs
similarity index 100%
rename from tests/ui/derives/invalid-derive-comparison-34229.rs
rename to tests/ui/derives/eq-ord/invalid-derive-comparison-34229.rs
diff --git a/tests/ui/derives/invalid-derive-comparison-34229.stderr b/tests/ui/derives/eq-ord/invalid-derive-comparison-34229.stderr
similarity index 100%
rename from tests/ui/derives/invalid-derive-comparison-34229.stderr
rename to tests/ui/derives/eq-ord/invalid-derive-comparison-34229.stderr