diff --git a/src/test/ui/arbitrary-self-types-not-object-safe.rs b/src/test/ui/self/arbitrary-self-types-not-object-safe.rs
similarity index 100%
rename from src/test/ui/arbitrary-self-types-not-object-safe.rs
rename to src/test/ui/self/arbitrary-self-types-not-object-safe.rs
diff --git a/src/test/ui/arbitrary-self-types-not-object-safe.stderr b/src/test/ui/self/arbitrary-self-types-not-object-safe.stderr
similarity index 100%
rename from src/test/ui/arbitrary-self-types-not-object-safe.stderr
rename to src/test/ui/self/arbitrary-self-types-not-object-safe.stderr
diff --git a/src/test/run-pass/arbitrary_self_types_pointers_and_wrappers.rs b/src/test/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
similarity index 99%
rename from src/test/run-pass/arbitrary_self_types_pointers_and_wrappers.rs
rename to src/test/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
index 6904c29111ee3..65fec3becacee 100644
--- a/src/test/run-pass/arbitrary_self_types_pointers_and_wrappers.rs
+++ b/src/test/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
@@ -1,3 +1,4 @@
+// run-pass
 #![feature(arbitrary_self_types, unsize, coerce_unsized, dispatch_from_dyn)]
 #![feature(rustc_attrs)]
 
diff --git a/src/test/run-pass/self/arbitrary_self_types_raw_pointer_struct.rs b/src/test/ui/self/arbitrary_self_types_raw_pointer_struct.rs
similarity index 100%
rename from src/test/run-pass/self/arbitrary_self_types_raw_pointer_struct.rs
rename to src/test/ui/self/arbitrary_self_types_raw_pointer_struct.rs
diff --git a/src/test/run-pass/self/arbitrary_self_types_raw_pointer_trait.rs b/src/test/ui/self/arbitrary_self_types_raw_pointer_trait.rs
similarity index 100%
rename from src/test/run-pass/self/arbitrary_self_types_raw_pointer_trait.rs
rename to src/test/ui/self/arbitrary_self_types_raw_pointer_trait.rs
diff --git a/src/test/run-pass/self/arbitrary_self_types_silly.rs b/src/test/ui/self/arbitrary_self_types_silly.rs
similarity index 100%
rename from src/test/run-pass/self/arbitrary_self_types_silly.rs
rename to src/test/ui/self/arbitrary_self_types_silly.rs
diff --git a/src/test/run-pass/arbitrary_self_types_stdlib_pointers.rs b/src/test/ui/self/arbitrary_self_types_stdlib_pointers.rs
similarity index 99%
rename from src/test/run-pass/arbitrary_self_types_stdlib_pointers.rs
rename to src/test/ui/self/arbitrary_self_types_stdlib_pointers.rs
index 9f6a647a07b31..29563fbbd8676 100644
--- a/src/test/run-pass/arbitrary_self_types_stdlib_pointers.rs
+++ b/src/test/ui/self/arbitrary_self_types_stdlib_pointers.rs
@@ -1,3 +1,4 @@
+// run-pass
 #![feature(arbitrary_self_types)]
 #![feature(rustc_attrs)]
 
