diff --git a/tests/ui/README.md b/tests/ui/README.md
index 0af02ab39c23..139837864357 100644
--- a/tests/ui/README.md
+++ b/tests/ui/README.md
@@ -420,10 +420,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/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/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"]