diff --git a/tests/ui/issues/issue-3521-2.fixed b/tests/ui/statics/static-cannot-use-local-variable.fixed
similarity index 100%
rename from tests/ui/issues/issue-3521-2.fixed
rename to tests/ui/statics/static-cannot-use-local-variable.fixed
diff --git a/tests/ui/issues/issue-3521-2.rs b/tests/ui/statics/static-cannot-use-local-variable.rs
similarity index 100%
rename from tests/ui/issues/issue-3521-2.rs
rename to tests/ui/statics/static-cannot-use-local-variable.rs
diff --git a/tests/ui/issues/issue-3521-2.stderr b/tests/ui/statics/static-cannot-use-local-variable.stderr
similarity index 100%
rename from tests/ui/issues/issue-3521-2.stderr
rename to tests/ui/statics/static-cannot-use-local-variable.stderr
diff --git a/tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668-2.fixed b/tests/ui/statics/static-in-fn-cannot-use-param.fixed
similarity index 100%
rename from tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668-2.fixed
rename to tests/ui/statics/static-in-fn-cannot-use-param.fixed
diff --git a/tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668-2.rs b/tests/ui/statics/static-in-fn-cannot-use-param.rs
similarity index 100%
rename from tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668-2.rs
rename to tests/ui/statics/static-in-fn-cannot-use-param.rs
diff --git a/tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668-2.stderr b/tests/ui/statics/static-in-fn-cannot-use-param.stderr
similarity index 100%
rename from tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668-2.stderr
rename to tests/ui/statics/static-in-fn-cannot-use-param.stderr
diff --git a/tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668.rs b/tests/ui/statics/static-in-method-cannot-use-self.rs
similarity index 100%
rename from tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668.rs
rename to tests/ui/statics/static-in-method-cannot-use-self.rs
diff --git a/tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668.stderr b/tests/ui/statics/static-in-method-cannot-use-self.stderr
similarity index 100%
rename from tests/ui/issues/issue-3668-non-constant-value-in-constant/issue-3668.stderr
rename to tests/ui/statics/static-in-method-cannot-use-self.stderr
diff --git a/tests/ui/issues/issue-39367.rs b/tests/ui/statics/static-lazy-init-with-arena-set.rs
similarity index 100%
rename from tests/ui/issues/issue-39367.rs
rename to tests/ui/statics/static-lazy-init-with-arena-set.rs
diff --git a/tests/ui/issues/issue-39367.stderr b/tests/ui/statics/static-lazy-init-with-arena-set.stderr
similarity index 100%
rename from tests/ui/issues/issue-39367.stderr
rename to tests/ui/statics/static-lazy-init-with-arena-set.stderr
diff --git a/tests/ui/issues/issue-46604.rs b/tests/ui/statics/static-mut-borrow-of-temporary.rs
similarity index 100%
rename from tests/ui/issues/issue-46604.rs
rename to tests/ui/statics/static-mut-borrow-of-temporary.rs
diff --git a/tests/ui/issues/issue-46604.stderr b/tests/ui/statics/static-mut-borrow-of-temporary.stderr
similarity index 100%
rename from tests/ui/issues/issue-46604.stderr
rename to tests/ui/statics/static-mut-borrow-of-temporary.stderr
diff --git a/tests/ui/issues/issue-29821.rs b/tests/ui/statics/static-mut-with-assoc-type-field.rs
similarity index 100%
rename from tests/ui/issues/issue-29821.rs
rename to tests/ui/statics/static-mut-with-assoc-type-field.rs
diff --git a/tests/ui/issues/issue-25901.rs b/tests/ui/statics/static-ref-deref-non-const-trait.rs
similarity index 100%
rename from tests/ui/issues/issue-25901.rs
rename to tests/ui/statics/static-ref-deref-non-const-trait.rs
diff --git a/tests/ui/issues/issue-25901.stderr b/tests/ui/statics/static-ref-deref-non-const-trait.stderr
similarity index 100%
rename from tests/ui/issues/issue-25901.stderr
rename to tests/ui/statics/static-ref-deref-non-const-trait.stderr