diff --git a/src/test/ui/huge-array-simple-32.rs b/src/test/ui/limits/huge-array-simple-32.rs
similarity index 100%
rename from src/test/ui/huge-array-simple-32.rs
rename to src/test/ui/limits/huge-array-simple-32.rs
diff --git a/src/test/ui/huge-array-simple-32.stderr b/src/test/ui/limits/huge-array-simple-32.stderr
similarity index 100%
rename from src/test/ui/huge-array-simple-32.stderr
rename to src/test/ui/limits/huge-array-simple-32.stderr
diff --git a/src/test/ui/huge-array-simple-64.rs b/src/test/ui/limits/huge-array-simple-64.rs
similarity index 100%
rename from src/test/ui/huge-array-simple-64.rs
rename to src/test/ui/limits/huge-array-simple-64.rs
diff --git a/src/test/ui/huge-array-simple-64.stderr b/src/test/ui/limits/huge-array-simple-64.stderr
similarity index 100%
rename from src/test/ui/huge-array-simple-64.stderr
rename to src/test/ui/limits/huge-array-simple-64.stderr
diff --git a/src/test/ui/huge-array.rs b/src/test/ui/limits/huge-array.rs
similarity index 100%
rename from src/test/ui/huge-array.rs
rename to src/test/ui/limits/huge-array.rs
diff --git a/src/test/ui/huge-array.stderr b/src/test/ui/limits/huge-array.stderr
similarity index 100%
rename from src/test/ui/huge-array.stderr
rename to src/test/ui/limits/huge-array.stderr
diff --git a/src/test/ui/huge-enum.rs b/src/test/ui/limits/huge-enum.rs
similarity index 100%
rename from src/test/ui/huge-enum.rs
rename to src/test/ui/limits/huge-enum.rs
diff --git a/src/test/ui/huge-enum.stderr b/src/test/ui/limits/huge-enum.stderr
similarity index 100%
rename from src/test/ui/huge-enum.stderr
rename to src/test/ui/limits/huge-enum.stderr
diff --git a/src/test/ui/huge-struct.rs b/src/test/ui/limits/huge-struct.rs
similarity index 100%
rename from src/test/ui/huge-struct.rs
rename to src/test/ui/limits/huge-struct.rs
diff --git a/src/test/ui/huge-struct.stderr b/src/test/ui/limits/huge-struct.stderr
similarity index 100%
rename from src/test/ui/huge-struct.stderr
rename to src/test/ui/limits/huge-struct.stderr
diff --git a/src/test/ui/issues/issue-15919-32.rs b/src/test/ui/limits/issue-15919-32.rs
similarity index 100%
rename from src/test/ui/issues/issue-15919-32.rs
rename to src/test/ui/limits/issue-15919-32.rs
diff --git a/src/test/ui/issues/issue-15919-32.stderr b/src/test/ui/limits/issue-15919-32.stderr
similarity index 100%
rename from src/test/ui/issues/issue-15919-32.stderr
rename to src/test/ui/limits/issue-15919-32.stderr
diff --git a/src/test/ui/issues/issue-15919-64.rs b/src/test/ui/limits/issue-15919-64.rs
similarity index 100%
rename from src/test/ui/issues/issue-15919-64.rs
rename to src/test/ui/limits/issue-15919-64.rs
diff --git a/src/test/ui/issues/issue-15919-64.stderr b/src/test/ui/limits/issue-15919-64.stderr
similarity index 100%
rename from src/test/ui/issues/issue-15919-64.stderr
rename to src/test/ui/limits/issue-15919-64.stderr
diff --git a/src/test/ui/issues/issue-17913.rs b/src/test/ui/limits/issue-17913.rs
similarity index 100%
rename from src/test/ui/issues/issue-17913.rs
rename to src/test/ui/limits/issue-17913.rs
diff --git a/src/test/ui/issues/issue-17913.stderr b/src/test/ui/limits/issue-17913.stderr
similarity index 100%
rename from src/test/ui/issues/issue-17913.stderr
rename to src/test/ui/limits/issue-17913.stderr
diff --git a/src/test/ui/consts/issue-55878.rs b/src/test/ui/limits/issue-55878.rs
similarity index 100%
rename from src/test/ui/consts/issue-55878.rs
rename to src/test/ui/limits/issue-55878.rs
diff --git a/src/test/ui/consts/issue-55878.stderr b/src/test/ui/limits/issue-55878.stderr
similarity index 100%
rename from src/test/ui/consts/issue-55878.stderr
rename to src/test/ui/limits/issue-55878.stderr
diff --git a/src/test/ui/consts/issue-56762.rs b/src/test/ui/limits/issue-56762.rs
similarity index 100%
rename from src/test/ui/consts/issue-56762.rs
rename to src/test/ui/limits/issue-56762.rs
diff --git a/src/test/ui/consts/issue-56762.stderr b/src/test/ui/limits/issue-56762.stderr
similarity index 100%
rename from src/test/ui/consts/issue-56762.stderr
rename to src/test/ui/limits/issue-56762.stderr
diff --git a/src/test/ui/lint/issue-69485-var-size-diffs-too-large.rs b/src/test/ui/limits/issue-69485-var-size-diffs-too-large.rs
similarity index 100%
rename from src/test/ui/lint/issue-69485-var-size-diffs-too-large.rs
rename to src/test/ui/limits/issue-69485-var-size-diffs-too-large.rs
diff --git a/src/test/ui/lint/issue-69485-var-size-diffs-too-large.stderr b/src/test/ui/limits/issue-69485-var-size-diffs-too-large.stderr
similarity index 100%
rename from src/test/ui/lint/issue-69485-var-size-diffs-too-large.stderr
rename to src/test/ui/limits/issue-69485-var-size-diffs-too-large.stderr
diff --git a/src/test/ui/issues/issue-75158-64.rs b/src/test/ui/limits/issue-75158-64.rs
similarity index 100%
rename from src/test/ui/issues/issue-75158-64.rs
rename to src/test/ui/limits/issue-75158-64.rs
diff --git a/src/test/ui/issues/issue-75158-64.stderr b/src/test/ui/limits/issue-75158-64.stderr
similarity index 100%
rename from src/test/ui/issues/issue-75158-64.stderr
rename to src/test/ui/limits/issue-75158-64.stderr