diff --git a/src/test/run-pass/auxiliary/weak-lang-items.rs b/src/test/run-pass/auxiliary/weak-lang-items.rs
deleted file mode 100644
index 7a698cf76ae..00000000000
--- a/src/test/run-pass/auxiliary/weak-lang-items.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// no-prefer-dynamic
-
-// This aux-file will require the eh_personality function to be codegen'd, but
-// it hasn't been defined just yet. Make sure we don't explode.
-
-#![no_std]
-#![crate_type = "rlib"]
-
-struct A;
-
-impl core::ops::Drop for A {
-    fn drop(&mut self) {}
-}
-
-pub fn foo() {
-    let _a = A;
-    panic!("wut");
-}
-
-mod std {
-    pub use core::{option, fmt};
-}
diff --git a/src/test/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs b/src/test/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs
deleted file mode 100644
index b5b4802c112..00000000000
--- a/src/test/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![crate_type = "rlib"]
-#![feature(fundamental)]
-
-pub trait MyCopy { }
-impl MyCopy for i32 { }
-
-pub struct MyStruct<T>(T);
-
-#[fundamental]
-pub struct MyFundamentalStruct<T>(T);
diff --git a/src/test/run-pass/coherence/auxiliary/coherence_lib.rs b/src/test/run-pass/coherence/auxiliary/coherence_lib.rs
deleted file mode 100644
index 9a5ec824306..00000000000
--- a/src/test/run-pass/coherence/auxiliary/coherence_lib.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![crate_type="lib"]
-
-pub trait Remote {
-    fn foo(&self) { }
-}
-
-pub trait Remote1<T> {
-    fn foo(&self, t: T) { }
-}
-
-pub trait Remote2<T, U> {
-    fn foo(&self, t: T, u: U) { }
-}
-
-pub struct Pair<T,U>(T,U);
diff --git a/src/test/run-pass/consts/auxiliary/const_fn_lib.rs b/src/test/run-pass/consts/auxiliary/const_fn_lib.rs
deleted file mode 100644
index 95440607ae3..00000000000
--- a/src/test/run-pass/consts/auxiliary/const_fn_lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// Crate that exports a const fn. Used for testing cross-crate.
-
-#![crate_type="rlib"]
-
-pub const fn foo() -> usize { 22 }
diff --git a/src/test/run-pass/macros/auxiliary/macro_crate_nonterminal.rs b/src/test/run-pass/macros/auxiliary/macro_crate_nonterminal.rs
deleted file mode 100644
index 2e2440462ae..00000000000
--- a/src/test/run-pass/macros/auxiliary/macro_crate_nonterminal.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-pub fn increment(x: usize) -> usize {
-    x + 1
-}
-
-#[macro_export]
-macro_rules! increment {
-    ($x:expr) => ($crate::increment($x))
-}
-
-pub fn check_local() {
-    assert_eq!(increment!(3), 4);
-}
diff --git a/src/test/run-pass/macros/auxiliary/unstable-macros.rs b/src/test/run-pass/macros/auxiliary/unstable-macros.rs
deleted file mode 100644
index b8d580702c9..00000000000
--- a/src/test/run-pass/macros/auxiliary/unstable-macros.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![feature(staged_api)]
-#![stable(feature = "unit_test", since = "1.0.0")]
-
-#[unstable(feature = "unstable_macros", issue = "0")]
-#[macro_export]
-macro_rules! unstable_macro{ () => () }
diff --git a/src/test/run-pass/traits/auxiliary/trait_safety_lib.rs b/src/test/run-pass/traits/auxiliary/trait_safety_lib.rs
deleted file mode 100644
index 6fc432ed455..00000000000
--- a/src/test/run-pass/traits/auxiliary/trait_safety_lib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Simple smoke test that unsafe traits can be compiled etc.
-
-pub unsafe trait Foo {
-    fn foo(&self) -> isize;
-}
-
-unsafe impl Foo for isize {
-    fn foo(&self) -> isize { *self }
-}
diff --git a/src/test/run-pass/augmented-assignments.rs b/src/test/ui/augmented-assignments-rpass.rs
similarity index 100%
rename from src/test/run-pass/augmented-assignments.rs
rename to src/test/ui/augmented-assignments-rpass.rs
diff --git a/src/test/run-pass/auxiliary/rmeta-rlib.rs b/src/test/ui/auxiliary/rmeta-rlib-rpass.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/rmeta-rlib.rs
rename to src/test/ui/auxiliary/rmeta-rlib-rpass.rs
diff --git a/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs b/src/test/ui/borrowck/borrowck-field-sensitivity-rpass.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-field-sensitivity.rs
rename to src/test/ui/borrowck/borrowck-field-sensitivity-rpass.rs
diff --git a/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-rpass.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs
rename to src/test/ui/borrowck/borrowck-slice-pattern-element-loan-rpass.rs
diff --git a/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs b/src/test/ui/borrowck/borrowck-use-mut-borrow-rpass.rs
similarity index 100%
rename from src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs
rename to src/test/ui/borrowck/borrowck-use-mut-borrow-rpass.rs
diff --git a/src/test/run-pass/coherence/coherence-negative-impls-safe.rs b/src/test/ui/coherence/coherence-negative-impls-safe-rpass.rs
similarity index 100%
rename from src/test/run-pass/coherence/coherence-negative-impls-safe.rs
rename to src/test/ui/coherence/coherence-negative-impls-safe-rpass.rs
diff --git a/src/test/run-pass/coherence/re-rebalance-coherence.rs b/src/test/ui/coherence/re-rebalance-coherence-rpass.rs
similarity index 100%
rename from src/test/run-pass/coherence/re-rebalance-coherence.rs
rename to src/test/ui/coherence/re-rebalance-coherence-rpass.rs
diff --git a/src/test/run-pass/concat.rs b/src/test/ui/concat-rpass.rs
similarity index 100%
rename from src/test/run-pass/concat.rs
rename to src/test/ui/concat-rpass.rs
diff --git a/src/test/run-pass/consts/const-block-non-item-statement.rs b/src/test/ui/consts/const-block-non-item-statement-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-block-non-item-statement.rs
rename to src/test/ui/consts/const-block-non-item-statement-rpass.rs
diff --git a/src/test/run-pass/consts/const-err.rs b/src/test/ui/consts/const-err-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-err.rs
rename to src/test/ui/consts/const-err-rpass.rs
diff --git a/src/test/run-pass/consts/const-int-conversion.rs b/src/test/ui/consts/const-int-conversion-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-int-conversion.rs
rename to src/test/ui/consts/const-int-conversion-rpass.rs
diff --git a/src/test/run-pass/consts/const-int-overflowing.rs b/src/test/ui/consts/const-int-overflowing-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-int-overflowing.rs
rename to src/test/ui/consts/const-int-overflowing-rpass.rs
diff --git a/src/test/run-pass/consts/const-int-rotate.rs b/src/test/ui/consts/const-int-rotate-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-int-rotate.rs
rename to src/test/ui/consts/const-int-rotate-rpass.rs
diff --git a/src/test/run-pass/consts/const-int-sign.rs b/src/test/ui/consts/const-int-sign-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-int-sign.rs
rename to src/test/ui/consts/const-int-sign-rpass.rs
diff --git a/src/test/run-pass/consts/const-int-wrapping.rs b/src/test/ui/consts/const-int-wrapping-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-int-wrapping.rs
rename to src/test/ui/consts/const-int-wrapping-rpass.rs
diff --git a/src/test/run-pass/consts/const-ptr-nonnull.rs b/src/test/ui/consts/const-ptr-nonnull-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-ptr-nonnull.rs
rename to src/test/ui/consts/const-ptr-nonnull-rpass.rs
diff --git a/src/test/run-pass/consts/const-ptr-unique.rs b/src/test/ui/consts/const-ptr-unique-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-ptr-unique.rs
rename to src/test/ui/consts/const-ptr-unique-rpass.rs
diff --git a/src/test/run-pass/consts/const-typeid-of.rs b/src/test/ui/consts/const-typeid-of-rpass.rs
similarity index 100%
rename from src/test/run-pass/consts/const-typeid-of.rs
rename to src/test/ui/consts/const-typeid-of-rpass.rs
diff --git a/src/test/run-pass/fat-ptr-cast.rs b/src/test/ui/fat-ptr-cast-rpass.rs
similarity index 100%
rename from src/test/run-pass/fat-ptr-cast.rs
rename to src/test/ui/fat-ptr-cast-rpass.rs
diff --git a/src/test/run-pass/impl-trait/auto-trait-leak.rs b/src/test/ui/impl-trait/auto-trait-leak-rpass.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/auto-trait-leak.rs
rename to src/test/ui/impl-trait/auto-trait-leak-rpass.rs
diff --git a/src/test/run-pass/impl-trait/equality.rs b/src/test/ui/impl-trait/equality-rpass.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/equality.rs
rename to src/test/ui/impl-trait/equality-rpass.rs
diff --git a/src/test/run-pass/imports/import-glob-0.rs b/src/test/ui/imports/import-glob-0-rpass.rs
similarity index 100%
rename from src/test/run-pass/imports/import-glob-0.rs
rename to src/test/ui/imports/import-glob-0-rpass.rs
diff --git a/src/test/run-pass/issues/issue-10764.rs b/src/test/ui/issues/issue-10764-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-10764.rs
rename to src/test/ui/issues/issue-10764-rpass.rs
diff --git a/src/test/run-pass/issues/issue-15129.rs b/src/test/ui/issues/issue-15129-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-15129.rs
rename to src/test/ui/issues/issue-15129-rpass.rs
diff --git a/src/test/run-pass/issues/issue-16922.rs b/src/test/ui/issues/issue-16922-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-16922.rs
rename to src/test/ui/issues/issue-16922-rpass.rs
diff --git a/src/test/run-pass/issues/issue-20313.rs b/src/test/ui/issues/issue-20313-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-20313.rs
rename to src/test/ui/issues/issue-20313-rpass.rs
diff --git a/src/test/run-pass/issues/issue-26905.rs b/src/test/ui/issues/issue-26905-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-26905.rs
rename to src/test/ui/issues/issue-26905-rpass.rs
diff --git a/src/test/run-pass/issues/issue-27060.rs b/src/test/ui/issues/issue-27060-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-27060.rs
rename to src/test/ui/issues/issue-27060-rpass.rs
diff --git a/src/test/run-pass/issues/issue-29147.rs b/src/test/ui/issues/issue-29147-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-29147.rs
rename to src/test/ui/issues/issue-29147-rpass.rs
diff --git a/src/test/run-pass/issues/issue-30240.rs b/src/test/ui/issues/issue-30240-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-30240.rs
rename to src/test/ui/issues/issue-30240-rpass.rs
diff --git a/src/test/run-pass/issues/issue-38715.rs b/src/test/ui/issues/issue-38715-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-38715.rs
rename to src/test/ui/issues/issue-38715-rpass.rs
diff --git a/src/test/run-pass/issues/issue-41394.rs b/src/test/ui/issues/issue-41394-rpass.rs
similarity index 100%
rename from src/test/run-pass/issues/issue-41394.rs
rename to src/test/ui/issues/issue-41394-rpass.rs
diff --git a/src/test/run-pass/macros/macro-at-most-once-rep-2015.rs b/src/test/ui/macros/macro-at-most-once-rep-2015-rpass.rs
similarity index 100%
rename from src/test/run-pass/macros/macro-at-most-once-rep-2015.rs
rename to src/test/ui/macros/macro-at-most-once-rep-2015-rpass.rs
diff --git a/src/test/run-pass/macros/macro-at-most-once-rep-2018.rs b/src/test/ui/macros/macro-at-most-once-rep-2018-rpass.rs
similarity index 100%
rename from src/test/run-pass/macros/macro-at-most-once-rep-2018.rs
rename to src/test/ui/macros/macro-at-most-once-rep-2018-rpass.rs
diff --git a/src/test/run-pass/macros/macro-comma-behavior.rs b/src/test/ui/macros/macro-comma-behavior-rpass.rs
similarity index 100%
rename from src/test/run-pass/macros/macro-comma-behavior.rs
rename to src/test/ui/macros/macro-comma-behavior-rpass.rs
diff --git a/src/test/run-pass/macros/macro-comma-support.rs b/src/test/ui/macros/macro-comma-support-rpass.rs
similarity index 100%
rename from src/test/run-pass/macros/macro-comma-support.rs
rename to src/test/ui/macros/macro-comma-support-rpass.rs
diff --git a/src/test/run-pass/macros/macro-follow.rs b/src/test/ui/macros/macro-follow-rpass.rs
similarity index 100%
rename from src/test/run-pass/macros/macro-follow.rs
rename to src/test/ui/macros/macro-follow-rpass.rs
diff --git a/src/test/run-pass/macros/macro-stability.rs b/src/test/ui/macros/macro-stability-rpass.rs
similarity index 100%
rename from src/test/run-pass/macros/macro-stability.rs
rename to src/test/ui/macros/macro-stability-rpass.rs
diff --git a/src/test/run-pass/macros/macros-in-extern.rs b/src/test/ui/macros/macros-in-extern-rpass.rs
similarity index 100%
rename from src/test/run-pass/macros/macros-in-extern.rs
rename to src/test/ui/macros/macros-in-extern-rpass.rs
diff --git a/src/test/run-pass/privacy/privacy1.rs b/src/test/ui/privacy/privacy1-rpass.rs
similarity index 100%
rename from src/test/run-pass/privacy/privacy1.rs
rename to src/test/ui/privacy/privacy1-rpass.rs
diff --git a/src/test/run-pass/privacy/private-method.rs b/src/test/ui/privacy/private-method-rpass.rs
similarity index 100%
rename from src/test/run-pass/privacy/private-method.rs
rename to src/test/ui/privacy/private-method-rpass.rs
diff --git a/src/test/run-pass/proc-macro/attr-stmt-expr.rs b/src/test/ui/proc-macro/attr-stmt-expr-rpass.rs
similarity index 88%
rename from src/test/run-pass/proc-macro/attr-stmt-expr.rs
rename to src/test/ui/proc-macro/attr-stmt-expr-rpass.rs
index fe22f487721..16b8fabfc3f 100644
--- a/src/test/run-pass/proc-macro/attr-stmt-expr.rs
+++ b/src/test/ui/proc-macro/attr-stmt-expr-rpass.rs
@@ -1,9 +1,9 @@
 // run-pass
-// aux-build:attr-stmt-expr.rs
+// aux-build:attr-stmt-expr-rpass.rs
 
 #![feature(stmt_expr_attributes, proc_macro_hygiene)]
 
-extern crate attr_stmt_expr;
+extern crate attr_stmt_expr_rpass as attr_stmt_expr;
 use attr_stmt_expr::{expect_let, expect_print_stmt, expect_expr, expect_print_expr,
                      no_output, noop};
 
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs b/src/test/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
similarity index 100%
rename from src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs
rename to src/test/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/lifetimes.rs b/src/test/ui/proc-macro/auxiliary/lifetimes-rpass.rs
similarity index 100%
rename from src/test/run-pass/proc-macro/auxiliary/lifetimes.rs
rename to src/test/ui/proc-macro/auxiliary/lifetimes-rpass.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/test-macros.rs b/src/test/ui/proc-macro/auxiliary/test-macros-rpass.rs
similarity index 100%
rename from src/test/run-pass/proc-macro/auxiliary/test-macros.rs
rename to src/test/ui/proc-macro/auxiliary/test-macros-rpass.rs
diff --git a/src/test/run-pass/proc-macro/lifetimes.rs b/src/test/ui/proc-macro/lifetimes-rpass.rs
similarity index 84%
rename from src/test/run-pass/proc-macro/lifetimes.rs
rename to src/test/ui/proc-macro/lifetimes-rpass.rs
index 016c530fe35..a1d33ddca70 100644
--- a/src/test/run-pass/proc-macro/lifetimes.rs
+++ b/src/test/ui/proc-macro/lifetimes-rpass.rs
@@ -1,9 +1,9 @@
 // run-pass
 
 #![allow(unused_variables)]
