diff --git a/tests/ui/README.md b/tests/ui/README.md
index 008af992f207..2fe1657e7ecf 100644
--- a/tests/ui/README.md
+++ b/tests/ui/README.md
@@ -412,10 +412,6 @@ Tests for quality of diagnostics involving suppression of cascading errors in so
 
 Tests for built-in derive macros (`Debug`, `Clone`, etc.) when used in conjunction with built-in `#[derive(..)]` attributes.
 
-## `tests/ui/deriving/`: Derive Macro
-
-**FIXME**: Coalesce with `tests/ui/derives`.
-
 ## `tests/ui/dest-prop/` Destination Propagation
 
 **FIXME**: Contains a single test for the `DestProp` mir-opt, should probably be rehomed.
diff --git a/tests/ui/deriving/auxiliary/derive-no-std.rs b/tests/ui/derives/auxiliary/derive-no-std.rs
similarity index 100%
rename from tests/ui/deriving/auxiliary/derive-no-std.rs
rename to tests/ui/derives/auxiliary/derive-no-std.rs
diff --git a/tests/ui/derives/auxiliary/rustc-serialize.rs b/tests/ui/derives/auxiliary/rustc-serialize.rs
deleted file mode 100644
index 24177af931c4..000000000000
--- a/tests/ui/derives/auxiliary/rustc-serialize.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![crate_type = "lib"]
-
-pub trait Decoder {
-    type Error;
-
-    fn read_enum<T, F>(&mut self, name: &str, f: F) -> Result<T, Self::Error>
-        where F: FnOnce(&mut Self) -> Result<T, Self::Error>;
-    fn read_enum_variant<T, F>(&mut self, names: &[&str], f: F)
-                               -> Result<T, Self::Error>
-        where F: FnMut(&mut Self, usize) -> Result<T, Self::Error>;
-
-}
-
-pub trait Decodable: Sized {
-    fn decode<D: Decoder>(d: &mut D) -> Result<Self, D::Error>;
-}
diff --git a/tests/ui/derives/clone-vector-element-size.rs b/tests/ui/derives/clone-copy/clone-vector-element-size.rs
similarity index 100%
rename from tests/ui/derives/clone-vector-element-size.rs
rename to tests/ui/derives/clone-copy/clone-vector-element-size.rs
diff --git a/tests/ui/derives/copy-drop-mutually-exclusive.rs b/tests/ui/derives/clone-copy/copy-drop-mutually-exclusive.rs
similarity index 100%
rename from tests/ui/derives/copy-drop-mutually-exclusive.rs
rename to tests/ui/derives/clone-copy/copy-drop-mutually-exclusive.rs
diff --git a/tests/ui/derives/copy-drop-mutually-exclusive.stderr b/tests/ui/derives/clone-copy/copy-drop-mutually-exclusive.stderr
similarity index 100%
rename from tests/ui/derives/copy-drop-mutually-exclusive.stderr
rename to tests/ui/derives/clone-copy/copy-drop-mutually-exclusive.stderr
diff --git a/tests/ui/derives/derive-clone-basic.rs b/tests/ui/derives/clone-copy/derive-clone-basic.rs
similarity index 100%
rename from tests/ui/derives/derive-clone-basic.rs
rename to tests/ui/derives/clone-copy/derive-clone-basic.rs
diff --git a/tests/ui/derives/derives-span-Clone.rs b/tests/ui/derives/clone-copy/derives-span-Clone.rs
similarity index 100%
rename from tests/ui/derives/derives-span-Clone.rs
rename to tests/ui/derives/clone-copy/derives-span-Clone.rs
diff --git a/tests/ui/derives/derives-span-Clone.stderr b/tests/ui/derives/clone-copy/derives-span-Clone.stderr
similarity index 100%
rename from tests/ui/derives/derives-span-Clone.stderr
rename to tests/ui/derives/clone-copy/derives-span-Clone.stderr
diff --git a/tests/ui/derives/deriving-copyclone.rs b/tests/ui/derives/clone-copy/deriving-copyclone.rs
similarity index 100%
rename from tests/ui/derives/deriving-copyclone.rs
rename to tests/ui/derives/clone-copy/deriving-copyclone.rs
diff --git a/tests/ui/derives/deriving-copyclone.stderr b/tests/ui/derives/clone-copy/deriving-copyclone.stderr
similarity index 100%
rename from tests/ui/derives/deriving-copyclone.stderr
rename to tests/ui/derives/clone-copy/deriving-copyclone.stderr
diff --git a/tests/ui/derives/duplicate-derive-copy-clone-diagnostics.rs b/tests/ui/derives/clone-copy/duplicate-derive-copy-clone-diagnostics.rs
similarity index 100%
rename from tests/ui/derives/duplicate-derive-copy-clone-diagnostics.rs
rename to tests/ui/derives/clone-copy/duplicate-derive-copy-clone-diagnostics.rs
diff --git a/tests/ui/derives/duplicate-derive-copy-clone-diagnostics.stderr b/tests/ui/derives/clone-copy/duplicate-derive-copy-clone-diagnostics.stderr
similarity index 100%
rename from tests/ui/derives/duplicate-derive-copy-clone-diagnostics.stderr
rename to tests/ui/derives/clone-copy/duplicate-derive-copy-clone-diagnostics.stderr
diff --git a/tests/ui/deriving/deriving-copyclone.rs b/tests/ui/derives/clone-copy/misbehaving-clone-impl.rs
similarity index 100%
rename from tests/ui/deriving/deriving-copyclone.rs
rename to tests/ui/derives/clone-copy/misbehaving-clone-impl.rs
diff --git a/tests/ui/deriving/auxiliary/another-proc-macro.rs b/tests/ui/derives/coercepointee/auxiliary/another-proc-macro.rs
similarity index 100%
rename from tests/ui/deriving/auxiliary/another-proc-macro.rs
rename to tests/ui/derives/coercepointee/auxiliary/another-proc-macro.rs
diff --git a/tests/ui/deriving/auxiliary/malicious-macro.rs b/tests/ui/derives/coercepointee/auxiliary/malicious-macro.rs
similarity index 100%
rename from tests/ui/deriving/auxiliary/malicious-macro.rs
rename to tests/ui/derives/coercepointee/auxiliary/malicious-macro.rs
diff --git a/tests/ui/deriving/built-in-proc-macro-scope.rs b/tests/ui/derives/coercepointee/built-in-proc-macro-scope.rs
similarity index 100%
rename from tests/ui/deriving/built-in-proc-macro-scope.rs
rename to tests/ui/derives/coercepointee/built-in-proc-macro-scope.rs
diff --git a/tests/ui/deriving/built-in-proc-macro-scope.stdout b/tests/ui/derives/coercepointee/built-in-proc-macro-scope.stdout
similarity index 100%
rename from tests/ui/deriving/built-in-proc-macro-scope.stdout
rename to tests/ui/derives/coercepointee/built-in-proc-macro-scope.stdout
diff --git a/tests/ui/deriving/coerce-pointee-bounds-issue-127647.rs b/tests/ui/derives/coercepointee/coerce-pointee-bounds-issue-127647.rs
similarity index 100%
rename from tests/ui/deriving/coerce-pointee-bounds-issue-127647.rs
rename to tests/ui/derives/coercepointee/coerce-pointee-bounds-issue-127647.rs
diff --git a/tests/ui/deriving/deriving-coerce-pointee-expanded.rs b/tests/ui/derives/coercepointee/deriving-coerce-pointee-expanded.rs
similarity index 100%
rename from tests/ui/deriving/deriving-coerce-pointee-expanded.rs
rename to tests/ui/derives/coercepointee/deriving-coerce-pointee-expanded.rs
diff --git a/tests/ui/deriving/deriving-coerce-pointee-expanded.stdout b/tests/ui/derives/coercepointee/deriving-coerce-pointee-expanded.stdout
similarity index 100%
rename from tests/ui/deriving/deriving-coerce-pointee-expanded.stdout
rename to tests/ui/derives/coercepointee/deriving-coerce-pointee-expanded.stdout
diff --git a/tests/ui/deriving/deriving-coerce-pointee-neg.rs b/tests/ui/derives/coercepointee/deriving-coerce-pointee-neg.rs
similarity index 100%
rename from tests/ui/deriving/deriving-coerce-pointee-neg.rs
rename to tests/ui/derives/coercepointee/deriving-coerce-pointee-neg.rs
diff --git a/tests/ui/deriving/deriving-coerce-pointee-neg.stderr b/tests/ui/derives/coercepointee/deriving-coerce-pointee-neg.stderr
similarity index 100%
rename from tests/ui/deriving/deriving-coerce-pointee-neg.stderr
rename to tests/ui/derives/coercepointee/deriving-coerce-pointee-neg.stderr
diff --git a/tests/ui/deriving/deriving-coerce-pointee.rs b/tests/ui/derives/coercepointee/deriving-coerce-pointee.rs
similarity index 100%
rename from tests/ui/deriving/deriving-coerce-pointee.rs
rename to tests/ui/derives/coercepointee/deriving-coerce-pointee.rs
diff --git a/tests/ui/deriving/proc-macro-attribute-mixing.rs b/tests/ui/derives/coercepointee/proc-macro-attribute-mixing.rs
similarity index 100%
rename from tests/ui/deriving/proc-macro-attribute-mixing.rs
rename to tests/ui/derives/coercepointee/proc-macro-attribute-mixing.rs
diff --git a/tests/ui/deriving/proc-macro-attribute-mixing.stdout b/tests/ui/derives/coercepointee/proc-macro-attribute-mixing.stdout
similarity index 100%
rename from tests/ui/deriving/proc-macro-attribute-mixing.stdout
rename to tests/ui/derives/coercepointee/proc-macro-attribute-mixing.stdout
diff --git a/tests/ui/derives/derive-Debug-enum-variants.rs b/tests/ui/derives/debug/derive-Debug-enum-variants.rs
similarity index 100%
rename from tests/ui/derives/derive-Debug-enum-variants.rs
rename to tests/ui/derives/debug/derive-Debug-enum-variants.rs
diff --git a/tests/ui/derives/derive-Debug-use-ufcs-struct.rs b/tests/ui/derives/debug/derive-Debug-use-ufcs-struct.rs
similarity index 100%
rename from tests/ui/derives/derive-Debug-use-ufcs-struct.rs
rename to tests/ui/derives/debug/derive-Debug-use-ufcs-struct.rs
diff --git a/tests/ui/derives/derive-Debug-use-ufcs-tuple.rs b/tests/ui/derives/debug/derive-Debug-use-ufcs-tuple.rs
similarity index 100%
rename from tests/ui/derives/derive-Debug-use-ufcs-tuple.rs
rename to tests/ui/derives/debug/derive-Debug-use-ufcs-tuple.rs
diff --git a/tests/ui/deriving/deriving-show-2.rs b/tests/ui/derives/debug/derive-debug-2.rs
similarity index 100%
rename from tests/ui/deriving/deriving-show-2.rs
rename to tests/ui/derives/debug/derive-debug-2.rs
diff --git a/tests/ui/derives/derive-debug-generic-with-lifetime.rs b/tests/ui/derives/debug/derive-debug-generic-with-lifetime.rs
similarity index 100%
rename from tests/ui/derives/derive-debug-generic-with-lifetime.rs
rename to tests/ui/derives/debug/derive-debug-generic-with-lifetime.rs
diff --git a/tests/ui/derives/derive-debug-newtype-unsized-slice.rs b/tests/ui/derives/debug/derive-debug-newtype-unsized-slice.rs
similarity index 100%
rename from tests/ui/derives/derive-debug-newtype-unsized-slice.rs
rename to tests/ui/derives/debug/derive-debug-newtype-unsized-slice.rs
diff --git a/tests/ui/derives/derive-debug-uninhabited-enum.rs b/tests/ui/derives/debug/derive-debug-uninhabited-enum.rs
similarity index 100%
rename from tests/ui/derives/derive-debug-uninhabited-enum.rs
rename to tests/ui/derives/debug/derive-debug-uninhabited-enum.rs
diff --git a/tests/ui/derives/derive-debug-uninhabited-enum.stderr b/tests/ui/derives/debug/derive-debug-uninhabited-enum.stderr
similarity index 100%
rename from tests/ui/derives/derive-debug-uninhabited-enum.stderr
rename to tests/ui/derives/debug/derive-debug-uninhabited-enum.stderr
diff --git a/tests/ui/deriving/deriving-show.rs b/tests/ui/derives/debug/derive-debug.rs
similarity index 100%
rename from tests/ui/deriving/deriving-show.rs
rename to tests/ui/derives/debug/derive-debug.rs
diff --git a/tests/ui/derives/derives-span-Debug.rs b/tests/ui/derives/debug/derives-span-Debug.rs
similarity index 100%
rename from tests/ui/derives/derives-span-Debug.rs
rename to tests/ui/derives/debug/derives-span-Debug.rs
diff --git a/tests/ui/derives/derives-span-Debug.stderr b/tests/ui/derives/debug/derives-span-Debug.stderr
similarity index 100%
rename from tests/ui/derives/derives-span-Debug.stderr
rename to tests/ui/derives/debug/derives-span-Debug.stderr
diff --git a/tests/ui/derives/nonsense-input-to-debug.rs b/tests/ui/derives/debug/nonsense-input-to-debug.rs
similarity index 100%
rename from tests/ui/derives/nonsense-input-to-debug.rs
rename to tests/ui/derives/debug/nonsense-input-to-debug.rs
diff --git a/tests/ui/derives/nonsense-input-to-debug.stderr b/tests/ui/derives/debug/nonsense-input-to-debug.stderr
similarity index 100%
rename from tests/ui/derives/nonsense-input-to-debug.stderr
rename to tests/ui/derives/debug/nonsense-input-to-debug.stderr
diff --git a/tests/ui/derives/derives-span-Default.rs b/tests/ui/derives/default/derives-span-Default.rs
similarity index 100%
rename from tests/ui/derives/derives-span-Default.rs
rename to tests/ui/derives/default/derives-span-Default.rs
diff --git a/tests/ui/derives/derives-span-Default.stderr b/tests/ui/derives/default/derives-span-Default.stderr
similarity index 100%
rename from tests/ui/derives/derives-span-Default.stderr
rename to tests/ui/derives/default/derives-span-Default.stderr
diff --git a/tests/ui/deriving/deriving-default-box.rs b/tests/ui/derives/default/deriving-default-box.rs
similarity index 100%
rename from tests/ui/deriving/deriving-default-box.rs
rename to tests/ui/derives/default/deriving-default-box.rs
diff --git a/tests/ui/deriving/deriving-default-enum.rs b/tests/ui/derives/default/deriving-default-enum.rs
similarity index 100%
rename from tests/ui/deriving/deriving-default-enum.rs
rename to tests/ui/derives/default/deriving-default-enum.rs
diff --git a/tests/ui/deriving/multiple-defaults.rs b/tests/ui/derives/default/multiple-defaults.rs
similarity index 100%
rename from tests/ui/deriving/multiple-defaults.rs
rename to tests/ui/derives/default/multiple-defaults.rs
diff --git a/tests/ui/deriving/multiple-defaults.stderr b/tests/ui/derives/default/multiple-defaults.stderr
similarity index 100%
rename from tests/ui/deriving/multiple-defaults.stderr
rename to tests/ui/derives/default/multiple-defaults.stderr
diff --git a/tests/ui/deriving/derive-no-std.rs b/tests/ui/derives/derive-no-std.rs
similarity index 100%
rename from tests/ui/deriving/derive-no-std.rs
rename to tests/ui/derives/derive-no-std.rs
diff --git a/tests/ui/deriving/deriving-all-codegen.rs b/tests/ui/derives/deriving-all-codegen.rs
similarity index 100%
rename from tests/ui/deriving/deriving-all-codegen.rs
rename to tests/ui/derives/deriving-all-codegen.rs
diff --git a/tests/ui/deriving/deriving-all-codegen.stdout b/tests/ui/derives/deriving-all-codegen.stdout
similarity index 100%
rename from tests/ui/deriving/deriving-all-codegen.stdout
rename to tests/ui/derives/deriving-all-codegen.stdout
diff --git a/tests/ui/deriving/deriving-associated-types.rs b/tests/ui/derives/deriving-associated-types.rs
similarity index 100%
rename from tests/ui/deriving/deriving-associated-types.rs
rename to tests/ui/derives/deriving-associated-types.rs
diff --git a/tests/ui/deriving/deriving-from-wrong-target.rs b/tests/ui/derives/deriving-from-wrong-target.rs
similarity index 100%
rename from tests/ui/deriving/deriving-from-wrong-target.rs
rename to tests/ui/derives/deriving-from-wrong-target.rs
diff --git a/tests/ui/deriving/deriving-from-wrong-target.stderr b/tests/ui/derives/deriving-from-wrong-target.stderr
similarity index 100%
rename from tests/ui/deriving/deriving-from-wrong-target.stderr
rename to tests/ui/derives/deriving-from-wrong-target.stderr
diff --git a/tests/ui/deriving/deriving-from.rs b/tests/ui/derives/deriving-from.rs
similarity index 100%
rename from tests/ui/deriving/deriving-from.rs
rename to tests/ui/derives/deriving-from.rs
diff --git a/tests/ui/deriving/deriving-hash.rs b/tests/ui/derives/deriving-hash.rs
similarity index 100%
rename from tests/ui/deriving/deriving-hash.rs
rename to tests/ui/derives/deriving-hash.rs
diff --git a/tests/ui/deriving/deriving-in-fn.rs b/tests/ui/derives/deriving-in-fn.rs
similarity index 100%
rename from tests/ui/deriving/deriving-in-fn.rs
rename to tests/ui/derives/deriving-in-fn.rs
diff --git a/tests/ui/deriving/deriving-with-helper.rs b/tests/ui/derives/deriving-with-helper.rs
similarity index 100%
rename from tests/ui/deriving/deriving-with-helper.rs
rename to tests/ui/derives/deriving-with-helper.rs
diff --git a/tests/ui/deriving/deriving-with-repr-packed.rs b/tests/ui/derives/deriving-with-repr-packed-3.rs
similarity index 100%
rename from tests/ui/deriving/deriving-with-repr-packed.rs
rename to tests/ui/derives/deriving-with-repr-packed-3.rs
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
diff --git a/tests/ui/deriving/deriving-enum-single-variant.rs b/tests/ui/deriving/deriving-enum-single-variant.rs
deleted file mode 100644
index 43d229c442c4..000000000000
--- a/tests/ui/deriving/deriving-enum-single-variant.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//@ run-pass
-#![allow(non_camel_case_types)]
-
-pub type task_id = isize;
-
-#[derive(PartialEq)]
-pub enum Task {
-    TaskHandle(task_id)
-}
-
-pub fn main() { }
diff --git a/tests/ui/deriving/deriving-in-macro.rs b/tests/ui/deriving/deriving-in-macro.rs
deleted file mode 100644
index 739d9b306822..000000000000
--- a/tests/ui/deriving/deriving-in-macro.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//@ check-pass
-#![allow(non_camel_case_types)]
-#![allow(dead_code)]
-
-macro_rules! define_vec {
-    () => (
-        mod foo {
-            #[derive(PartialEq)]
-            pub struct bar;
-        }
-    )
-}
-
-define_vec![];
-
-pub fn main() {}
diff --git a/tests/ui/deriving/deriving-meta-multiple.rs b/tests/ui/deriving/deriving-meta-multiple.rs
deleted file mode 100644
index 7c2d3566fbf2..000000000000
--- a/tests/ui/deriving/deriving-meta-multiple.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-//@ run-pass
-#![allow(unused_must_use)]
-#![allow(unused_imports)]
-#![allow(deprecated)]
-
-use std::hash::{Hash, SipHasher};
-
-// testing multiple separate deriving attributes
-#[derive(PartialEq)]
-#[derive(Clone)]
-#[derive(Hash)]
-struct Foo {
-    bar: usize,
-    baz: isize
-}
-
-fn hash<T: Hash>(_t: &T) {}
-
-pub fn main() {
-    let a = Foo {bar: 4, baz: -3};
-
-    a == a;    // check for PartialEq impl w/o testing its correctness
-    a.clone(); // check for Clone impl w/o testing its correctness
-    hash(&a);  // check for Hash impl w/o testing its correctness
-}
diff --git a/tests/ui/deriving/deriving-meta.rs b/tests/ui/deriving/deriving-meta.rs
deleted file mode 100644
index 70b5821edae1..000000000000
--- a/tests/ui/deriving/deriving-meta.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-//@ run-pass
-#![allow(unused_must_use)]
-#![allow(unused_imports)]
-#![allow(deprecated)]
-
-use std::hash::{Hash, SipHasher};
-
-#[derive(PartialEq, Clone, Hash)]
-struct Foo {
-    bar: usize,
-    baz: isize
-}
-
-fn hash<T: Hash>(_t: &T) {}
-
-pub fn main() {
-    let a = Foo {bar: 4, baz: -3};
-
-    a == a;    // check for PartialEq impl w/o testing its correctness
-    a.clone(); // check for Clone impl w/o testing its correctness
-    hash(&a);  // check for Hash impl w/o testing its correctness
-}
diff --git a/tests/ui/deriving/deriving-via-extension-c-enum.rs b/tests/ui/deriving/deriving-via-extension-c-enum.rs
deleted file mode 100644
index 8d15257116f1..000000000000
--- a/tests/ui/deriving/deriving-via-extension-c-enum.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#[derive(PartialEq, Debug)]
-enum Foo {
-    Bar,
-    Baz,
-    Boo
-}
-
-pub fn main() {
-    let a = Foo::Bar;
-    let b = Foo::Bar;
-    assert_eq!(a, b);
-    assert!(!(a != b));
-    assert!(a.eq(&b));
-    assert!(!a.ne(&b));
-}
diff --git a/tests/ui/deriving/deriving-via-extension-enum.rs b/tests/ui/deriving/deriving-via-extension-enum.rs
deleted file mode 100644
index f844c8243d43..000000000000
--- a/tests/ui/deriving/deriving-via-extension-enum.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#[derive(PartialEq, Debug)]
-enum Foo {
-    Bar(isize, isize),
-    Baz(f64, f64)
-}
-
-pub fn main() {
-    let a = Foo::Bar(1, 2);
-    let b = Foo::Bar(1, 2);
-    assert_eq!(a, b);
-    assert!(!(a != b));
-    assert!(a.eq(&b));
-    assert!(!a.ne(&b));
-}
diff --git a/tests/ui/deriving/deriving-via-extension-hash-enum.rs b/tests/ui/deriving/deriving-via-extension-hash-enum.rs
deleted file mode 100644
index acd34f781871..000000000000
--- a/tests/ui/deriving/deriving-via-extension-hash-enum.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#[derive(Hash)]
-enum Foo {
-    Bar(isize, char),
-    Baz(char, isize)
-}
-
-#[derive(Hash)]
-enum A {
-    B,
-    C,
-    D,
-    E
-}
-
-pub fn main(){}
diff --git a/tests/ui/deriving/deriving-via-extension-hash-struct.rs b/tests/ui/deriving/deriving-via-extension-hash-struct.rs
deleted file mode 100644
index 2b1bc9e108b1..000000000000
--- a/tests/ui/deriving/deriving-via-extension-hash-struct.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-
-#[derive(Hash)]
-struct Foo {
-    x: isize,
-    y: isize,
-    z: isize
-}
-
-pub fn main() {}
diff --git a/tests/ui/deriving/deriving-via-extension-struct-empty.rs b/tests/ui/deriving/deriving-via-extension-struct-empty.rs
deleted file mode 100644
index 43a60013e79e..000000000000
--- a/tests/ui/deriving/deriving-via-extension-struct-empty.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//@ run-pass
-#[derive(PartialEq, Debug)]
-struct Foo;
-
-pub fn main() {
-  assert_eq!(Foo, Foo);
-  assert!(!(Foo != Foo));
-}
diff --git a/tests/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs b/tests/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
deleted file mode 100644
index fe382c4e4b90..000000000000
--- a/tests/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#[derive(PartialEq, Debug)]
-enum S {
-    X { x: isize, y: isize },
-    Y
-}
-
-pub fn main() {
-    let x = S::X { x: 1, y: 2 };
-    assert_eq!(x, x);
-    assert!(!(x != x));
-}
diff --git a/tests/ui/deriving/deriving-via-extension-struct-tuple.rs b/tests/ui/deriving/deriving-via-extension-struct-tuple.rs
deleted file mode 100644
index 3192b85a37be..000000000000
--- a/tests/ui/deriving/deriving-via-extension-struct-tuple.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//@ run-pass
-#[derive(PartialEq, Debug)]
-struct Foo(isize, isize, String);
-
-pub fn main() {
-  let a1 = Foo(5, 6, "abc".to_string());
-  let a2 = Foo(5, 6, "abc".to_string());
-  let b = Foo(5, 7, "def".to_string());
-
-  assert_eq!(a1, a1);
-  assert_eq!(a2, a1);
-  assert!(!(a1 == b));
-
-  assert!(a1 != b);
-  assert!(!(a1 != a1));
-  assert!(!(a2 != a1));
-}
diff --git a/tests/ui/deriving/deriving-via-extension-struct.rs b/tests/ui/deriving/deriving-via-extension-struct.rs
deleted file mode 100644
index 4a5c3453876a..000000000000
--- a/tests/ui/deriving/deriving-via-extension-struct.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//@ run-pass
-#[derive(PartialEq, Debug)]
-struct Foo {
-    x: isize,
-    y: isize,
-    z: isize,
-}
-
-pub fn main() {
-    let a = Foo { x: 1, y: 2, z: 3 };
-    let b = Foo { x: 1, y: 2, z: 3 };
-    assert_eq!(a, b);
-    assert!(!(a != b));
-    assert!(a.eq(&b));
-    assert!(!a.ne(&b));
-}
diff --git a/tests/ui/deriving/deriving-via-extension-type-params.rs b/tests/ui/deriving/deriving-via-extension-type-params.rs
deleted file mode 100644
index 79ac0c316754..000000000000
--- a/tests/ui/deriving/deriving-via-extension-type-params.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//@ run-pass
-#[derive(PartialEq, Hash, Debug)]
-struct Foo<T> {
-    x: isize,
-    y: T,
-    z: isize
-}
-
-pub fn main() {
-    let a = Foo { x: 1, y: 2.0f64, z: 3 };
-    let b = Foo { x: 1, y: 2.0f64, z: 3 };
-    assert_eq!(a, b);
-    assert!(!(a != b));
-    assert!(a.eq(&b));
-    assert!(!a.ne(&b));
-}
diff --git a/triagebot.toml b/triagebot.toml
index a4155914fb02..575d5d38a2ef 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -1283,7 +1283,7 @@ Please ensure that if you've changed the output:
 """
 cc = ["@aDotInTheVoid", "@obi1kenobi"]
 
-[mentions."tests/ui/deriving/deriving-all-codegen.stdout"]
+[mentions."tests/ui/derives/deriving-all-codegen.stdout"]
 message = "Changes to the code generated for builtin derived traits."
 cc = ["@nnethercote"]