diff --git a/src/test/ui/const-generics/issue-60263.rs b/src/test/ui/const-generics/issues/issue-60263.rs
similarity index 100%
rename from src/test/ui/const-generics/issue-60263.rs
rename to src/test/ui/const-generics/issues/issue-60263.rs
diff --git a/src/test/ui/const-generics/issue-60263.stderr b/src/test/ui/const-generics/issues/issue-60263.stderr
similarity index 100%
rename from src/test/ui/const-generics/issue-60263.stderr
rename to src/test/ui/const-generics/issues/issue-60263.stderr
diff --git a/src/test/ui/const-generics/issue-60818-struct-constructors.rs b/src/test/ui/const-generics/issues/issue-60818-struct-constructors.rs
similarity index 100%
rename from src/test/ui/const-generics/issue-60818-struct-constructors.rs
rename to src/test/ui/const-generics/issues/issue-60818-struct-constructors.rs
diff --git a/src/test/ui/const-generics/issue-60818-struct-constructors.stderr b/src/test/ui/const-generics/issues/issue-60818-struct-constructors.stderr
similarity index 100%
rename from src/test/ui/const-generics/issue-60818-struct-constructors.stderr
rename to src/test/ui/const-generics/issues/issue-60818-struct-constructors.stderr
diff --git a/src/test/ui/const-generics/issue-61336-1.rs b/src/test/ui/const-generics/issues/issue-61336-1.rs
similarity index 100%
rename from src/test/ui/const-generics/issue-61336-1.rs
rename to src/test/ui/const-generics/issues/issue-61336-1.rs
diff --git a/src/test/ui/const-generics/issue-61336-1.stderr b/src/test/ui/const-generics/issues/issue-61336-1.stderr
similarity index 100%
rename from src/test/ui/const-generics/issue-61336-1.stderr
rename to src/test/ui/const-generics/issues/issue-61336-1.stderr
diff --git a/src/test/ui/const-generics/issue-61336-2.rs b/src/test/ui/const-generics/issues/issue-61336-2.rs
similarity index 100%
rename from src/test/ui/const-generics/issue-61336-2.rs
rename to src/test/ui/const-generics/issues/issue-61336-2.rs
diff --git a/src/test/ui/const-generics/issue-61336-2.stderr b/src/test/ui/const-generics/issues/issue-61336-2.stderr
similarity index 100%
rename from src/test/ui/const-generics/issue-61336-2.stderr
rename to src/test/ui/const-generics/issues/issue-61336-2.stderr
diff --git a/src/test/ui/const-generics/issue-61336.rs b/src/test/ui/const-generics/issues/issue-61336.rs
similarity index 100%
rename from src/test/ui/const-generics/issue-61336.rs
rename to src/test/ui/const-generics/issues/issue-61336.rs
diff --git a/src/test/ui/const-generics/issue-61336.stderr b/src/test/ui/const-generics/issues/issue-61336.stderr
similarity index 100%
rename from src/test/ui/const-generics/issue-61336.stderr
rename to src/test/ui/const-generics/issues/issue-61336.stderr
diff --git a/src/test/ui/const-generics/issue-61422.rs b/src/test/ui/const-generics/issues/issue-61422.rs
similarity index 100%
rename from src/test/ui/const-generics/issue-61422.rs
rename to src/test/ui/const-generics/issues/issue-61422.rs
diff --git a/src/test/ui/const-generics/issue-61422.stderr b/src/test/ui/const-generics/issues/issue-61422.stderr
similarity index 100%
rename from src/test/ui/const-generics/issue-61422.stderr
rename to src/test/ui/const-generics/issues/issue-61422.stderr
diff --git a/src/test/ui/const-generics/issue-61432.rs b/src/test/ui/const-generics/issues/issue-61432.rs
similarity index 100%
rename from src/test/ui/const-generics/issue-61432.rs
rename to src/test/ui/const-generics/issues/issue-61432.rs
diff --git a/src/test/ui/const-generics/issue-61432.stderr b/src/test/ui/const-generics/issues/issue-61432.stderr
similarity index 100%
rename from src/test/ui/const-generics/issue-61432.stderr
rename to src/test/ui/const-generics/issues/issue-61432.stderr
diff --git a/src/test/ui/const-generics/issue-64519.rs b/src/test/ui/const-generics/issues/issue-64519.rs
similarity index 100%
rename from src/test/ui/const-generics/issue-64519.rs
rename to src/test/ui/const-generics/issues/issue-64519.rs
diff --git a/src/test/ui/const-generics/issue-64519.stderr b/src/test/ui/const-generics/issues/issue-64519.stderr
similarity index 100%
rename from src/test/ui/const-generics/issue-64519.stderr
rename to src/test/ui/const-generics/issues/issue-64519.stderr