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