diff --git a/src/test/run-pass/self/arbitrary_self_types_struct.rs b/src/test/ui/self/arbitrary_self_types_struct.rs
similarity index 100%
rename from src/test/run-pass/self/arbitrary_self_types_struct.rs
rename to src/test/ui/self/arbitrary_self_types_struct.rs
diff --git a/src/test/run-pass/self/arbitrary_self_types_trait.rs b/src/test/ui/self/arbitrary_self_types_trait.rs
similarity index 100%
rename from src/test/run-pass/self/arbitrary_self_types_trait.rs
rename to src/test/ui/self/arbitrary_self_types_trait.rs
diff --git a/src/test/run-pass/self/arbitrary_self_types_unsized_struct.rs b/src/test/ui/self/arbitrary_self_types_unsized_struct.rs
similarity index 100%
rename from src/test/run-pass/self/arbitrary_self_types_unsized_struct.rs
rename to src/test/ui/self/arbitrary_self_types_unsized_struct.rs
diff --git a/src/test/run-pass/self/auxiliary/explicit_self_xcrate.rs b/src/test/ui/self/auxiliary/explicit_self_xcrate.rs
similarity index 100%
rename from src/test/run-pass/self/auxiliary/explicit_self_xcrate.rs
rename to src/test/ui/self/auxiliary/explicit_self_xcrate.rs
diff --git a/src/test/run-pass/self/builtin-superkinds-self-type.rs b/src/test/ui/self/builtin-superkinds-self-type.rs
similarity index 100%
rename from src/test/run-pass/self/builtin-superkinds-self-type.rs
rename to src/test/ui/self/builtin-superkinds-self-type.rs
diff --git a/src/test/run-pass/self/by-value-self-in-mut-slot.rs b/src/test/ui/self/by-value-self-in-mut-slot.rs
similarity index 100%
rename from src/test/run-pass/self/by-value-self-in-mut-slot.rs
rename to src/test/ui/self/by-value-self-in-mut-slot.rs
diff --git a/src/test/run-pass/self/explicit-self-closures.rs b/src/test/ui/self/explicit-self-closures.rs
similarity index 94%
rename from src/test/run-pass/self/explicit-self-closures.rs
rename to src/test/ui/self/explicit-self-closures.rs
index 61be98fe3d3cd..1217823da116e 100644
--- a/src/test/run-pass/self/explicit-self-closures.rs
+++ b/src/test/ui/self/explicit-self-closures.rs
@@ -1,4 +1,4 @@
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Test to make sure that explicit self params work inside closures
 
diff --git a/src/test/run-pass/self/explicit-self-generic.rs b/src/test/ui/self/explicit-self-generic.rs
similarity index 100%
rename from src/test/run-pass/self/explicit-self-generic.rs
rename to src/test/ui/self/explicit-self-generic.rs
diff --git a/src/test/run-pass/self/explicit-self-objects-uniq.rs b/src/test/ui/self/explicit-self-objects-uniq.rs
similarity index 100%
rename from src/test/run-pass/self/explicit-self-objects-uniq.rs
rename to src/test/ui/self/explicit-self-objects-uniq.rs
diff --git a/src/test/run-pass/self/explicit-self.rs b/src/test/ui/self/explicit-self.rs
similarity index 100%
rename from src/test/run-pass/self/explicit-self.rs
rename to src/test/ui/self/explicit-self.rs
diff --git a/src/test/run-pass/self/explicit_self_xcrate_exe.rs b/src/test/ui/self/explicit_self_xcrate_exe.rs
similarity index 100%
rename from src/test/run-pass/self/explicit_self_xcrate_exe.rs
rename to src/test/ui/self/explicit_self_xcrate_exe.rs
diff --git a/src/test/run-pass/self/move-self.rs b/src/test/ui/self/move-self.rs
similarity index 100%
rename from src/test/run-pass/self/move-self.rs
rename to src/test/ui/self/move-self.rs
diff --git a/src/test/run-pass/self/object-safety-sized-self-by-value-self.rs b/src/test/ui/self/object-safety-sized-self-by-value-self.rs
similarity index 100%
rename from src/test/run-pass/self/object-safety-sized-self-by-value-self.rs
rename to src/test/ui/self/object-safety-sized-self-by-value-self.rs
diff --git a/src/test/run-pass/self/object-safety-sized-self-generic-method.rs b/src/test/ui/self/object-safety-sized-self-generic-method.rs
similarity index 100%
rename from src/test/run-pass/self/object-safety-sized-self-generic-method.rs
rename to src/test/ui/self/object-safety-sized-self-generic-method.rs
diff --git a/src/test/run-pass/self/object-safety-sized-self-return-Self.rs b/src/test/ui/self/object-safety-sized-self-return-Self.rs
similarity index 100%
rename from src/test/run-pass/self/object-safety-sized-self-return-Self.rs
rename to src/test/ui/self/object-safety-sized-self-return-Self.rs
diff --git a/src/test/run-pass/self/self-impl.rs b/src/test/ui/self/self-impl-2.rs
similarity index 100%
rename from src/test/run-pass/self/self-impl.rs
rename to src/test/ui/self/self-impl-2.rs
diff --git a/src/test/run-pass/self/self-in-mut-slot-default-method.rs b/src/test/ui/self/self-in-mut-slot-default-method.rs
similarity index 100%
rename from src/test/run-pass/self/self-in-mut-slot-default-method.rs
rename to src/test/ui/self/self-in-mut-slot-default-method.rs
diff --git a/src/test/run-pass/self/self-in-mut-slot-immediate-value.rs b/src/test/ui/self/self-in-mut-slot-immediate-value.rs
similarity index 100%
rename from src/test/run-pass/self/self-in-mut-slot-immediate-value.rs
rename to src/test/ui/self/self-in-mut-slot-immediate-value.rs
diff --git a/src/test/run-pass/self/self-in-typedefs.rs b/src/test/ui/self/self-in-typedefs.rs
similarity index 96%
rename from src/test/run-pass/self/self-in-typedefs.rs
rename to src/test/ui/self/self-in-typedefs.rs
index 9c0906013fafc..e4fe7324ef3a6 100644
--- a/src/test/run-pass/self/self-in-typedefs.rs
+++ b/src/test/ui/self/self-in-typedefs.rs
@@ -1,4 +1,4 @@
-// run-pass
+// compile-pass
 
 #![feature(untagged_unions)]
 