-// aux-build:lifetimes.rs
+// aux-build:lifetimes-rpass.rs
 
-extern crate lifetimes;
+extern crate lifetimes_rpass as lifetimes;
 use lifetimes::*;
 
 lifetimes_bang! {
diff --git a/src/test/run-pass/proc-macro/macros-in-extern.rs b/src/test/ui/proc-macro/macros-in-extern-rpass.rs
similarity index 86%
rename from src/test/run-pass/proc-macro/macros-in-extern.rs
rename to src/test/ui/proc-macro/macros-in-extern-rpass.rs
index 93ae5441f9b..a30a287a101 100644
--- a/src/test/run-pass/proc-macro/macros-in-extern.rs
+++ b/src/test/ui/proc-macro/macros-in-extern-rpass.rs
@@ -1,10 +1,10 @@
 // run-pass
-// aux-build:test-macros.rs
+// aux-build:test-macros-rpass.rs
 // ignore-wasm32
 
 #![feature(macros_in_extern)]
 
-extern crate test_macros;
+extern crate test_macros_rpass as test_macros;
 
 use test_macros::{nop_attr, no_output, emit_input};
 
diff --git a/src/test/run-pass/ptr-coercion.rs b/src/test/ui/ptr-coercion-rpass.rs
similarity index 100%
rename from src/test/run-pass/ptr-coercion.rs
rename to src/test/ui/ptr-coercion-rpass.rs
diff --git a/src/test/run-pass/regions/regions-static-bound.rs b/src/test/ui/regions/regions-static-bound-rpass.rs
similarity index 100%
rename from src/test/run-pass/regions/regions-static-bound.rs
rename to src/test/ui/regions/regions-static-bound-rpass.rs
diff --git a/src/test/run-pass/rmeta.rs b/src/test/ui/rmeta-rpass.rs
similarity index 89%
rename from src/test/run-pass/rmeta.rs
rename to src/test/ui/rmeta-rpass.rs
index 4ef673b4ec7..5a63b5b8598 100644
--- a/src/test/run-pass/rmeta.rs
+++ b/src/test/ui/rmeta-rpass.rs
@@ -3,7 +3,7 @@
 // there can be both an rmeta and an rlib file and rustc will prefer the rlib.
 
 // aux-build:rmeta-rmeta.rs
-// aux-build:rmeta-rlib.rs
+// aux-build:rmeta-rlib-rpass.rs
 
 extern crate rmeta_aux;
 use rmeta_aux::Foo;
diff --git a/src/test/run-pass/specialization/README.md b/src/test/ui/specialization/README-rpass.md
similarity index 100%
rename from src/test/run-pass/specialization/README.md
rename to src/test/ui/specialization/README-rpass.md
diff --git a/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.rs
similarity index 100%
rename from src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs
rename to src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.rs
diff --git a/src/test/run-pass/tool_lints.rs b/src/test/ui/tool_lints-rpass.rs
similarity index 100%
rename from src/test/run-pass/tool_lints.rs
rename to src/test/ui/tool_lints-rpass.rs
diff --git a/src/test/run-pass/traits/trait-bounds-on-structs-and-enums.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-rpass.rs
similarity index 100%
rename from src/test/run-pass/traits/trait-bounds-on-structs-and-enums.rs
rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-rpass.rs
diff --git a/src/test/run-pass/traits/traits-negative-impls.rs b/src/test/ui/traits/traits-negative-impls-rpass.rs
similarity index 100%
rename from src/test/run-pass/traits/traits-negative-impls.rs
rename to src/test/ui/traits/traits-negative-impls-rpass.rs
diff --git a/src/test/run-pass/trivial_casts.rs b/src/test/ui/trivial_casts-rpass.rs
similarity index 100%
rename from src/test/run-pass/trivial_casts.rs
rename to src/test/ui/trivial_casts-rpass.rs
diff --git a/src/test/run-pass/union/union-derive.rs b/src/test/ui/union/union-derive-rpass.rs
similarity index 100%
rename from src/test/run-pass/union/union-derive.rs
rename to src/test/ui/union/union-derive-rpass.rs
diff --git a/src/test/run-pass/union/union-generic.rs b/src/test/ui/union/union-generic-rpass.rs
similarity index 100%
rename from src/test/run-pass/union/union-generic.rs
rename to src/test/ui/union/union-generic-rpass.rs
diff --git a/src/test/run-pass/union/union-with-drop-fields-lint.rs b/src/test/ui/union/union-with-drop-fields-lint-rpass.rs
similarity index 100%
rename from src/test/run-pass/union/union-with-drop-fields-lint.rs
rename to src/test/ui/union/union-with-drop-fields-lint-rpass.rs
diff --git a/src/test/run-pass/unsized-locals/by-value-trait-object-safety.rs b/src/test/ui/unsized-locals/by-value-trait-object-safety-rpass.rs
similarity index 100%
rename from src/test/run-pass/unsized-locals/by-value-trait-object-safety.rs
rename to src/test/ui/unsized-locals/by-value-trait-object-safety-rpass.rs
diff --git a/src/test/run-pass/unsized-locals/unsized-exprs.rs b/src/test/ui/unsized-locals/unsized-exprs-rpass.rs
similarity index 100%
rename from src/test/run-pass/unsized-locals/unsized-exprs.rs
rename to src/test/ui/unsized-locals/unsized-exprs-rpass.rs
diff --git a/src/test/run-pass/unsized3.rs b/src/test/ui/unsized3-rpass.rs
similarity index 100%
rename from src/test/run-pass/unsized3.rs
rename to src/test/ui/unsized3-rpass.rs
diff --git a/src/test/run-pass/utf8_idents.rs b/src/test/ui/utf8_idents-rpass.rs
similarity index 100%
rename from src/test/run-pass/utf8_idents.rs
rename to src/test/ui/utf8_idents-rpass.rs
diff --git a/src/test/run-pass/where-clauses/where-clause-method-substituion.rs b/src/test/ui/where-clauses/where-clause-method-substituion-rpass.rs
similarity index 100%
rename from src/test/run-pass/where-clauses/where-clause-method-substituion.rs
rename to src/test/ui/where-clauses/where-clause-method-substituion-rpass.rs