diff --git a/src/test/run-pass/auxiliary/associated-const-cc-lib.rs b/src/test/ui/run-pass/associated-consts/auxiliary/associated-const-cc-lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/associated-const-cc-lib.rs
rename to src/test/ui/run-pass/associated-consts/auxiliary/associated-const-cc-lib.rs
diff --git a/src/test/run-pass/auxiliary/empty-struct.rs b/src/test/ui/run-pass/associated-consts/auxiliary/empty-struct.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/empty-struct.rs
rename to src/test/ui/run-pass/associated-consts/auxiliary/empty-struct.rs
diff --git a/src/test/run-pass/auxiliary/associated-types-cc-lib.rs b/src/test/ui/run-pass/associated-types/auxiliary/associated-types-cc-lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/associated-types-cc-lib.rs
rename to src/test/ui/run-pass/associated-types/auxiliary/associated-types-cc-lib.rs
diff --git a/src/test/run-pass/auxiliary/cfg_inner_static.rs b/src/test/ui/run-pass/cfg/auxiliary/cfg_inner_static.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cfg_inner_static.rs
rename to src/test/ui/run-pass/cfg/auxiliary/cfg_inner_static.rs
diff --git a/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs b/src/test/ui/run-pass/cfg/auxiliary/crate-attributes-using-cfg_attr.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs
rename to src/test/ui/run-pass/cfg/auxiliary/crate-attributes-using-cfg_attr.rs
diff --git a/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs b/src/test/ui/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/coherence_copy_like_lib.rs
rename to src/test/ui/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs
diff --git a/src/test/run-pass/auxiliary/coherence_lib.rs b/src/test/ui/run-pass/coherence/auxiliary/coherence_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/coherence_lib.rs
rename to src/test/ui/run-pass/coherence/auxiliary/coherence_lib.rs
diff --git a/src/test/ui/run-pass/consts/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/ui/run-pass/consts/auxiliary/anon-extern-mod-cross-crate-1.rs
new file mode 100644
index 000000000000..741ce351da38
--- /dev/null
+++ b/src/test/ui/run-pass/consts/auxiliary/anon-extern-mod-cross-crate-1.rs
@@ -0,0 +1,19 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_name="anonexternmod"]
+#![feature(libc)]
+
+extern crate libc;
+
+#[link(name = "rust_test_helpers", kind = "static")]
+extern {
+    pub fn rust_get_test_int() -> libc::intptr_t;
+}
diff --git a/src/test/run-pass/auxiliary/cci_borrow_lib.rs b/src/test/ui/run-pass/consts/auxiliary/cci_borrow_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_borrow_lib.rs
rename to src/test/ui/run-pass/consts/auxiliary/cci_borrow_lib.rs
diff --git a/src/test/run-pass/auxiliary/cci_const.rs b/src/test/ui/run-pass/consts/auxiliary/cci_const.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_const.rs
rename to src/test/ui/run-pass/consts/auxiliary/cci_const.rs
diff --git a/src/test/run-pass/auxiliary/cci_const_block.rs b/src/test/ui/run-pass/consts/auxiliary/cci_const_block.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_const_block.rs
rename to src/test/ui/run-pass/consts/auxiliary/cci_const_block.rs
diff --git a/src/test/run-pass/auxiliary/const_fn_lib.rs b/src/test/ui/run-pass/consts/auxiliary/const_fn_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/const_fn_lib.rs
rename to src/test/ui/run-pass/consts/auxiliary/const_fn_lib.rs
diff --git a/src/test/ui/run-pass/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/ui/run-pass/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs
new file mode 100644
index 000000000000..741ce351da38
--- /dev/null
+++ b/src/test/ui/run-pass/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs
@@ -0,0 +1,19 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_name="anonexternmod"]
+#![feature(libc)]
+
+extern crate libc;
+
+#[link(name = "rust_test_helpers", kind = "static")]
+extern {
+    pub fn rust_get_test_int() -> libc::intptr_t;
+}
diff --git a/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/anon_trait_static_method_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/anon_trait_static_method_lib.rs
diff --git a/src/test/ui/run-pass/cross-crate/auxiliary/cci_borrow_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_borrow_lib.rs
new file mode 100644
index 000000000000..9c90510a8573
--- /dev/null
+++ b/src/test/ui/run-pass/cross-crate/auxiliary/cci_borrow_lib.rs
@@ -0,0 +1,13 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub fn foo(x: &usize) -> usize {
+    *x
+}
diff --git a/src/test/run-pass/auxiliary/cci_capture_clause.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_capture_clause.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_capture_clause.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_capture_clause.rs
diff --git a/src/test/ui/run-pass/cross-crate/auxiliary/cci_const.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_const.rs
new file mode 100644
index 000000000000..ee8290050f91
--- /dev/null
+++ b/src/test/ui/run-pass/cross-crate/auxiliary/cci_const.rs
@@ -0,0 +1,16 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub extern fn bar() {
+}
+
+pub const foopy: &'static str = "hi there";
+pub const uint_val: usize = 12;
+pub const uint_expr: usize = (1 << uint_val) - 1;
diff --git a/src/test/run-pass/auxiliary/cci_impl_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_impl_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_impl_lib.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_impl_lib.rs
diff --git a/src/test/run-pass/auxiliary/cci_iter_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_iter_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_iter_lib.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_iter_lib.rs
diff --git a/src/test/run-pass/auxiliary/cci_nested_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_nested_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_nested_lib.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_nested_lib.rs
diff --git a/src/test/run-pass/auxiliary/cci_no_inline_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_no_inline_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_no_inline_lib.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_no_inline_lib.rs
diff --git a/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/moves_based_on_type_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/moves_based_on_type_lib.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/moves_based_on_type_lib.rs
diff --git a/src/test/run-pass/auxiliary/newtype_struct_xc.rs b/src/test/ui/run-pass/cross-crate/auxiliary/newtype_struct_xc.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/newtype_struct_xc.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/newtype_struct_xc.rs
diff --git a/src/test/run-pass/auxiliary/pub_static_array.rs b/src/test/ui/run-pass/cross-crate/auxiliary/pub_static_array.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/pub_static_array.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/pub_static_array.rs
diff --git a/src/test/run-pass/auxiliary/reexported_static_methods.rs b/src/test/ui/run-pass/cross-crate/auxiliary/reexported_static_methods.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/reexported_static_methods.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/reexported_static_methods.rs
diff --git a/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs
diff --git a/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_address_insignificant.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/xcrate_address_insignificant.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_address_insignificant.rs
diff --git a/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_associated_type_defaults.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_associated_type_defaults.rs
diff --git a/src/test/run-pass/auxiliary/xcrate_generic_fn_nested_return.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/xcrate_generic_fn_nested_return.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs
diff --git a/src/test/run-pass/auxiliary/xcrate_static_addresses.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_static_addresses.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/xcrate_static_addresses.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_static_addresses.rs
diff --git a/src/test/run-pass/auxiliary/xcrate_unit_struct.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_unit_struct.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/xcrate_unit_struct.rs
rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_unit_struct.rs
diff --git a/src/test/run-pass/auxiliary/derive-no-std.rs b/src/test/ui/run-pass/deriving/auxiliary/derive-no-std.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/derive-no-std.rs
rename to src/test/ui/run-pass/deriving/auxiliary/derive-no-std.rs
diff --git a/src/test/run-pass/auxiliary/dropck_eyepatch_extern_crate.rs b/src/test/ui/run-pass/drop/auxiliary/dropck_eyepatch_extern_crate.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/dropck_eyepatch_extern_crate.rs
rename to src/test/ui/run-pass/drop/auxiliary/dropck_eyepatch_extern_crate.rs
diff --git a/src/test/run-pass/auxiliary/extern-crosscrate-source.rs b/src/test/ui/run-pass/extern/auxiliary/extern-crosscrate-source.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/extern-crosscrate-source.rs
rename to src/test/ui/run-pass/extern/auxiliary/extern-crosscrate-source.rs
diff --git a/src/test/run-pass/auxiliary/extern-take-value.rs b/src/test/ui/run-pass/extern/auxiliary/extern-take-value.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/extern-take-value.rs
rename to src/test/ui/run-pass/extern/auxiliary/extern-take-value.rs
diff --git a/src/test/run-pass/auxiliary/extern_calling_convention.rs b/src/test/ui/run-pass/extern/auxiliary/extern_calling_convention.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/extern_calling_convention.rs
rename to src/test/ui/run-pass/extern/auxiliary/extern_calling_convention.rs
diff --git a/src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs b/src/test/ui/run-pass/extern/auxiliary/extern_mod_ordering_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs
rename to src/test/ui/run-pass/extern/auxiliary/extern_mod_ordering_lib.rs
diff --git a/src/test/run-pass/auxiliary/fat_drop.rs b/src/test/ui/run-pass/extern/auxiliary/fat_drop.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/fat_drop.rs
rename to src/test/ui/run-pass/extern/auxiliary/fat_drop.rs
diff --git a/src/test/run-pass/auxiliary/fn-abi.rs b/src/test/ui/run-pass/foreign/auxiliary/fn-abi.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/fn-abi.rs
rename to src/test/ui/run-pass/foreign/auxiliary/fn-abi.rs
diff --git a/src/test/ui/run-pass/foreign/auxiliary/foreign_lib.rs b/src/test/ui/run-pass/foreign/auxiliary/foreign_lib.rs
new file mode 100644
index 000000000000..cef36274c625
--- /dev/null
+++ b/src/test/ui/run-pass/foreign/auxiliary/foreign_lib.rs
@@ -0,0 +1,48 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_name="foreign_lib"]
+
+#![feature(libc)]
+
+pub mod rustrt {
+    extern crate libc;
+
+    #[link(name = "rust_test_helpers", kind = "static")]
+    extern {
+        pub fn rust_get_test_int() -> libc::intptr_t;
+    }
+}
+
+pub mod rustrt2 {
+    extern crate libc;
+
+    extern {
+        pub fn rust_get_test_int() -> libc::intptr_t;
+    }
+}
+
+pub mod rustrt3 {
+    // Different type, but same ABI (on all supported platforms).
+    // Ensures that we don't ICE or trigger LLVM asserts when
+    // importing the same symbol under different types.
+    // See https://github.com/rust-lang/rust/issues/32740.
+    extern {
+        pub fn rust_get_test_int() -> *const u8;
+    }
+}
+
+pub fn local_uses() {
+    unsafe {
+        let x = rustrt::rust_get_test_int();
+        assert_eq!(x, rustrt2::rust_get_test_int());
+        assert_eq!(x as *const _, rustrt3::rust_get_test_int());
+    }
+}
diff --git a/src/test/ui/run-pass/functions-closures/auxiliary/fn-abi.rs b/src/test/ui/run-pass/functions-closures/auxiliary/fn-abi.rs
new file mode 100644
index 000000000000..5d380ea6a5ac
--- /dev/null
+++ b/src/test/ui/run-pass/functions-closures/auxiliary/fn-abi.rs
@@ -0,0 +1,12 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[no_mangle]
+pub extern fn foo() {}
diff --git a/src/test/run-pass/auxiliary/default_type_params_xc.rs b/src/test/ui/run-pass/generics/auxiliary/default_type_params_xc.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/default_type_params_xc.rs
rename to src/test/ui/run-pass/generics/auxiliary/default_type_params_xc.rs
diff --git a/src/test/run-pass/auxiliary/cci_intrinsic.rs b/src/test/ui/run-pass/intrinsics/auxiliary/cci_intrinsic.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_intrinsic.rs
rename to src/test/ui/run-pass/intrinsics/auxiliary/cci_intrinsic.rs
diff --git a/src/test/run-pass/auxiliary/cgu_test.rs b/src/test/ui/run-pass/issues/auxiliary/cgu_test.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cgu_test.rs
rename to src/test/ui/run-pass/issues/auxiliary/cgu_test.rs
diff --git a/src/test/run-pass/auxiliary/cgu_test_a.rs b/src/test/ui/run-pass/issues/auxiliary/cgu_test_a.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cgu_test_a.rs
rename to src/test/ui/run-pass/issues/auxiliary/cgu_test_a.rs
diff --git a/src/test/run-pass/auxiliary/cgu_test_b.rs b/src/test/ui/run-pass/issues/auxiliary/cgu_test_b.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cgu_test_b.rs
rename to src/test/ui/run-pass/issues/auxiliary/cgu_test_b.rs
diff --git a/src/test/run-pass/auxiliary/i8.rs b/src/test/ui/run-pass/issues/auxiliary/i8.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/i8.rs
rename to src/test/ui/run-pass/issues/auxiliary/i8.rs
diff --git a/src/test/run-pass/auxiliary/iss.rs b/src/test/ui/run-pass/issues/auxiliary/iss.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/iss.rs
rename to src/test/ui/run-pass/issues/auxiliary/iss.rs
diff --git a/src/test/run-pass/auxiliary/issue-10028.rs b/src/test/ui/run-pass/issues/auxiliary/issue-10028.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-10028.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-10028.rs
diff --git a/src/test/run-pass/auxiliary/issue-11224.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11224.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-11224.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-11224.rs
diff --git a/src/test/run-pass/auxiliary/issue-11225-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11225-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-11225-1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-11225-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-11225-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11225-2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-11225-2.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-11225-2.rs
diff --git a/src/test/run-pass/auxiliary/issue-11225-3.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11225-3.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-11225-3.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-11225-3.rs
diff --git a/src/test/run-pass/auxiliary/issue-11508.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11508.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-11508.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-11508.rs
diff --git a/src/test/run-pass/auxiliary/issue-11529.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11529.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-11529.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-11529.rs
diff --git a/src/test/run-pass/auxiliary/issue-12133-dylib.rs b/src/test/ui/run-pass/issues/auxiliary/issue-12133-dylib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-12133-dylib.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-12133-dylib.rs
diff --git a/src/test/run-pass/auxiliary/issue-12133-dylib2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-12133-dylib2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-12133-dylib2.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-12133-dylib2.rs
diff --git a/src/test/run-pass/auxiliary/issue-12133-rlib.rs b/src/test/ui/run-pass/issues/auxiliary/issue-12133-rlib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-12133-rlib.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-12133-rlib.rs
diff --git a/src/test/run-pass/auxiliary/issue-12660-aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue-12660-aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-12660-aux.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-12660-aux.rs
diff --git a/src/test/run-pass/auxiliary/issue-13620-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13620-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-13620-1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-13620-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-13620-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13620-2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-13620-2.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-13620-2.rs
diff --git a/src/test/run-pass/auxiliary/issue-13872-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13872-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-13872-1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-13872-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-13872-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13872-2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-13872-2.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-13872-2.rs
diff --git a/src/test/run-pass/auxiliary/issue-13872-3.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13872-3.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-13872-3.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-13872-3.rs
diff --git a/src/test/run-pass/auxiliary/issue-14344-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-14344-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-14344-1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-14344-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-14344-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-14344-2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-14344-2.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-14344-2.rs
diff --git a/src/test/run-pass/auxiliary/issue-14421.rs b/src/test/ui/run-pass/issues/auxiliary/issue-14421.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-14421.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-14421.rs
diff --git a/src/test/run-pass/auxiliary/issue-14422.rs b/src/test/ui/run-pass/issues/auxiliary/issue-14422.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-14422.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-14422.rs
diff --git a/src/test/run-pass/auxiliary/issue-15562.rs b/src/test/ui/run-pass/issues/auxiliary/issue-15562.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-15562.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-15562.rs
diff --git a/src/test/run-pass/auxiliary/issue-16643.rs b/src/test/ui/run-pass/issues/auxiliary/issue-16643.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-16643.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-16643.rs
diff --git a/src/test/run-pass/auxiliary/issue-17662.rs b/src/test/ui/run-pass/issues/auxiliary/issue-17662.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-17662.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-17662.rs
diff --git a/src/test/run-pass/auxiliary/issue-17718-aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue-17718-aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-17718-aux.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-17718-aux.rs
diff --git a/src/test/run-pass/auxiliary/issue-18501.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18501.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-18501.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-18501.rs
diff --git a/src/test/run-pass/auxiliary/issue-18514.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18514.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-18514.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-18514.rs
diff --git a/src/test/run-pass/auxiliary/issue-18711.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18711.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-18711.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-18711.rs
diff --git a/src/test/run-pass/auxiliary/issue-18913-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18913-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-18913-1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-18913-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-18913-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18913-2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-18913-2.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-18913-2.rs
diff --git a/src/test/run-pass/auxiliary/issue-19340-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-19340-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-19340-1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-19340-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-2380.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2380.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-2380.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-2380.rs
diff --git a/src/test/run-pass/auxiliary/issue-2414-a.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2414-a.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-2414-a.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-2414-a.rs
diff --git a/src/test/run-pass/auxiliary/issue-2414-b.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2414-b.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-2414-b.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-2414-b.rs
diff --git a/src/test/run-pass/auxiliary/issue-25185-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-25185-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-25185-1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-25185-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-25185-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-25185-2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-25185-2.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-25185-2.rs
diff --git a/src/test/run-pass/auxiliary/issue-2526.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2526.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-2526.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-2526.rs
diff --git a/src/test/run-pass/auxiliary/issue-25467.rs b/src/test/ui/run-pass/issues/auxiliary/issue-25467.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-25467.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-25467.rs
diff --git a/src/test/run-pass/auxiliary/issue-2631-a.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2631-a.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-2631-a.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-2631-a.rs
diff --git a/src/test/run-pass/auxiliary/issue-29485.rs b/src/test/ui/run-pass/issues/auxiliary/issue-29485.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-29485.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-29485.rs
diff --git a/src/test/run-pass/auxiliary/issue-3012-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-3012-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-3012-1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-3012-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-36954.rs b/src/test/ui/run-pass/issues/auxiliary/issue-36954.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-36954.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-36954.rs
diff --git a/src/test/run-pass/auxiliary/issue-41394.rs b/src/test/ui/run-pass/issues/auxiliary/issue-41394.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-41394.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-41394.rs
diff --git a/src/test/run-pass/auxiliary/issue-4208-cc.rs b/src/test/ui/run-pass/issues/auxiliary/issue-4208-cc.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-4208-cc.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-4208-cc.rs
diff --git a/src/test/run-pass/auxiliary/issue-4545.rs b/src/test/ui/run-pass/issues/auxiliary/issue-4545.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-4545.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-4545.rs
diff --git a/src/test/run-pass/auxiliary/issue-48984-aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue-48984-aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-48984-aux.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-48984-aux.rs
diff --git a/src/test/run-pass/auxiliary/issue-5518.rs b/src/test/ui/run-pass/issues/auxiliary/issue-5518.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-5518.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-5518.rs
diff --git a/src/test/run-pass/auxiliary/issue-5521.rs b/src/test/ui/run-pass/issues/auxiliary/issue-5521.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-5521.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-5521.rs
diff --git a/src/test/run-pass/auxiliary/issue-7178.rs b/src/test/ui/run-pass/issues/auxiliary/issue-7178.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-7178.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-7178.rs
diff --git a/src/test/run-pass/auxiliary/issue-7899.rs b/src/test/ui/run-pass/issues/auxiliary/issue-7899.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-7899.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-7899.rs
diff --git a/src/test/run-pass/auxiliary/issue-8044.rs b/src/test/ui/run-pass/issues/auxiliary/issue-8044.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-8044.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-8044.rs
diff --git a/src/test/run-pass/auxiliary/issue-8259.rs b/src/test/ui/run-pass/issues/auxiliary/issue-8259.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-8259.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-8259.rs
diff --git a/src/test/run-pass/auxiliary/issue-9906.rs b/src/test/ui/run-pass/issues/auxiliary/issue-9906.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-9906.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-9906.rs
diff --git a/src/test/run-pass/auxiliary/issue-9968.rs b/src/test/ui/run-pass/issues/auxiliary/issue-9968.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-9968.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue-9968.rs
diff --git a/src/test/run-pass/auxiliary/issue13507.rs b/src/test/ui/run-pass/issues/auxiliary/issue13507.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue13507.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue13507.rs
diff --git a/src/test/run-pass/auxiliary/issue2170lib.rs b/src/test/ui/run-pass/issues/auxiliary/issue2170lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue2170lib.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue2170lib.rs
diff --git a/src/test/run-pass/auxiliary/issue34796aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue34796aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue34796aux.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue34796aux.rs
diff --git a/src/test/run-pass/auxiliary/issue_10031_aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue_10031_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_10031_aux.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_10031_aux.rs
diff --git a/src/test/run-pass/auxiliary/issue_12612_1.rs b/src/test/ui/run-pass/issues/auxiliary/issue_12612_1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_12612_1.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_12612_1.rs
diff --git a/src/test/run-pass/auxiliary/issue_12612_2.rs b/src/test/ui/run-pass/issues/auxiliary/issue_12612_2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_12612_2.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_12612_2.rs
diff --git a/src/test/run-pass/auxiliary/issue_19293.rs b/src/test/ui/run-pass/issues/auxiliary/issue_19293.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_19293.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_19293.rs
diff --git a/src/test/run-pass/auxiliary/issue_20389.rs b/src/test/ui/run-pass/issues/auxiliary/issue_20389.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_20389.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_20389.rs
diff --git a/src/test/run-pass/auxiliary/issue_2316_a.rs b/src/test/ui/run-pass/issues/auxiliary/issue_2316_a.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_2316_a.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_2316_a.rs
diff --git a/src/test/run-pass/auxiliary/issue_2316_b.rs b/src/test/ui/run-pass/issues/auxiliary/issue_2316_b.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_2316_b.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_2316_b.rs
diff --git a/src/test/run-pass/auxiliary/issue_2472_b.rs b/src/test/ui/run-pass/issues/auxiliary/issue_2472_b.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_2472_b.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_2472_b.rs
diff --git a/src/test/run-pass/auxiliary/issue_2723_a.rs b/src/test/ui/run-pass/issues/auxiliary/issue_2723_a.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_2723_a.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_2723_a.rs
diff --git a/src/test/run-pass/auxiliary/issue_3136_a.rc b/src/test/ui/run-pass/issues/auxiliary/issue_3136_a.rc
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_3136_a.rc
rename to src/test/ui/run-pass/issues/auxiliary/issue_3136_a.rc
diff --git a/src/test/run-pass/auxiliary/issue_3136_a.rs b/src/test/ui/run-pass/issues/auxiliary/issue_3136_a.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_3136_a.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_3136_a.rs
diff --git a/src/test/run-pass/auxiliary/issue_38190.rs b/src/test/ui/run-pass/issues/auxiliary/issue_38190.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_38190.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_38190.rs
diff --git a/src/test/run-pass/auxiliary/issue_38226_aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue_38226_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_38226_aux.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_38226_aux.rs
diff --git a/src/test/run-pass/auxiliary/issue_38715-modern.rs b/src/test/ui/run-pass/issues/auxiliary/issue_38715-modern.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_38715-modern.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_38715-modern.rs
diff --git a/src/test/run-pass/auxiliary/issue_38715.rs b/src/test/ui/run-pass/issues/auxiliary/issue_38715.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_38715.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_38715.rs
diff --git a/src/test/run-pass/auxiliary/issue_3979_traits.rs b/src/test/ui/run-pass/issues/auxiliary/issue_3979_traits.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_3979_traits.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_3979_traits.rs
diff --git a/src/test/run-pass/auxiliary/issue_39823.rs b/src/test/ui/run-pass/issues/auxiliary/issue_39823.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_39823.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_39823.rs
diff --git a/src/test/run-pass/auxiliary/issue_40469.rs b/src/test/ui/run-pass/issues/auxiliary/issue_40469.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_40469.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_40469.rs
diff --git a/src/test/run-pass/auxiliary/issue_41053.rs b/src/test/ui/run-pass/issues/auxiliary/issue_41053.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_41053.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_41053.rs
diff --git a/src/test/run-pass/auxiliary/issue_42007_s.rs b/src/test/ui/run-pass/issues/auxiliary/issue_42007_s.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_42007_s.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_42007_s.rs
diff --git a/src/test/run-pass/auxiliary/issue_8401.rs b/src/test/ui/run-pass/issues/auxiliary/issue_8401.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_8401.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_8401.rs
diff --git a/src/test/run-pass/auxiliary/issue_9123.rs b/src/test/ui/run-pass/issues/auxiliary/issue_9123.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_9123.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_9123.rs
diff --git a/src/test/run-pass/auxiliary/issue_9155.rs b/src/test/ui/run-pass/issues/auxiliary/issue_9155.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_9155.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_9155.rs
diff --git a/src/test/run-pass/auxiliary/issue_9188.rs b/src/test/ui/run-pass/issues/auxiliary/issue_9188.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue_9188.rs
rename to src/test/ui/run-pass/issues/auxiliary/issue_9188.rs
diff --git a/src/test/run-pass/auxiliary/macro-comma-support.rs b/src/test/ui/run-pass/macros/auxiliary/macro-comma-support.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/macro-comma-support.rs
rename to src/test/ui/run-pass/macros/auxiliary/macro-comma-support.rs
diff --git a/src/test/run-pass/auxiliary/macro-include-items-expr.rs b/src/test/ui/run-pass/macros/auxiliary/macro-include-items-expr.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/macro-include-items-expr.rs
rename to src/test/ui/run-pass/macros/auxiliary/macro-include-items-expr.rs
diff --git a/src/test/run-pass/auxiliary/macro-include-items-item.rs b/src/test/ui/run-pass/macros/auxiliary/macro-include-items-item.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/macro-include-items-item.rs
rename to src/test/ui/run-pass/macros/auxiliary/macro-include-items-item.rs
diff --git a/src/test/run-pass/auxiliary/macro_crate_def_only.rs b/src/test/ui/run-pass/macros/auxiliary/macro_crate_def_only.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/macro_crate_def_only.rs
rename to src/test/ui/run-pass/macros/auxiliary/macro_crate_def_only.rs
diff --git a/src/test/run-pass/auxiliary/macro_crate_nonterminal.rs b/src/test/ui/run-pass/macros/auxiliary/macro_crate_nonterminal.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/macro_crate_nonterminal.rs
rename to src/test/ui/run-pass/macros/auxiliary/macro_crate_nonterminal.rs
diff --git a/src/test/run-pass/auxiliary/macro_export_inner_module.rs b/src/test/ui/run-pass/macros/auxiliary/macro_export_inner_module.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/macro_export_inner_module.rs
rename to src/test/ui/run-pass/macros/auxiliary/macro_export_inner_module.rs
diff --git a/src/test/run-pass/auxiliary/macro_with_super_1.rs b/src/test/ui/run-pass/macros/auxiliary/macro_with_super_1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/macro_with_super_1.rs
rename to src/test/ui/run-pass/macros/auxiliary/macro_with_super_1.rs
diff --git a/src/test/run-pass/auxiliary/two_macros.rs b/src/test/ui/run-pass/macros/auxiliary/two_macros.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/two_macros.rs
rename to src/test/ui/run-pass/macros/auxiliary/two_macros.rs
diff --git a/src/test/run-pass/auxiliary/unstable-macros.rs b/src/test/ui/run-pass/macros/auxiliary/unstable-macros.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/unstable-macros.rs
rename to src/test/ui/run-pass/macros/auxiliary/unstable-macros.rs
diff --git a/src/test/run-pass/auxiliary/use-macro-self.rs b/src/test/ui/run-pass/macros/auxiliary/use-macro-self.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/use-macro-self.rs
rename to src/test/ui/run-pass/macros/auxiliary/use-macro-self.rs
diff --git a/src/test/run-pass/syntax-extension-source-utils-files/includeme.fragment b/src/test/ui/run-pass/macros/syntax-extension-source-utils-files/includeme.fragment
similarity index 100%
rename from src/test/run-pass/syntax-extension-source-utils-files/includeme.fragment
rename to src/test/ui/run-pass/macros/syntax-extension-source-utils-files/includeme.fragment
diff --git a/src/test/run-pass/auxiliary/method_self_arg1.rs b/src/test/ui/run-pass/methods/auxiliary/method_self_arg1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/method_self_arg1.rs
rename to src/test/ui/run-pass/methods/auxiliary/method_self_arg1.rs
diff --git a/src/test/run-pass/auxiliary/method_self_arg2.rs b/src/test/ui/run-pass/methods/auxiliary/method_self_arg2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/method_self_arg2.rs
rename to src/test/ui/run-pass/methods/auxiliary/method_self_arg2.rs
diff --git a/src/test/run-pass/auxiliary/mir_external_refs.rs b/src/test/ui/run-pass/mir/auxiliary/mir_external_refs.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/mir_external_refs.rs
rename to src/test/ui/run-pass/mir/auxiliary/mir_external_refs.rs
diff --git a/src/test/run-pass/auxiliary/two_macros_2.rs b/src/test/ui/run-pass/modules/auxiliary/two_macros_2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/two_macros_2.rs
rename to src/test/ui/run-pass/modules/auxiliary/two_macros_2.rs
diff --git a/src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs b/src/test/ui/run-pass/overloaded/auxiliary/overloaded_autoderef_xc.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs
rename to src/test/ui/run-pass/overloaded/auxiliary/overloaded_autoderef_xc.rs
diff --git a/src/test/run-pass/auxiliary/packed.rs b/src/test/ui/run-pass/packed/auxiliary/packed.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/packed.rs
rename to src/test/ui/run-pass/packed/auxiliary/packed.rs
diff --git a/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs b/src/test/ui/run-pass/privacy/auxiliary/priv-impl-prim-ty.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/priv-impl-prim-ty.rs
rename to src/test/ui/run-pass/privacy/auxiliary/priv-impl-prim-ty.rs
diff --git a/src/test/run-pass/auxiliary/privacy_reexport.rs b/src/test/ui/run-pass/privacy/auxiliary/privacy_reexport.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/privacy_reexport.rs
rename to src/test/ui/run-pass/privacy/auxiliary/privacy_reexport.rs
diff --git a/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs b/src/test/ui/run-pass/privacy/auxiliary/pub_use_mods_xcrate.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs
rename to src/test/ui/run-pass/privacy/auxiliary/pub_use_mods_xcrate.rs
diff --git a/src/test/run-pass/auxiliary/pub_use_xcrate1.rs b/src/test/ui/run-pass/privacy/auxiliary/pub_use_xcrate1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/pub_use_xcrate1.rs
rename to src/test/ui/run-pass/privacy/auxiliary/pub_use_xcrate1.rs
diff --git a/src/test/run-pass/auxiliary/pub_use_xcrate2.rs b/src/test/ui/run-pass/privacy/auxiliary/pub_use_xcrate2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/pub_use_xcrate2.rs
rename to src/test/ui/run-pass/privacy/auxiliary/pub_use_xcrate2.rs
diff --git a/src/test/run-pass/auxiliary/explicit_self_xcrate.rs b/src/test/ui/run-pass/self/auxiliary/explicit_self_xcrate.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/explicit_self_xcrate.rs
rename to src/test/ui/run-pass/self/auxiliary/explicit_self_xcrate.rs
diff --git a/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs b/src/test/ui/run-pass/sepcomp/auxiliary/sepcomp-extern-lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/sepcomp-extern-lib.rs
rename to src/test/ui/run-pass/sepcomp/auxiliary/sepcomp-extern-lib.rs
diff --git a/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs b/src/test/ui/run-pass/sepcomp/auxiliary/sepcomp_cci_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/sepcomp_cci_lib.rs
rename to src/test/ui/run-pass/sepcomp/auxiliary/sepcomp_cci_lib.rs
diff --git a/src/test/run-pass/auxiliary/sepcomp_lib.rs b/src/test/ui/run-pass/sepcomp/auxiliary/sepcomp_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/sepcomp_lib.rs
rename to src/test/ui/run-pass/sepcomp/auxiliary/sepcomp_lib.rs
diff --git a/src/test/run-pass/auxiliary/static-function-pointer-aux.rs b/src/test/ui/run-pass/statics/auxiliary/static-function-pointer-aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/static-function-pointer-aux.rs
rename to src/test/ui/run-pass/statics/auxiliary/static-function-pointer-aux.rs
diff --git a/src/test/run-pass/auxiliary/static-methods-crate.rs b/src/test/ui/run-pass/statics/auxiliary/static-methods-crate.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/static-methods-crate.rs
rename to src/test/ui/run-pass/statics/auxiliary/static-methods-crate.rs
diff --git a/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs b/src/test/ui/run-pass/statics/auxiliary/static_fn_inline_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs
rename to src/test/ui/run-pass/statics/auxiliary/static_fn_inline_xc_aux.rs
diff --git a/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs b/src/test/ui/run-pass/statics/auxiliary/static_fn_trait_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs
rename to src/test/ui/run-pass/statics/auxiliary/static_fn_trait_xc_aux.rs
diff --git a/src/test/run-pass/auxiliary/static_mut_xc.rs b/src/test/ui/run-pass/statics/auxiliary/static_mut_xc.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/static_mut_xc.rs
rename to src/test/ui/run-pass/statics/auxiliary/static_mut_xc.rs
diff --git a/src/test/run-pass/auxiliary/cci_class.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_class.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class.rs
diff --git a/src/test/run-pass/auxiliary/cci_class_2.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_class_2.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_2.rs
diff --git a/src/test/run-pass/auxiliary/cci_class_3.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_3.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_class_3.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_3.rs
diff --git a/src/test/run-pass/auxiliary/cci_class_4.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_4.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_class_4.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_4.rs
diff --git a/src/test/run-pass/auxiliary/cci_class_6.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_6.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_class_6.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_6.rs
diff --git a/src/test/run-pass/auxiliary/cci_class_cast.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_cast.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_class_cast.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_cast.rs
diff --git a/src/test/run-pass/auxiliary/cci_class_trait.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_trait.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/cci_class_trait.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_trait.rs
diff --git a/src/test/ui/run-pass/structs-enums/auxiliary/empty-struct.rs b/src/test/ui/run-pass/structs-enums/auxiliary/empty-struct.rs
new file mode 100644
index 000000000000..734e57a774d8
--- /dev/null
+++ b/src/test/ui/run-pass/structs-enums/auxiliary/empty-struct.rs
@@ -0,0 +1,19 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub struct XEmpty1 {}
+pub struct XEmpty2;
+pub struct XEmpty7();
+
+pub enum XE {
+    XEmpty3 {},
+    XEmpty4,
+    XEmpty6(),
+}
diff --git a/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs b/src/test/ui/run-pass/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
diff --git a/src/test/run-pass/auxiliary/namespaced_enums.rs b/src/test/ui/run-pass/structs-enums/auxiliary/namespaced_enums.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/namespaced_enums.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/namespaced_enums.rs
diff --git a/src/test/ui/run-pass/structs-enums/auxiliary/newtype_struct_xc.rs b/src/test/ui/run-pass/structs-enums/auxiliary/newtype_struct_xc.rs
new file mode 100644
index 000000000000..be3414b7ad2c
--- /dev/null
+++ b/src/test/ui/run-pass/structs-enums/auxiliary/newtype_struct_xc.rs
@@ -0,0 +1,13 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_type="lib"]
+
+pub struct Au(pub isize);
diff --git a/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs b/src/test/ui/run-pass/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
diff --git a/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs b/src/test/ui/run-pass/structs-enums/auxiliary/struct_variant_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/struct_variant_xc_aux.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/struct_variant_xc_aux.rs
diff --git a/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs b/src/test/ui/run-pass/structs-enums/auxiliary/xcrate_struct_aliases.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/xcrate_struct_aliases.rs
rename to src/test/ui/run-pass/structs-enums/auxiliary/xcrate_struct_aliases.rs
diff --git a/src/test/run-pass/auxiliary/thread-local-extern-static.rs b/src/test/ui/run-pass/threads-sendsync/auxiliary/thread-local-extern-static.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/thread-local-extern-static.rs
rename to src/test/ui/run-pass/threads-sendsync/auxiliary/thread-local-extern-static.rs
diff --git a/src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs
index 1ead6268d0c2..53b19db5d486 100644
--- a/src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 use std::sync::atomic::*;
diff --git a/src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs
index 335a9c0d8bed..93f1bc48b0d4 100644
--- a/src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi networking not available
 // ignore-wasm32-bare networking not available
 