diff --git a/src/test/run-pass/self/self-re-assign.rs b/src/test/ui/self/self-re-assign.rs
similarity index 100%
rename from src/test/run-pass/self/self-re-assign.rs
rename to src/test/ui/self/self-re-assign.rs
diff --git a/src/test/run-pass/self/self-shadowing-import.rs b/src/test/ui/self/self-shadowing-import.rs
similarity index 100%
rename from src/test/run-pass/self/self-shadowing-import.rs
rename to src/test/ui/self/self-shadowing-import.rs
diff --git a/src/test/run-pass/self/self-type-param.rs b/src/test/ui/self/self-type-param.rs
similarity index 93%
rename from src/test/run-pass/self/self-type-param.rs
rename to src/test/ui/self/self-type-param.rs
index 6deae5f2d12f4..57e01caa692de 100644
--- a/src/test/run-pass/self/self-type-param.rs
+++ b/src/test/ui/self/self-type-param.rs
@@ -1,4 +1,4 @@
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/self/string-self-append.rs b/src/test/ui/self/string-self-append.rs
similarity index 100%
rename from src/test/run-pass/self/string-self-append.rs
rename to src/test/ui/self/string-self-append.rs
diff --git a/src/test/run-pass/self/ufcs-explicit-self.rs b/src/test/ui/self/ufcs-explicit-self.rs
similarity index 100%
rename from src/test/run-pass/self/ufcs-explicit-self.rs
rename to src/test/ui/self/ufcs-explicit-self.rs
diff --git a/src/test/run-pass/self/uniq-self-in-mut-slot.rs b/src/test/ui/self/uniq-self-in-mut-slot.rs
similarity index 100%
rename from src/test/run-pass/self/uniq-self-in-mut-slot.rs
rename to src/test/ui/self/uniq-self-in-mut-slot.rs
diff --git a/src/test/run-pass/self/where-for-self.rs b/src/test/ui/self/where-for-self.rs
similarity index 100%
rename from src/test/run-pass/self/where-for-self.rs
rename to src/test/ui/self/where-for-self.rs