diff --git a/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs b/src/test/ui/run-pass/borrowck/borrowck-assign-to-subfield.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs
rename to src/test/ui/run-pass/borrowck/borrowck-assign-to-subfield.rs
diff --git a/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs b/src/test/ui/run-pass/borrowck/borrowck-assignment-to-static-mut.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs
rename to src/test/ui/run-pass/borrowck/borrowck-assignment-to-static-mut.rs
diff --git a/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs b/src/test/ui/run-pass/borrowck/borrowck-binding-mutbl.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-binding-mutbl.rs
rename to src/test/ui/run-pass/borrowck/borrowck-binding-mutbl.rs
diff --git a/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs b/src/test/ui/run-pass/borrowck/borrowck-borrow-from-expr-block.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs
rename to src/test/ui/run-pass/borrowck/borrowck-borrow-from-expr-block.rs
diff --git a/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs b/src/test/ui/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
rename to src/test/ui/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
diff --git a/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs b/src/test/ui/run-pass/borrowck/borrowck-closures-two-imm.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-closures-two-imm.rs
rename to src/test/ui/run-pass/borrowck/borrowck-closures-two-imm.rs
diff --git a/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs b/src/test/ui/run-pass/borrowck/borrowck-field-sensitivity.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-field-sensitivity.rs
rename to src/test/ui/run-pass/borrowck/borrowck-field-sensitivity.rs
diff --git a/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs b/src/test/ui/run-pass/borrowck/borrowck-fixed-length-vecs.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs
rename to src/test/ui/run-pass/borrowck/borrowck-fixed-length-vecs.rs
diff --git a/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs b/src/test/ui/run-pass/borrowck/borrowck-freeze-frozen-mut.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs
rename to src/test/ui/run-pass/borrowck/borrowck-freeze-frozen-mut.rs
diff --git a/src/test/run-pass/borrowck/borrowck-lend-args.rs b/src/test/ui/run-pass/borrowck/borrowck-lend-args.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-lend-args.rs
rename to src/test/ui/run-pass/borrowck/borrowck-lend-args.rs
diff --git a/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs b/src/test/ui/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs
rename to src/test/ui/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs
diff --git a/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs b/src/test/ui/run-pass/borrowck/borrowck-move-by-capture-ok.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs
rename to src/test/ui/run-pass/borrowck/borrowck-move-by-capture-ok.rs
diff --git a/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs b/src/test/ui/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs
rename to src/test/ui/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs
diff --git a/src/test/run-pass/borrowck/borrowck-mut-uniq.rs b/src/test/ui/run-pass/borrowck/borrowck-mut-uniq.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-mut-uniq.rs
rename to src/test/ui/run-pass/borrowck/borrowck-mut-uniq.rs
diff --git a/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs b/src/test/ui/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs
rename to src/test/ui/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs
diff --git a/src/test/run-pass/borrowck/borrowck-pat-enum.rs b/src/test/ui/run-pass/borrowck/borrowck-pat-enum.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-pat-enum.rs
rename to src/test/ui/run-pass/borrowck/borrowck-pat-enum.rs
diff --git a/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs b/src/test/ui/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs
rename to src/test/ui/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs
diff --git a/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs b/src/test/ui/run-pass/borrowck/borrowck-rvalues-mutable.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs
rename to src/test/ui/run-pass/borrowck/borrowck-rvalues-mutable.rs
diff --git a/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs b/src/test/ui/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs
rename to src/test/ui/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs
diff --git a/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs b/src/test/ui/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs
rename to src/test/ui/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs
diff --git a/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs b/src/test/ui/run-pass/borrowck/borrowck-static-item-in-fn.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs
rename to src/test/ui/run-pass/borrowck/borrowck-static-item-in-fn.rs
diff --git a/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs b/src/test/ui/run-pass/borrowck/borrowck-trait-lifetime.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-trait-lifetime.rs
rename to src/test/ui/run-pass/borrowck/borrowck-trait-lifetime.rs
diff --git a/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs b/src/test/ui/run-pass/borrowck/borrowck-uniq-via-ref.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs
rename to src/test/ui/run-pass/borrowck/borrowck-uniq-via-ref.rs
diff --git a/src/test/run-pass/borrowck/borrowck-univariant-enum.rs b/src/test/ui/run-pass/borrowck/borrowck-univariant-enum.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-univariant-enum.rs
rename to src/test/ui/run-pass/borrowck/borrowck-univariant-enum.rs
diff --git a/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs b/src/test/ui/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs
rename to src/test/ui/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs
diff --git a/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs b/src/test/ui/run-pass/borrowck/borrowck-unused-mut-locals.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs
rename to src/test/ui/run-pass/borrowck/borrowck-unused-mut-locals.rs
diff --git a/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs b/src/test/ui/run-pass/borrowck/borrowck-use-mut-borrow.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs
rename to src/test/ui/run-pass/borrowck/borrowck-use-mut-borrow.rs
diff --git a/src/test/run-pass/borrowck/two-phase-baseline.rs b/src/test/ui/run-pass/borrowck/two-phase-baseline.rs
similarity index 100%
rename from src/test/run-pass/borrowck/two-phase-baseline.rs
rename to src/test/ui/run-pass/borrowck/two-phase-baseline.rs
diff --git a/src/test/run-pass/borrowck/two-phase-bin-ops.rs b/src/test/ui/run-pass/borrowck/two-phase-bin-ops.rs
similarity index 100%
rename from src/test/run-pass/borrowck/two-phase-bin-ops.rs
rename to src/test/ui/run-pass/borrowck/two-phase-bin-ops.rs
diff --git a/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs b/src/test/ui/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs
similarity index 100%
rename from src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs
rename to src/test/ui/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs