diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 1500c82c411ac..45187a0b6450e 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -1583,7 +1583,6 @@ ui/macros/issue-6596-1.rs
 ui/macros/issue-6596-2.rs
 ui/macros/issue-68058.rs
 ui/macros/issue-68060.rs
-ui/macros/issue-69396-const-no-type-in-macro.rs
 ui/macros/issue-69838-mods-relative-to-included-path.rs
 ui/macros/issue-70446.rs
 ui/macros/issue-75982-foreign-macro-weird-mod.rs
@@ -2100,7 +2099,6 @@ ui/parser/issues/issue-88770.rs
 ui/parser/issues/issue-88818.rs
 ui/parser/issues/issue-89388.rs
 ui/parser/issues/issue-89396.rs
-ui/parser/issues/issue-89574.rs
 ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
 ui/parser/issues/issue-90728.rs
 ui/parser/issues/issue-90993.rs
@@ -2880,7 +2878,6 @@ ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.rs
 ui/typeck/auxiliary/issue-29181.rs
 ui/typeck/auxiliary/issue-36708.rs
 ui/typeck/auxiliary/issue-81943-lib.rs
-ui/typeck/issue-100164.rs
 ui/typeck/issue-100246.rs
 ui/typeck/issue-100285.rs
 ui/typeck/issue-103899.rs
@@ -2937,7 +2934,6 @@ ui/typeck/issue-74933.rs
 ui/typeck/issue-75883.rs
 ui/typeck/issue-75889.rs
 ui/typeck/issue-7813.rs
-ui/typeck/issue-79040.rs
 ui/typeck/issue-80207-unsized-return.rs
 ui/typeck/issue-80779.rs
 ui/typeck/issue-81293.rs
diff --git a/tests/ui/typeck/issue-79040.rs b/tests/ui/consts/const-item-no-type/dont-suggest-type-error.rs
similarity index 100%
rename from tests/ui/typeck/issue-79040.rs
rename to tests/ui/consts/const-item-no-type/dont-suggest-type-error.rs
diff --git a/tests/ui/typeck/issue-79040.stderr b/tests/ui/consts/const-item-no-type/dont-suggest-type-error.stderr
similarity index 85%
rename from tests/ui/typeck/issue-79040.stderr
rename to tests/ui/consts/const-item-no-type/dont-suggest-type-error.stderr
index 4ab8df8f6c936..8f1fcc645b9c0 100644
--- a/tests/ui/typeck/issue-79040.stderr
+++ b/tests/ui/consts/const-item-no-type/dont-suggest-type-error.stderr
@@ -1,5 +1,5 @@
 error[E0369]: cannot add `{integer}` to `&str`
-  --> $DIR/issue-79040.rs:2:25
+  --> $DIR/dont-suggest-type-error.rs:2:25
    |
 LL |     const FOO = "hello" + 1;
    |                 ------- ^ - {integer}
@@ -7,7 +7,7 @@ LL |     const FOO = "hello" + 1;
    |                 &str
 
 error: missing type for `const` item
-  --> $DIR/issue-79040.rs:2:14
+  --> $DIR/dont-suggest-type-error.rs:2:14
    |
 LL |     const FOO = "hello" + 1;
    |              ^
diff --git a/tests/ui/parser/issues/issue-89574.rs b/tests/ui/consts/const-item-no-type/empty-array.rs
similarity index 100%
rename from tests/ui/parser/issues/issue-89574.rs
rename to tests/ui/consts/const-item-no-type/empty-array.rs
diff --git a/tests/ui/parser/issues/issue-89574.stderr b/tests/ui/consts/const-item-no-type/empty-array.stderr
similarity index 88%
rename from tests/ui/parser/issues/issue-89574.stderr
rename to tests/ui/consts/const-item-no-type/empty-array.stderr
index f40f5aded8ef1..fe307d50353e4 100644
--- a/tests/ui/parser/issues/issue-89574.stderr
+++ b/tests/ui/consts/const-item-no-type/empty-array.stderr
@@ -1,11 +1,11 @@
 error[E0282]: type annotations needed
