diff --git a/src/test/ui/byte-literals.rs b/src/test/ui/array-slice-vec/byte-literals.rs
similarity index 100%
rename from src/test/ui/byte-literals.rs
rename to src/test/ui/array-slice-vec/byte-literals.rs
diff --git a/src/test/ui/suffixed-literal-meta.rs b/src/test/ui/attributes/suffixed-literal-meta.rs
similarity index 100%
rename from src/test/ui/suffixed-literal-meta.rs
rename to src/test/ui/attributes/suffixed-literal-meta.rs
diff --git a/src/test/ui/suffixed-literal-meta.stderr b/src/test/ui/attributes/suffixed-literal-meta.stderr
similarity index 100%
rename from src/test/ui/suffixed-literal-meta.stderr
rename to src/test/ui/attributes/suffixed-literal-meta.stderr
diff --git a/src/test/ui/operator-multidispatch.rs b/src/test/ui/binop/operator-multidispatch.rs
similarity index 100%
rename from src/test/ui/operator-multidispatch.rs
rename to src/test/ui/binop/operator-multidispatch.rs
diff --git a/src/test/ui/operator-overloading.rs b/src/test/ui/binop/operator-overloading.rs
similarity index 100%
rename from src/test/ui/operator-overloading.rs
rename to src/test/ui/binop/operator-overloading.rs
diff --git a/src/test/ui/placement-syntax.rs b/src/test/ui/binop/placement-syntax.rs
similarity index 100%
rename from src/test/ui/placement-syntax.rs
rename to src/test/ui/binop/placement-syntax.rs
diff --git a/src/test/ui/placement-syntax.stderr b/src/test/ui/binop/placement-syntax.stderr
similarity index 100%
rename from src/test/ui/placement-syntax.stderr
rename to src/test/ui/binop/placement-syntax.stderr
diff --git a/src/test/ui/immut-function-arguments.rs b/src/test/ui/borrowck/immut-function-arguments.rs
similarity index 100%
rename from src/test/ui/immut-function-arguments.rs
rename to src/test/ui/borrowck/immut-function-arguments.rs
diff --git a/src/test/ui/immut-function-arguments.stderr b/src/test/ui/borrowck/immut-function-arguments.stderr
similarity index 100%
rename from src/test/ui/immut-function-arguments.stderr
rename to src/test/ui/borrowck/immut-function-arguments.stderr
diff --git a/src/test/ui/kindck-implicit-close-over-mut-var.rs b/src/test/ui/borrowck/kindck-implicit-close-over-mut-var.rs
similarity index 100%
rename from src/test/ui/kindck-implicit-close-over-mut-var.rs
rename to src/test/ui/borrowck/kindck-implicit-close-over-mut-var.rs
diff --git a/src/test/ui/crt-static-on-works.rs b/src/test/ui/cfg/crt-static-on-works.rs
similarity index 100%
rename from src/test/ui/crt-static-on-works.rs
rename to src/test/ui/cfg/crt-static-on-works.rs
diff --git a/src/test/ui/once-move-out-on-heap.rs b/src/test/ui/closures/once-move-out-on-heap.rs
similarity index 100%
rename from src/test/ui/once-move-out-on-heap.rs
rename to src/test/ui/closures/once-move-out-on-heap.rs
diff --git a/src/test/ui/auxiliary/llvm_pr32379.rs b/src/test/ui/codegen/auxiliary/llvm_pr32379.rs
similarity index 100%
rename from src/test/ui/auxiliary/llvm_pr32379.rs
rename to src/test/ui/codegen/auxiliary/llvm_pr32379.rs
diff --git a/src/test/ui/init-large-type.rs b/src/test/ui/codegen/init-large-type.rs
similarity index 100%
rename from src/test/ui/init-large-type.rs
rename to src/test/ui/codegen/init-large-type.rs
diff --git a/src/test/ui/llvm-pr32379.rs b/src/test/ui/codegen/llvm-pr32379.rs
similarity index 100%
rename from src/test/ui/llvm-pr32379.rs
rename to src/test/ui/codegen/llvm-pr32379.rs
diff --git a/src/test/ui/retslot-cast.rs b/src/test/ui/coercion/retslot-cast.rs
similarity index 100%
rename from src/test/ui/retslot-cast.rs
rename to src/test/ui/coercion/retslot-cast.rs
diff --git a/src/test/ui/retslot-cast.stderr b/src/test/ui/coercion/retslot-cast.stderr
similarity index 100%
rename from src/test/ui/retslot-cast.stderr
rename to src/test/ui/coercion/retslot-cast.stderr
diff --git a/src/test/ui/cleanup-arm-conditional.rs b/src/test/ui/dropck/cleanup-arm-conditional.rs
similarity index 100%
rename from src/test/ui/cleanup-arm-conditional.rs
rename to src/test/ui/dropck/cleanup-arm-conditional.rs
diff --git a/src/test/ui/edition-keywords-2015-2018.rs b/src/test/ui/editions/edition-keywords-2015-2018.rs
similarity index 100%
rename from src/test/ui/edition-keywords-2015-2018.rs
rename to src/test/ui/editions/edition-keywords-2015-2018.rs
diff --git a/src/test/ui/edition-keywords-2018-2018.rs b/src/test/ui/editions/edition-keywords-2018-2018.rs
similarity index 100%
rename from src/test/ui/edition-keywords-2018-2018.rs
rename to src/test/ui/editions/edition-keywords-2018-2018.rs
diff --git a/src/test/ui/export.rs b/src/test/ui/export.rs
deleted file mode 100644
index 73ceec6803a90..0000000000000
--- a/src/test/ui/export.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-mod foo {
-    pub fn x(y: isize) { log(debug, y); }
-    //~^ ERROR cannot find function `log` in this scope
-    //~| ERROR cannot find value `debug` in this scope
-    fn z(y: isize) { log(debug, y); }
-    //~^ ERROR cannot find function `log` in this scope
-    //~| ERROR cannot find value `debug` in this scope
-}
-
-fn main() { foo::z(10); } //~ ERROR function `z` is private
diff --git a/src/test/ui/export.stderr b/src/test/ui/export.stderr
deleted file mode 100644
index 23c29b31c6a8e..0000000000000
--- a/src/test/ui/export.stderr
+++ /dev/null
@@ -1,40 +0,0 @@
-error[E0425]: cannot find function `log` in this scope
-  --> $DIR/export.rs:2:26
-   |
-LL |     pub fn x(y: isize) { log(debug, y); }
-   |                          ^^^ not found in this scope
-
-error[E0425]: cannot find value `debug` in this scope
-  --> $DIR/export.rs:2:30
-   |
-LL |     pub fn x(y: isize) { log(debug, y); }
-   |                              ^^^^^ not found in this scope
-
-error[E0425]: cannot find function `log` in this scope
-  --> $DIR/export.rs:5:22
-   |
-LL |     fn z(y: isize) { log(debug, y); }
-   |                      ^^^ not found in this scope
-
-error[E0425]: cannot find value `debug` in this scope
-  --> $DIR/export.rs:5:26
-   |
-LL |     fn z(y: isize) { log(debug, y); }
-   |                          ^^^^^ not found in this scope
-
-error[E0603]: function `z` is private
-  --> $DIR/export.rs:10:18
-   |
-LL | fn main() { foo::z(10); }
-   |                  ^ private function
-   |
-note: the function `z` is defined here
-  --> $DIR/export.rs:5:5
-   |
-LL |     fn z(y: isize) { log(debug, y); }
-   |     ^^^^^^^^^^^^^^
-
-error: aborting due to 5 previous errors
-
-Some errors have detailed explanations: E0425, E0603.
-For more information about an error, try `rustc --explain E0425`.
diff --git a/src/test/ui/expr-block-slot.rs b/src/test/ui/expr-block-slot.rs
deleted file mode 100644
index 54bcbb328b038..0000000000000
--- a/src/test/ui/expr-block-slot.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-// Regression test for issue #377
-
-
-struct A { a: isize }
-struct V { v: isize }
-
-pub fn main() {
-    let a = { let b = A {a: 3}; b };
-    assert_eq!(a.a, 3);
-    let c = { let d = V {v: 3}; d };
-    assert_eq!(c.v, 3);
-}
diff --git a/src/test/ui/auxiliary/no-mangle-associated-fn.rs b/src/test/ui/extern/auxiliary/no-mangle-associated-fn.rs
similarity index 100%
rename from src/test/ui/auxiliary/no-mangle-associated-fn.rs
rename to src/test/ui/extern/auxiliary/no-mangle-associated-fn.rs
diff --git a/src/test/ui/no-mangle-associated-fn.rs b/src/test/ui/extern/no-mangle-associated-fn.rs
similarity index 100%
rename from src/test/ui/no-mangle-associated-fn.rs
rename to src/test/ui/extern/no-mangle-associated-fn.rs
diff --git a/src/test/ui/fun-call-variants.rs b/src/test/ui/fn/fun-call-variants.rs
similarity index 100%
rename from src/test/ui/fun-call-variants.rs
rename to src/test/ui/fn/fun-call-variants.rs
diff --git a/src/test/ui/break-outside-loop.rs b/src/test/ui/for-loop-while/break-outside-loop.rs
similarity index 100%
rename from src/test/ui/break-outside-loop.rs
rename to src/test/ui/for-loop-while/break-outside-loop.rs
diff --git a/src/test/ui/break-outside-loop.stderr b/src/test/ui/for-loop-while/break-outside-loop.stderr
similarity index 100%
rename from src/test/ui/break-outside-loop.stderr
rename to src/test/ui/for-loop-while/break-outside-loop.stderr
diff --git a/src/test/ui/break-while-condition.rs b/src/test/ui/for-loop-while/break-while-condition.rs
similarity index 100%
rename from src/test/ui/break-while-condition.rs
rename to src/test/ui/for-loop-while/break-while-condition.rs
diff --git a/src/test/ui/break-while-condition.stderr b/src/test/ui/for-loop-while/break-while-condition.stderr
similarity index 100%
rename from src/test/ui/break-while-condition.stderr
rename to src/test/ui/for-loop-while/break-while-condition.stderr
diff --git a/src/test/ui/thread-local-not-in-prelude.rs b/src/test/ui/hygiene/thread-local-not-in-prelude.rs
similarity index 100%
rename from src/test/ui/thread-local-not-in-prelude.rs
rename to src/test/ui/hygiene/thread-local-not-in-prelude.rs
diff --git a/src/test/ui/absolute-paths-in-nested-use-groups.rs b/src/test/ui/imports/absolute-paths-in-nested-use-groups.rs
similarity index 100%
rename from src/test/ui/absolute-paths-in-nested-use-groups.rs
rename to src/test/ui/imports/absolute-paths-in-nested-use-groups.rs
diff --git a/src/test/ui/absolute-paths-in-nested-use-groups.stderr b/src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr
similarity index 100%
rename from src/test/ui/absolute-paths-in-nested-use-groups.stderr
rename to src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr
diff --git a/src/test/ui/reexport-star.rs b/src/test/ui/imports/reexport-star.rs
similarity index 100%
rename from src/test/ui/reexport-star.rs
rename to src/test/ui/imports/reexport-star.rs
diff --git a/src/test/ui/newlambdas-ret-infer.rs b/src/test/ui/inference/newlambdas-ret-infer.rs
similarity index 100%
rename from src/test/ui/newlambdas-ret-infer.rs
rename to src/test/ui/inference/newlambdas-ret-infer.rs
diff --git a/src/test/ui/newlambdas-ret-infer2.rs b/src/test/ui/inference/newlambdas-ret-infer2.rs
similarity index 100%
rename from src/test/ui/newlambdas-ret-infer2.rs
rename to src/test/ui/inference/newlambdas-ret-infer2.rs
diff --git a/src/test/ui/range-type-infer.rs b/src/test/ui/inference/range-type-infer.rs
similarity index 100%
rename from src/test/ui/range-type-infer.rs
rename to src/test/ui/inference/range-type-infer.rs
diff --git a/src/test/ui/tutorial-suffix-inference-test.rs b/src/test/ui/inference/tutorial-suffix-inference-test.rs
similarity index 100%
rename from src/test/ui/tutorial-suffix-inference-test.rs
rename to src/test/ui/inference/tutorial-suffix-inference-test.rs
diff --git a/src/test/ui/tutorial-suffix-inference-test.stderr b/src/test/ui/inference/tutorial-suffix-inference-test.stderr
similarity index 100%
rename from src/test/ui/tutorial-suffix-inference-test.stderr
rename to src/test/ui/inference/tutorial-suffix-inference-test.stderr
diff --git a/src/test/ui/type-infer-generalize-ty-var.rs b/src/test/ui/inference/type-infer-generalize-ty-var.rs
similarity index 100%
rename from src/test/ui/type-infer-generalize-ty-var.rs
rename to src/test/ui/inference/type-infer-generalize-ty-var.rs
diff --git a/src/test/ui/leak-unique-as-tydesc.rs b/src/test/ui/leak-unique-as-tydesc.rs
deleted file mode 100644
index 322f726156d0c..0000000000000
--- a/src/test/ui/leak-unique-as-tydesc.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-fn leaky<T>(_t: T) { }
-
-pub fn main() {
-    let x = Box::new(10);
-    leaky::<Box<isize>>(x);
-}
diff --git a/src/test/ui/auxiliary/link-cfg-works-transitive-dylib.rs b/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
similarity index 100%
rename from src/test/ui/auxiliary/link-cfg-works-transitive-dylib.rs
rename to src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
diff --git a/src/test/ui/auxiliary/link-cfg-works-transitive-rlib.rs b/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
similarity index 100%
rename from src/test/ui/auxiliary/link-cfg-works-transitive-rlib.rs
rename to src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
diff --git a/src/test/ui/link-cfg-works.rs b/src/test/ui/linkage-attr/link-cfg-works.rs
similarity index 100%
rename from src/test/ui/link-cfg-works.rs
rename to src/test/ui/linkage-attr/link-cfg-works.rs
diff --git a/src/test/ui/lint-cap.rs b/src/test/ui/lint/lint-cap.rs
similarity index 100%
rename from src/test/ui/lint-cap.rs
rename to src/test/ui/lint/lint-cap.rs
diff --git a/src/test/ui/liveness-assign-imm-local-after-ret.rs b/src/test/ui/liveness/liveness-assign-imm-local-after-ret.rs
similarity index 100%
rename from src/test/ui/liveness-assign-imm-local-after-ret.rs
rename to src/test/ui/liveness/liveness-assign-imm-local-after-ret.rs
diff --git a/src/test/ui/match-on-negative-integer-ranges.rs b/src/test/ui/match/match-on-negative-integer-ranges.rs
similarity index 100%
rename from src/test/ui/match-on-negative-integer-ranges.rs
rename to src/test/ui/match/match-on-negative-integer-ranges.rs
diff --git a/src/test/ui/issue-73914.rs b/src/test/ui/mir/issue-73914.rs
similarity index 100%
rename from src/test/ui/issue-73914.rs
rename to src/test/ui/mir/issue-73914.rs
diff --git a/src/test/ui/assignment-operator-unimplemented.rs b/src/test/ui/mismatched_types/assignment-operator-unimplemented.rs
similarity index 100%
rename from src/test/ui/assignment-operator-unimplemented.rs
rename to src/test/ui/mismatched_types/assignment-operator-unimplemented.rs
diff --git a/src/test/ui/assignment-operator-unimplemented.stderr b/src/test/ui/mismatched_types/assignment-operator-unimplemented.stderr
similarity index 100%
rename from src/test/ui/assignment-operator-unimplemented.stderr
rename to src/test/ui/mismatched_types/assignment-operator-unimplemented.stderr
diff --git a/src/test/ui/float-literal-inference-restrictions.rs b/src/test/ui/mismatched_types/float-literal-inference-restrictions.rs
similarity index 100%
rename from src/test/ui/float-literal-inference-restrictions.rs
rename to src/test/ui/mismatched_types/float-literal-inference-restrictions.rs
diff --git a/src/test/ui/float-literal-inference-restrictions.stderr b/src/test/ui/mismatched_types/float-literal-inference-restrictions.stderr
similarity index 100%
rename from src/test/ui/float-literal-inference-restrictions.stderr
rename to src/test/ui/mismatched_types/float-literal-inference-restrictions.stderr
diff --git a/src/test/ui/newtype-temporary.rs b/src/test/ui/newtype-temporary.rs
deleted file mode 100644
index 8ee75b2fef11b..0000000000000
--- a/src/test/ui/newtype-temporary.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// run-pass
-
-#[derive(PartialEq, Debug)]
-struct Foo(usize);
-
-fn foo() -> Foo {
-    Foo(42)
-}
-
-pub fn main() {
-    assert_eq!(foo(), Foo(42));
-}
diff --git a/src/test/ui/lub-if.nll.stderr b/src/test/ui/nll/lub-if.nll.stderr
similarity index 100%
rename from src/test/ui/lub-if.nll.stderr
rename to src/test/ui/nll/lub-if.nll.stderr
diff --git a/src/test/ui/lub-if.rs b/src/test/ui/nll/lub-if.rs
similarity index 100%
rename from src/test/ui/lub-if.rs
rename to src/test/ui/nll/lub-if.rs
diff --git a/src/test/ui/lub-if.stderr b/src/test/ui/nll/lub-if.stderr
similarity index 100%
rename from src/test/ui/lub-if.stderr
rename to src/test/ui/nll/lub-if.stderr
diff --git a/src/test/ui/non-legacy-modes.rs b/src/test/ui/non-legacy-modes.rs
deleted file mode 100644
index 38c83e00a6ade..0000000000000
--- a/src/test/ui/non-legacy-modes.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// run-pass
-
-struct X {
-    repr: isize
-}
-
-fn apply<T, F>(x: T, f: F) where F: FnOnce(T) {
-    f(x);
-}
-
-fn check_int(x: isize) {
-    assert_eq!(x, 22);
-}
-
-fn check_struct(x: X) {
-    check_int(x.repr);
-}
-
-pub fn main() {
-    apply(22, check_int);
-    apply(X {repr: 22}, check_struct);
-}
diff --git a/src/test/ui/overloaded-calls-nontuple.rs b/src/test/ui/overloaded/overloaded-calls-nontuple.rs
similarity index 100%
rename from src/test/ui/overloaded-calls-nontuple.rs
rename to src/test/ui/overloaded/overloaded-calls-nontuple.rs
diff --git a/src/test/ui/overloaded-calls-nontuple.stderr b/src/test/ui/overloaded/overloaded-calls-nontuple.stderr
similarity index 100%
rename from src/test/ui/overloaded-calls-nontuple.stderr
rename to src/test/ui/overloaded/overloaded-calls-nontuple.stderr
diff --git a/src/test/ui/attribute-with-no-generics-in-parameter-list.rs b/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.rs
similarity index 100%
rename from src/test/ui/attribute-with-no-generics-in-parameter-list.rs
rename to src/test/ui/parser/attribute-with-no-generics-in-parameter-list.rs
diff --git a/src/test/ui/attribute-with-no-generics-in-parameter-list.stderr b/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
similarity index 100%
rename from src/test/ui/attribute-with-no-generics-in-parameter-list.stderr
rename to src/test/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
diff --git a/src/test/ui/dyn-trait-compatibility.rs b/src/test/ui/parser/dyn-trait-compatibility.rs
similarity index 100%
rename from src/test/ui/dyn-trait-compatibility.rs
rename to src/test/ui/parser/dyn-trait-compatibility.rs
diff --git a/src/test/ui/dyn-trait-compatibility.stderr b/src/test/ui/parser/dyn-trait-compatibility.stderr
similarity index 100%
rename from src/test/ui/dyn-trait-compatibility.stderr
rename to src/test/ui/parser/dyn-trait-compatibility.stderr
diff --git a/src/test/ui/operator-associativity.rs b/src/test/ui/parser/operator-associativity.rs
similarity index 100%
rename from src/test/ui/operator-associativity.rs
rename to src/test/ui/parser/operator-associativity.rs
diff --git a/src/test/ui/ignore-all-the-things.rs b/src/test/ui/pattern/ignore-all-the-things.rs
similarity index 100%
rename from src/test/ui/ignore-all-the-things.rs
rename to src/test/ui/pattern/ignore-all-the-things.rs
diff --git a/src/test/ui/auxiliary/impl_privacy_xc_2.rs b/src/test/ui/privacy/auxiliary/impl_privacy_xc_2.rs
similarity index 100%
rename from src/test/ui/auxiliary/impl_privacy_xc_2.rs
rename to src/test/ui/privacy/auxiliary/impl_privacy_xc_2.rs
diff --git a/src/test/ui/auxiliary/reachable-unnameable-items.rs b/src/test/ui/privacy/auxiliary/reachable-unnameable-items.rs
similarity index 100%
rename from src/test/ui/auxiliary/reachable-unnameable-items.rs
rename to src/test/ui/privacy/auxiliary/reachable-unnameable-items.rs
diff --git a/src/test/ui/export-tag-variant.rs b/src/test/ui/privacy/export-tag-variant.rs
similarity index 100%
rename from src/test/ui/export-tag-variant.rs
rename to src/test/ui/privacy/export-tag-variant.rs
diff --git a/src/test/ui/export-tag-variant.stderr b/src/test/ui/privacy/export-tag-variant.stderr
similarity index 100%
rename from src/test/ui/export-tag-variant.stderr
rename to src/test/ui/privacy/export-tag-variant.stderr
diff --git a/src/test/ui/impl-privacy-xc-2.rs b/src/test/ui/privacy/impl-privacy-xc-2.rs
similarity index 100%
rename from src/test/ui/impl-privacy-xc-2.rs
rename to src/test/ui/privacy/impl-privacy-xc-2.rs
diff --git a/src/test/ui/reachable-unnameable-items.rs b/src/test/ui/privacy/reachable-unnameable-items.rs
similarity index 100%
rename from src/test/ui/reachable-unnameable-items.rs
rename to src/test/ui/privacy/reachable-unnameable-items.rs
diff --git a/src/test/ui/core-run-destroy.rs b/src/test/ui/process/core-run-destroy.rs
similarity index 100%
rename from src/test/ui/core-run-destroy.rs
rename to src/test/ui/process/core-run-destroy.rs
diff --git a/src/test/ui/multi-panic.rs b/src/test/ui/process/multi-panic.rs
similarity index 100%
rename from src/test/ui/multi-panic.rs
rename to src/test/ui/process/multi-panic.rs
diff --git a/src/test/ui/no-stdio.rs b/src/test/ui/process/no-stdio.rs
similarity index 100%
rename from src/test/ui/no-stdio.rs
rename to src/test/ui/process/no-stdio.rs
diff --git a/src/test/ui/try-wait.rs b/src/test/ui/process/try-wait.rs
similarity index 100%
rename from src/test/ui/try-wait.rs
rename to src/test/ui/process/try-wait.rs
diff --git a/src/test/ui/pure-sum.rs b/src/test/ui/pure-sum.rs
deleted file mode 100644
index 2f2ece75ebeeb..0000000000000
--- a/src/test/ui/pure-sum.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-// run-pass
-
-#![allow(dead_code)]
-// Check that functions can modify local state.
-
-// pretty-expanded FIXME #23616
-
-fn sums_to(v: Vec<isize> , sum: isize) -> bool {
-    let mut i = 0;
-    let mut sum0 = 0;
-    while i < v.len() {
-        sum0 += v[i];
-        i += 1;
-    }
-    return sum0 == sum;
-}
-
-fn sums_to_using_uniq(v: Vec<isize> , sum: isize) -> bool {
-    let mut i = 0;
-    let mut sum0: Box<_> = 0.into();
-    while i < v.len() {
-        *sum0 += v[i];
-        i += 1;
-    }
-    return *sum0 == sum;
-}
-
-fn sums_to_using_rec(v: Vec<isize> , sum: isize) -> bool {
-    let mut i = 0;
-    let mut sum0 = F {f: 0};
-    while i < v.len() {
-        sum0.f += v[i];
-        i += 1;
-    }
-    return sum0.f == sum;
-}
-
-struct F<T> { f: T }
-
-fn sums_to_using_uniq_rec(v: Vec<isize> , sum: isize) -> bool {
-    let mut i = 0;
-    let mut sum0 = F::<Box<_>> {f: 0.into() };
-    while i < v.len() {
-        *sum0.f += v[i];
-        i += 1;
-    }
-    return *sum0.f == sum;
-}
-
-pub fn main() {
-}
diff --git a/src/test/ui/wf-bound-region-in-object-type.rs b/src/test/ui/regions/wf-bound-region-in-object-type.rs
similarity index 100%
rename from src/test/ui/wf-bound-region-in-object-type.rs
rename to src/test/ui/regions/wf-bound-region-in-object-type.rs
diff --git a/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo.rs b/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
similarity index 100%
rename from src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo.rs
rename to src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
diff --git a/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo2.rs b/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
similarity index 100%
rename from src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
rename to src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/src/test/ui/blind-item-mixed-crate-use-item.rs b/src/test/ui/resolve/blind-item-mixed-crate-use-item.rs
similarity index 100%
rename from src/test/ui/blind-item-mixed-crate-use-item.rs
rename to src/test/ui/resolve/blind-item-mixed-crate-use-item.rs
diff --git a/src/test/ui/blind-item-mixed-use-item.rs b/src/test/ui/resolve/blind-item-mixed-use-item.rs
similarity index 100%
rename from src/test/ui/blind-item-mixed-use-item.rs
rename to src/test/ui/resolve/blind-item-mixed-use-item.rs
diff --git a/src/test/ui/export-fully-qualified.rs b/src/test/ui/resolve/export-fully-qualified.rs
similarity index 100%
rename from src/test/ui/export-fully-qualified.rs
rename to src/test/ui/resolve/export-fully-qualified.rs
diff --git a/src/test/ui/export-fully-qualified.stderr b/src/test/ui/resolve/export-fully-qualified.stderr
similarity index 100%
rename from src/test/ui/export-fully-qualified.stderr
rename to src/test/ui/resolve/export-fully-qualified.stderr
diff --git a/src/test/ui/no-std-1.rs b/src/test/ui/resolve/no-std-1.rs
similarity index 100%
rename from src/test/ui/no-std-1.rs
rename to src/test/ui/resolve/no-std-1.rs
diff --git a/src/test/ui/no-std-2.rs b/src/test/ui/resolve/no-std-2.rs
similarity index 100%
rename from src/test/ui/no-std-2.rs
rename to src/test/ui/resolve/no-std-2.rs
diff --git a/src/test/ui/no-std-3.rs b/src/test/ui/resolve/no-std-3.rs
similarity index 100%
rename from src/test/ui/no-std-3.rs
rename to src/test/ui/resolve/no-std-3.rs
diff --git a/src/test/ui/pathless-extern-ok.rs b/src/test/ui/resolve/pathless-extern-ok.rs
similarity index 100%
rename from src/test/ui/pathless-extern-ok.rs
rename to src/test/ui/resolve/pathless-extern-ok.rs
diff --git a/src/test/ui/atomic-print.rs b/src/test/ui/runtime/atomic-print.rs
similarity index 100%
rename from src/test/ui/atomic-print.rs
rename to src/test/ui/runtime/atomic-print.rs
diff --git a/src/test/ui/backtrace-debuginfo-aux.rs b/src/test/ui/runtime/backtrace-debuginfo-aux.rs
similarity index 100%
rename from src/test/ui/backtrace-debuginfo-aux.rs
rename to src/test/ui/runtime/backtrace-debuginfo-aux.rs
diff --git a/src/test/ui/backtrace-debuginfo.rs b/src/test/ui/runtime/backtrace-debuginfo.rs
similarity index 100%
rename from src/test/ui/backtrace-debuginfo.rs
rename to src/test/ui/runtime/backtrace-debuginfo.rs
diff --git a/src/test/ui/native-print-no-runtime.rs b/src/test/ui/runtime/native-print-no-runtime.rs
similarity index 100%
rename from src/test/ui/native-print-no-runtime.rs
rename to src/test/ui/runtime/native-print-no-runtime.rs
diff --git a/src/test/ui/stability-in-private-module.rs b/src/test/ui/stability-attribute/stability-in-private-module.rs
similarity index 100%
rename from src/test/ui/stability-in-private-module.rs
rename to src/test/ui/stability-attribute/stability-in-private-module.rs
diff --git a/src/test/ui/stability-in-private-module.stderr b/src/test/ui/stability-attribute/stability-in-private-module.stderr
similarity index 100%
rename from src/test/ui/stability-in-private-module.stderr
rename to src/test/ui/stability-attribute/stability-in-private-module.stderr
diff --git a/src/test/ui/auxiliary/extern-statics.rs b/src/test/ui/static/auxiliary/extern-statics.rs
similarity index 100%
rename from src/test/ui/auxiliary/extern-statics.rs
rename to src/test/ui/static/auxiliary/extern-statics.rs
diff --git a/src/test/ui/safe-extern-statics-mut.mir.stderr b/src/test/ui/static/safe-extern-statics-mut.mir.stderr
similarity index 100%
rename from src/test/ui/safe-extern-statics-mut.mir.stderr
rename to src/test/ui/static/safe-extern-statics-mut.mir.stderr
diff --git a/src/test/ui/safe-extern-statics-mut.rs b/src/test/ui/static/safe-extern-statics-mut.rs
similarity index 100%
rename from src/test/ui/safe-extern-statics-mut.rs
rename to src/test/ui/static/safe-extern-statics-mut.rs
diff --git a/src/test/ui/safe-extern-statics-mut.thir.stderr b/src/test/ui/static/safe-extern-statics-mut.thir.stderr
similarity index 100%
rename from src/test/ui/safe-extern-statics-mut.thir.stderr
rename to src/test/ui/static/safe-extern-statics-mut.thir.stderr
diff --git a/src/test/ui/safe-extern-statics.mir.stderr b/src/test/ui/static/safe-extern-statics.mir.stderr
similarity index 100%
rename from src/test/ui/safe-extern-statics.mir.stderr
rename to src/test/ui/static/safe-extern-statics.mir.stderr
diff --git a/src/test/ui/safe-extern-statics.rs b/src/test/ui/static/safe-extern-statics.rs
similarity index 100%
rename from src/test/ui/safe-extern-statics.rs
rename to src/test/ui/static/safe-extern-statics.rs
diff --git a/src/test/ui/safe-extern-statics.thir.stderr b/src/test/ui/static/safe-extern-statics.thir.stderr
similarity index 100%
rename from src/test/ui/safe-extern-statics.thir.stderr
rename to src/test/ui/static/safe-extern-statics.thir.stderr
diff --git a/src/test/ui/thread-local-in-ctfe.rs b/src/test/ui/static/thread-local-in-ctfe.rs
similarity index 100%
rename from src/test/ui/thread-local-in-ctfe.rs
rename to src/test/ui/static/thread-local-in-ctfe.rs
diff --git a/src/test/ui/thread-local-in-ctfe.stderr b/src/test/ui/static/thread-local-in-ctfe.stderr
similarity index 100%
rename from src/test/ui/thread-local-in-ctfe.stderr
rename to src/test/ui/static/thread-local-in-ctfe.stderr
diff --git a/src/test/ui/matches2021.rs b/src/test/ui/stdlib-unit-tests/matches2021.rs
similarity index 100%
rename from src/test/ui/matches2021.rs
rename to src/test/ui/stdlib-unit-tests/matches2021.rs
diff --git a/src/test/ui/minmax-stability-issue-23687.rs b/src/test/ui/stdlib-unit-tests/minmax-stability-issue-23687.rs
similarity index 100%
rename from src/test/ui/minmax-stability-issue-23687.rs
rename to src/test/ui/stdlib-unit-tests/minmax-stability-issue-23687.rs
diff --git a/src/test/ui/not-sync.rs b/src/test/ui/stdlib-unit-tests/not-sync.rs
similarity index 100%
rename from src/test/ui/not-sync.rs
rename to src/test/ui/stdlib-unit-tests/not-sync.rs
diff --git a/src/test/ui/not-sync.stderr b/src/test/ui/stdlib-unit-tests/not-sync.stderr
similarity index 100%
rename from src/test/ui/not-sync.stderr
rename to src/test/ui/stdlib-unit-tests/not-sync.stderr
diff --git a/src/test/ui/raw-fat-ptr.rs b/src/test/ui/stdlib-unit-tests/raw-fat-ptr.rs
similarity index 100%
rename from src/test/ui/raw-fat-ptr.rs
rename to src/test/ui/stdlib-unit-tests/raw-fat-ptr.rs
diff --git a/src/test/ui/volatile-fat-ptr.rs b/src/test/ui/stdlib-unit-tests/volatile-fat-ptr.rs
similarity index 100%
rename from src/test/ui/volatile-fat-ptr.rs
rename to src/test/ui/stdlib-unit-tests/volatile-fat-ptr.rs
diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.rs b/src/test/ui/syntax-trait-polarity-feature-gate.rs
deleted file mode 100644
index 4a3b24383abc4..0000000000000
--- a/src/test/ui/syntax-trait-polarity-feature-gate.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use std::marker::Send;
-
-struct TestType;
-
-trait TestTrait {}
-
-impl !Send for TestType {}
-//~^ ERROR negative trait bounds
-
-fn main() {}
diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.stderr b/src/test/ui/syntax-trait-polarity-feature-gate.stderr
deleted file mode 100644
index 3562deecbd522..0000000000000
--- a/src/test/ui/syntax-trait-polarity-feature-gate.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0658]: negative trait bounds are not yet fully implemented; use marker types for now
-  --> $DIR/syntax-trait-polarity-feature-gate.rs:7:6
-   |
-LL | impl !Send for TestType {}
-   |      ^^^^^
-   |
-   = note: see issue #68318 <https://github.com/rust-lang/rust/issues/68318> for more information
-   = help: add `#![feature(negative_impls)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/tail-direct.rs b/src/test/ui/tail-direct.rs
deleted file mode 100644
index c67c5b7a555c1..0000000000000
--- a/src/test/ui/tail-direct.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// run-pass
-
-pub fn main() { assert!((even(42))); assert!((odd(45))); }
-
-fn even(n: isize) -> bool { if n == 0 { return true; } else { return odd(n - 1); } }
-
-fn odd(n: isize) -> bool { if n == 0 { return false; } else { return even(n - 1); } }
diff --git a/src/test/ui/clone-with-exterior.rs b/src/test/ui/threads-sendsync/clone-with-exterior.rs
similarity index 100%
rename from src/test/ui/clone-with-exterior.rs
rename to src/test/ui/threads-sendsync/clone-with-exterior.rs
diff --git a/src/test/ui/tcp-stress.rs b/src/test/ui/threads-sendsync/tcp-stress.rs
similarity index 100%
rename from src/test/ui/tcp-stress.rs
rename to src/test/ui/threads-sendsync/tcp-stress.rs
diff --git a/src/test/ui/alignment-gep-tup-like-1.rs b/src/test/ui/traits/alignment-gep-tup-like-1.rs
similarity index 100%
rename from src/test/ui/alignment-gep-tup-like-1.rs
rename to src/test/ui/traits/alignment-gep-tup-like-1.rs
diff --git a/src/test/ui/cycle-generic-bound.rs b/src/test/ui/traits/cycle-generic-bound.rs
similarity index 100%
rename from src/test/ui/cycle-generic-bound.rs
rename to src/test/ui/traits/cycle-generic-bound.rs
diff --git a/src/test/ui/early-vtbl-resolution.rs b/src/test/ui/traits/early-vtbl-resolution.rs
similarity index 100%
rename from src/test/ui/early-vtbl-resolution.rs
rename to src/test/ui/traits/early-vtbl-resolution.rs
diff --git a/src/test/ui/map-types.rs b/src/test/ui/traits/map-types.rs
similarity index 100%
rename from src/test/ui/map-types.rs
rename to src/test/ui/traits/map-types.rs
diff --git a/src/test/ui/map-types.stderr b/src/test/ui/traits/map-types.stderr
similarity index 100%
rename from src/test/ui/map-types.stderr
rename to src/test/ui/traits/map-types.stderr
diff --git a/src/test/ui/no_send-struct.rs b/src/test/ui/traits/no_send-struct.rs
similarity index 100%
rename from src/test/ui/no_send-struct.rs
rename to src/test/ui/traits/no_send-struct.rs
diff --git a/src/test/ui/no_send-struct.stderr b/src/test/ui/traits/no_send-struct.stderr
similarity index 100%
rename from src/test/ui/no_send-struct.stderr
rename to src/test/ui/traits/no_send-struct.stderr
diff --git a/src/test/ui/try-is-identifier-edition2015.rs b/src/test/ui/try-block/try-is-identifier-edition2015.rs
similarity index 100%
rename from src/test/ui/try-is-identifier-edition2015.rs
rename to src/test/ui/try-block/try-is-identifier-edition2015.rs
diff --git a/src/test/ui/type-ascription.rs b/src/test/ui/type/type-ascription.rs
similarity index 100%
rename from src/test/ui/type-ascription.rs
rename to src/test/ui/type/type-ascription.rs
diff --git a/src/test/ui/no-type-for-node-ice.rs b/src/test/ui/typeck/no-type-for-node-ice.rs
similarity index 100%
rename from src/test/ui/no-type-for-node-ice.rs
rename to src/test/ui/typeck/no-type-for-node-ice.rs
diff --git a/src/test/ui/no-type-for-node-ice.stderr b/src/test/ui/typeck/no-type-for-node-ice.stderr
similarity index 100%
rename from src/test/ui/no-type-for-node-ice.stderr
rename to src/test/ui/typeck/no-type-for-node-ice.stderr
diff --git a/src/test/ui/project-cache-issue-37154.rs b/src/test/ui/typeck/project-cache-issue-37154.rs
similarity index 100%
rename from src/test/ui/project-cache-issue-37154.rs
rename to src/test/ui/typeck/project-cache-issue-37154.rs
diff --git a/src/test/ui/ufcs-type-params.rs b/src/test/ui/typeck/ufcs-type-params.rs
similarity index 100%
rename from src/test/ui/ufcs-type-params.rs
rename to src/test/ui/typeck/ufcs-type-params.rs
diff --git a/src/test/ui/unify-return-ty.rs b/src/test/ui/typeck/unify-return-ty.rs
similarity index 100%
rename from src/test/ui/unify-return-ty.rs
rename to src/test/ui/typeck/unify-return-ty.rs
diff --git a/src/test/ui/maybe-bounds-where.rs b/src/test/ui/unsized/maybe-bounds-where.rs
similarity index 100%
rename from src/test/ui/maybe-bounds-where.rs
rename to src/test/ui/unsized/maybe-bounds-where.rs
diff --git a/src/test/ui/maybe-bounds-where.stderr b/src/test/ui/unsized/maybe-bounds-where.stderr
similarity index 100%
rename from src/test/ui/maybe-bounds-where.stderr
rename to src/test/ui/unsized/maybe-bounds-where.stderr
diff --git a/src/test/ui/wasm-import-module.rs b/src/test/ui/wasm/wasm-import-module.rs
similarity index 100%
rename from src/test/ui/wasm-import-module.rs
rename to src/test/ui/wasm/wasm-import-module.rs
diff --git a/src/test/ui/wasm-import-module.stderr b/src/test/ui/wasm/wasm-import-module.stderr
similarity index 100%
rename from src/test/ui/wasm-import-module.stderr
rename to src/test/ui/wasm/wasm-import-module.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 681b2486d07cc..248d4f1583f8a 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,9 +7,9 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1102;
+const ROOT_ENTRY_LIMIT: usize = 983;
 const ISSUES_ENTRY_LIMIT: usize = 2310;
-const PARSER_LIMIT: usize = 1005;
+const PARSER_LIMIT: usize = 1010;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))