diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 3a912dd3c354..1f71c8251aa8 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -844,13 +844,6 @@ ui/derives/issue-43023.rs
 ui/derives/issue-91492.rs
 ui/derives/issue-91550.rs
 ui/derives/issue-97343.rs
-ui/deriving/issue-103157.rs
-ui/deriving/issue-15689-1.rs
-ui/deriving/issue-18738.rs
-ui/deriving/issue-19358.rs
-ui/deriving/issue-58319.rs
-ui/deriving/issue-6341.rs
-ui/deriving/issue-89188-gat-hrtb.rs
 ui/did_you_mean/issue-103909.rs
 ui/did_you_mean/issue-105225-named-args.rs
 ui/did_you_mean/issue-105225.rs
diff --git a/tests/ui/deriving/issue-89188-gat-hrtb.rs b/tests/ui/derives/clone-include-gat-hrtb.rs
similarity index 100%
rename from tests/ui/deriving/issue-89188-gat-hrtb.rs
rename to tests/ui/derives/clone-include-gat-hrtb.rs
diff --git a/tests/ui/deriving/issue-103157.rs b/tests/ui/derives/derive-eq-check-all-variants.rs
similarity index 100%
rename from tests/ui/deriving/issue-103157.rs
rename to tests/ui/derives/derive-eq-check-all-variants.rs
diff --git a/tests/ui/deriving/issue-103157.stderr b/tests/ui/derives/derive-eq-check-all-variants.stderr
similarity index 93%
rename from tests/ui/deriving/issue-103157.stderr
rename to tests/ui/derives/derive-eq-check-all-variants.stderr
index 0e4a3f75db3f..19026145c66c 100644
--- a/tests/ui/deriving/issue-103157.stderr
+++ b/tests/ui/derives/derive-eq-check-all-variants.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the trait bound `f64: Eq` is not satisfied
-  --> $DIR/issue-103157.rs:6:11
+  --> $DIR/derive-eq-check-all-variants.rs:6:11
    |
 LL | #[derive(PartialEq, Eq)]
    |                     -- in this derive macro expansion
diff --git a/tests/ui/deriving/issue-6341.rs b/tests/ui/derives/derive-on-drop-type.rs
similarity index 100%
rename from tests/ui/deriving/issue-6341.rs
rename to tests/ui/derives/derive-on-drop-type.rs
diff --git a/tests/ui/deriving/issue-18738.rs b/tests/ui/derives/derive-static-str-field.rs
similarity index 100%
rename from tests/ui/deriving/issue-18738.rs
rename to tests/ui/derives/derive-static-str-field.rs
diff --git a/tests/ui/deriving/issue-15689-1.rs b/tests/ui/derives/derive-type-with-reference.rs
similarity index 100%
rename from tests/ui/deriving/issue-15689-1.rs
rename to tests/ui/derives/derive-type-with-reference.rs
diff --git a/tests/ui/deriving/issue-19358.rs b/tests/ui/derives/derive-with-where-bounds.rs
similarity index 100%
rename from tests/ui/deriving/issue-19358.rs
rename to tests/ui/derives/derive-with-where-bounds.rs
diff --git a/tests/ui/deriving/issue-58319.rs b/tests/ui/derives/six-hundred-fields.rs
similarity index 100%
rename from tests/ui/deriving/issue-58319.rs
rename to tests/ui/derives/six-hundred-fields.rs