diff --git a/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs
index e9584e12b2e3..b62f6c4cc6d3 100644
--- a/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![allow(warnings)]
 #![feature(drain, collections_bound, btree_range)]
 
diff --git a/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs
index 55269a286663..e95014d829df 100644
--- a/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![allow(warnings)]
diff --git a/src/test/ui/run-pass/traits/auxiliary/anon_trait_static_method_lib.rs b/src/test/ui/run-pass/traits/auxiliary/anon_trait_static_method_lib.rs
new file mode 100644
index 000000000000..9d93d9689e73
--- /dev/null
+++ b/src/test/ui/run-pass/traits/auxiliary/anon_trait_static_method_lib.rs
@@ -0,0 +1,19 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub struct Foo {
+    pub x: isize
+}
+
+impl Foo {
+    pub fn new() -> Foo {
+        Foo { x: 3 }
+    }
+}
diff --git a/src/test/run-pass/auxiliary/go_trait.rs b/src/test/ui/run-pass/traits/auxiliary/go_trait.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/go_trait.rs
rename to src/test/ui/run-pass/traits/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs b/src/test/ui/run-pass/traits/auxiliary/trait_default_method_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs
rename to src/test/ui/run-pass/traits/auxiliary/trait_default_method_xc_aux.rs
diff --git a/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs b/src/test/ui/run-pass/traits/auxiliary/trait_default_method_xc_aux_2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs
rename to src/test/ui/run-pass/traits/auxiliary/trait_default_method_xc_aux_2.rs
diff --git a/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs b/src/test/ui/run-pass/traits/auxiliary/trait_inheritance_auto_xc_2_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs
rename to src/test/ui/run-pass/traits/auxiliary/trait_inheritance_auto_xc_2_aux.rs
diff --git a/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs b/src/test/ui/run-pass/traits/auxiliary/trait_inheritance_auto_xc_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs
rename to src/test/ui/run-pass/traits/auxiliary/trait_inheritance_auto_xc_aux.rs
diff --git a/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs b/src/test/ui/run-pass/traits/auxiliary/trait_inheritance_overloading_xc.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs
rename to src/test/ui/run-pass/traits/auxiliary/trait_inheritance_overloading_xc.rs
diff --git a/src/test/run-pass/auxiliary/trait_safety_lib.rs b/src/test/ui/run-pass/traits/auxiliary/trait_safety_lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/trait_safety_lib.rs
rename to src/test/ui/run-pass/traits/auxiliary/trait_safety_lib.rs
diff --git a/src/test/run-pass/auxiliary/trait_xc_call_aux.rs b/src/test/ui/run-pass/traits/auxiliary/trait_xc_call_aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/trait_xc_call_aux.rs
rename to src/test/ui/run-pass/traits/auxiliary/trait_xc_call_aux.rs
diff --git a/src/test/run-pass/auxiliary/traitimpl.rs b/src/test/ui/run-pass/traits/auxiliary/traitimpl.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/traitimpl.rs
rename to src/test/ui/run-pass/traits/auxiliary/traitimpl.rs
diff --git a/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs b/src/test/ui/run-pass/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs
rename to src/test/ui/run-pass/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs
diff --git a/src/test/run-pass/auxiliary/where_clauses_xc.rs b/src/test/ui/run-pass/where-clauses/auxiliary/where_clauses_xc.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/where_clauses_xc.rs
rename to src/test/ui/run-pass/where-clauses/auxiliary/where_clauses_xc.rs