-  --> $DIR/issue-89574.rs:2:25
+  --> $DIR/empty-array.rs:2:25
    |
 LL |     const EMPTY_ARRAY = [];
    |                         ^^ cannot infer type
 
 error: missing type for `const` item
-  --> $DIR/issue-89574.rs:2:22
+  --> $DIR/empty-array.rs:2:22
    |
 LL |     const EMPTY_ARRAY = [];
    |                      ^
diff --git a/tests/ui/macros/issue-69396-const-no-type-in-macro.rs b/tests/ui/consts/const-item-no-type/in-macro.rs
similarity index 100%
rename from tests/ui/macros/issue-69396-const-no-type-in-macro.rs
rename to tests/ui/consts/const-item-no-type/in-macro.rs
diff --git a/tests/ui/macros/issue-69396-const-no-type-in-macro.stderr b/tests/ui/consts/const-item-no-type/in-macro.stderr
similarity index 89%
rename from tests/ui/macros/issue-69396-const-no-type-in-macro.stderr
rename to tests/ui/consts/const-item-no-type/in-macro.stderr
index 4342d7d88f54b..d6182aa114270 100644
--- a/tests/ui/macros/issue-69396-const-no-type-in-macro.stderr
+++ b/tests/ui/consts/const-item-no-type/in-macro.stderr
@@ -1,5 +1,5 @@
 error[E0428]: the name `A` is defined multiple times
-  --> $DIR/issue-69396-const-no-type-in-macro.rs:4:13
+  --> $DIR/in-macro.rs:4:13
    |
 LL |               const A = "A".$fn();
    |               ^^^^^^^^^^^^^^^^^^^^ `A` redefined here
@@ -14,7 +14,7 @@ LL | | }
    = note: this error originates in the macro `suite` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: missing type for `const` item
-  --> $DIR/issue-69396-const-no-type-in-macro.rs:4:20
+  --> $DIR/in-macro.rs:4:20
    |
 LL |               const A = "A".$fn();
    |                      ^ help: provide a type for the constant: `: usize`
@@ -28,7 +28,7 @@ LL | | }
    = note: this error originates in the macro `suite` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0121]: missing type for item
-  --> $DIR/issue-69396-const-no-type-in-macro.rs:4:20
+  --> $DIR/in-macro.rs:4:20
    |
 LL |               const A = "A".$fn();
    |                      ^ not allowed in type signatures
diff --git a/tests/ui/typeck/issue-100164.fixed b/tests/ui/consts/const-item-no-type/with-colon.fixed
similarity index 100%
rename from tests/ui/typeck/issue-100164.fixed
rename to tests/ui/consts/const-item-no-type/with-colon.fixed
diff --git a/tests/ui/typeck/issue-100164.rs b/tests/ui/consts/const-item-no-type/with-colon.rs
similarity index 100%
rename from tests/ui/typeck/issue-100164.rs
rename to tests/ui/consts/const-item-no-type/with-colon.rs
diff --git a/tests/ui/typeck/issue-100164.stderr b/tests/ui/consts/const-item-no-type/with-colon.stderr
similarity index 82%
rename from tests/ui/typeck/issue-100164.stderr
rename to tests/ui/consts/const-item-no-type/with-colon.stderr
index 06a132d651429..adbea1f355a0b 100644
--- a/tests/ui/typeck/issue-100164.stderr
+++ b/tests/ui/consts/const-item-no-type/with-colon.stderr
@@ -1,11 +1,11 @@
 error: missing type for `const` item
-  --> $DIR/issue-100164.rs:3:10
+  --> $DIR/with-colon.rs:3:10
    |
 LL | const _A: = 123;
    |          ^ help: provide a type for the constant: `i32`
 
 error: missing type for `const` item
-  --> $DIR/issue-100164.rs:7:14
+  --> $DIR/with-colon.rs:7:14
    |
 LL |     const _B: = 123;
    |              ^ help: provide a type for the constant: `i32`