diff --git a/src/test/run-pass/issues/issue-10853.rs b/src/test/ui/issues/issue-10853.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-10853.rs
rename to src/test/ui/issues/issue-10853.rs
index 4a67d256f5de..6e2aea4d1ab4 100644
--- a/src/test/run-pass/issues/issue-10853.rs
+++ b/src/test/ui/issues/issue-10853.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #![deny(missing_docs)]
diff --git a/src/test/run-pass/issues/issue-1251.rs b/src/test/ui/issues/issue-1251.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-1251.rs
rename to src/test/ui/issues/issue-1251.rs
index f9d48b8c835a..b42404ce7739 100644
--- a/src/test/run-pass/issues/issue-1251.rs
+++ b/src/test/ui/issues/issue-1251.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_attributes)]
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-14901.rs b/src/test/ui/issues/issue-14901.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-14901.rs
rename to src/test/ui/issues/issue-14901.rs
index 7612c5bc8557..18a6cfde3bdf 100644
--- a/src/test/run-pass/issues/issue-14901.rs
+++ b/src/test/ui/issues/issue-14901.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 pub trait Reader {}
 
 enum Wrapper<'a> {
diff --git a/src/test/run-pass/issues/issue-14936.rs b/src/test/ui/issues/issue-14936.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-14936.rs
rename to src/test/ui/issues/issue-14936.rs
index 4249a83e3c22..d90814daf5f2 100644
--- a/src/test/run-pass/issues/issue-14936.rs
+++ b/src/test/ui/issues/issue-14936.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_macros)]
 #![allow(dead_code)]
 #![feature(asm)]
diff --git a/src/test/run-pass/issues/issue-1821.rs b/src/test/ui/issues/issue-1821.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-1821.rs
rename to src/test/ui/issues/issue-1821.rs
index d37b6df6e34a..8518547ac255 100644
--- a/src/test/run-pass/issues/issue-1821.rs
+++ b/src/test/ui/issues/issue-1821.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-1866.rs b/src/test/ui/issues/issue-1866.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-1866.rs
rename to src/test/ui/issues/issue-1866.rs
index f27d8032dd66..eb670b4a5828 100644
--- a/src/test/run-pass/issues/issue-1866.rs
+++ b/src/test/ui/issues/issue-1866.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-18988.rs b/src/test/ui/issues/issue-18988.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-18988.rs
rename to src/test/ui/issues/issue-18988.rs
index 691d41174303..6aadef691387 100644
--- a/src/test/run-pass/issues/issue-18988.rs
+++ b/src/test/ui/issues/issue-18988.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 pub trait Foo : Send { }
 
diff --git a/src/test/run-pass/issues/issue-22777.rs b/src/test/ui/issues/issue-22777.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-22777.rs
rename to src/test/ui/issues/issue-22777.rs
index 92ad7a43d4d1..c97c10073e39 100644
--- a/src/test/run-pass/issues/issue-22777.rs
+++ b/src/test/ui/issues/issue-22777.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // This test is reduced from libsyntax.  It is just checking that we
 // can successfully deal with a "deep" structure, which the drop-check
 // was hitting a recursion limit on at one point.
diff --git a/src/test/run-pass/issues/issue-2311-2.rs b/src/test/ui/issues/issue-2311-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2311-2.rs
rename to src/test/ui/issues/issue-2311-2.rs
index 493ff6f01cbe..cc6376eb6689 100644
--- a/src/test/run-pass/issues/issue-2311-2.rs
+++ b/src/test/ui/issues/issue-2311-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-2311.rs b/src/test/ui/issues/issue-2311.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2311.rs
rename to src/test/ui/issues/issue-2311.rs
index 816754c4617e..77e014e27859 100644
--- a/src/test/run-pass/issues/issue-2311.rs
+++ b/src/test/ui/issues/issue-2311.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(non_camel_case_types)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-2312.rs b/src/test/ui/issues/issue-2312.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2312.rs
rename to src/test/ui/issues/issue-2312.rs
index 9975f8a5aa72..0de460a30ab4 100644
--- a/src/test/run-pass/issues/issue-2312.rs
+++ b/src/test/ui/issues/issue-2312.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-24161.rs b/src/test/ui/issues/issue-24161.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-24161.rs
rename to src/test/ui/issues/issue-24161.rs
index 8bb88be7c562..fb50f4dc8db0 100644
--- a/src/test/run-pass/issues/issue-24161.rs
+++ b/src/test/ui/issues/issue-24161.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #[derive(Copy,Clone)]
 struct Functions {
diff --git a/src/test/run-pass/issues/issue-2487-a.rs b/src/test/ui/issues/issue-2487-a.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-2487-a.rs
rename to src/test/ui/issues/issue-2487-a.rs
index 6bd1757f64ce..bff4eb92806d 100644
--- a/src/test/run-pass/issues/issue-2487-a.rs
+++ b/src/test/ui/issues/issue-2487-a.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-2502.rs b/src/test/ui/issues/issue-2502.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-2502.rs
rename to src/test/ui/issues/issue-2502.rs
index 938a8e290444..24ba19c4b7f2 100644
--- a/src/test/run-pass/issues/issue-2502.rs
+++ b/src/test/ui/issues/issue-2502.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/issues/issue-2611-3.rs b/src/test/ui/issues/issue-2611-3.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2611-3.rs
rename to src/test/ui/issues/issue-2611-3.rs
index 99fd1a727f55..29a8200104ac 100644
--- a/src/test/run-pass/issues/issue-2611-3.rs
+++ b/src/test/ui/issues/issue-2611-3.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Tests that impls are allowed to have looser, more permissive bounds
 // than the traits require.
diff --git a/src/test/run-pass/issues/issue-2748-a.rs b/src/test/ui/issues/issue-2748-a.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-2748-a.rs
rename to src/test/ui/issues/issue-2748-a.rs
index db7b46a4dc5a..8c8d3c557fc7 100644
--- a/src/test/run-pass/issues/issue-2748-a.rs
+++ b/src/test/ui/issues/issue-2748-a.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_snake_case)]
 
diff --git a/src/test/run-pass/issues/issue-2804-2.rs b/src/test/ui/issues/issue-2804-2.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-2804-2.rs
rename to src/test/ui/issues/issue-2804-2.rs
index 3e64d78ba027..1894d50ed992 100644
--- a/src/test/run-pass/issues/issue-2804-2.rs
+++ b/src/test/ui/issues/issue-2804-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // Minimized version of issue-2804.rs. Both check that callee IDs don't
 // clobber the previous node ID in a macro expr
diff --git a/src/test/run-pass/issues/issue-2904.rs b/src/test/ui/issues/issue-2904.rs
similarity index 99%
rename from src/test/run-pass/issues/issue-2904.rs
rename to src/test/ui/issues/issue-2904.rs
index ab40c2e0bbec..2e91979a517d 100644
--- a/src/test/run-pass/issues/issue-2904.rs
+++ b/src/test/ui/issues/issue-2904.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_mut)]
diff --git a/src/test/run-pass/issues/issue-3149.rs b/src/test/ui/issues/issue-3149.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-3149.rs
rename to src/test/ui/issues/issue-3149.rs
index 4eb3378a089e..507af2f6c2a4 100644
--- a/src/test/run-pass/issues/issue-3149.rs
+++ b/src/test/ui/issues/issue-3149.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_snake_case)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-3424.rs b/src/test/ui/issues/issue-3424.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-3424.rs
rename to src/test/ui/issues/issue-3424.rs
index cf1b00226617..7bf0c4393c30 100644
--- a/src/test/run-pass/issues/issue-3424.rs
+++ b/src/test/ui/issues/issue-3424.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 // rustc --test ignores2.rs && ./ignores2
diff --git a/src/test/run-pass/issues/issue-3563-2.rs b/src/test/ui/issues/issue-3563-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3563-2.rs
rename to src/test/ui/issues/issue-3563-2.rs
index 534bec59018e..916adc83223a 100644
--- a/src/test/run-pass/issues/issue-3563-2.rs
+++ b/src/test/ui/issues/issue-3563-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait Canvas {
diff --git a/src/test/run-pass/issues/issue-3609.rs b/src/test/ui/issues/issue-3609.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-3609.rs
rename to src/test/ui/issues/issue-3609.rs
index abbaf630e78e..070b2e538d7b 100644
--- a/src/test/run-pass/issues/issue-3609.rs
+++ b/src/test/ui/issues/issue-3609.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_mut)]
diff --git a/src/test/run-pass/issues/issue-37733.rs b/src/test/ui/issues/issue-37733.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-37733.rs
rename to src/test/ui/issues/issue-37733.rs
index a982cae26212..04a4c19785b5 100644
--- a/src/test/run-pass/issues/issue-37733.rs
+++ b/src/test/ui/issues/issue-37733.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 type A = for<> fn();
 
diff --git a/src/test/run-pass/issues/issue-3874.rs b/src/test/ui/issues/issue-3874.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3874.rs
rename to src/test/ui/issues/issue-3874.rs
index 2b1e25d2a1a7..791a4bb8af0a 100644
--- a/src/test/run-pass/issues/issue-3874.rs
+++ b/src/test/ui/issues/issue-3874.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-3888-2.rs b/src/test/ui/issues/issue-3888-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3888-2.rs
rename to src/test/ui/issues/issue-3888-2.rs
index 2d702dac0285..79b206799ad2 100644
--- a/src/test/run-pass/issues/issue-3888-2.rs
+++ b/src/test/ui/issues/issue-3888-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-3979-2.rs b/src/test/ui/issues/issue-3979-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3979-2.rs
rename to src/test/ui/issues/issue-3979-2.rs
index 9b8e5817c6c1..adfd5873ea77 100644
--- a/src/test/run-pass/issues/issue-3979-2.rs
+++ b/src/test/ui/issues/issue-3979-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 trait A {
diff --git a/src/test/run-pass/issues/issue-3991.rs b/src/test/ui/issues/issue-3991.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-3991.rs
rename to src/test/ui/issues/issue-3991.rs
index 9028066cfacd..90fa1f8c3e09 100644
--- a/src/test/run-pass/issues/issue-3991.rs
+++ b/src/test/ui/issues/issue-3991.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-4025.rs b/src/test/ui/issues/issue-4025.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-4025.rs
rename to src/test/ui/issues/issue-4025.rs
index 41af0826c00a..470dd1e430f9 100644
--- a/src/test/run-pass/issues/issue-4025.rs
+++ b/src/test/ui/issues/issue-4025.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(unused_mut)]
 /*
diff --git a/src/test/run-pass/issues/issue-4464.rs b/src/test/ui/issues/issue-4464.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-4464.rs
rename to src/test/ui/issues/issue-4464.rs
index fda063e8ddd2..a1b2040450ad 100644
--- a/src/test/run-pass/issues/issue-4464.rs
+++ b/src/test/ui/issues/issue-4464.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-4830.rs b/src/test/ui/issues/issue-4830.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-4830.rs
rename to src/test/ui/issues/issue-4830.rs
index 5140162ae435..274305dfa78e 100644
--- a/src/test/run-pass/issues/issue-4830.rs
+++ b/src/test/ui/issues/issue-4830.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/issues/issue-5353.rs b/src/test/ui/issues/issue-5353.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-5353.rs
rename to src/test/ui/issues/issue-5353.rs
index d9d078313316..0c5de871f098 100644
--- a/src/test/run-pass/issues/issue-5353.rs
+++ b/src/test/ui/issues/issue-5353.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-5572.rs b/src/test/ui/issues/issue-5572.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5572.rs
rename to src/test/ui/issues/issue-5572.rs
index 02f12a0303a5..90465668d810 100644
--- a/src/test/run-pass/issues/issue-5572.rs
+++ b/src/test/ui/issues/issue-5572.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-5754.rs b/src/test/ui/issues/issue-5754.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5754.rs
rename to src/test/ui/issues/issue-5754.rs
index 9b9026304598..d60edcad0db6 100644
--- a/src/test/run-pass/issues/issue-5754.rs
+++ b/src/test/ui/issues/issue-5754.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
 
diff --git a/src/test/run-pass/issues/issue-5884.rs b/src/test/ui/issues/issue-5884.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5884.rs
rename to src/test/ui/issues/issue-5884.rs
index 82d87d9d270a..d0c898e3f36b 100644
--- a/src/test/run-pass/issues/issue-5884.rs
+++ b/src/test/ui/issues/issue-5884.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-5900.rs b/src/test/ui/issues/issue-5900.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5900.rs
rename to src/test/ui/issues/issue-5900.rs
index edb4ead53e42..4dc5a6123883 100644
--- a/src/test/run-pass/issues/issue-5900.rs
+++ b/src/test/ui/issues/issue-5900.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-5950.rs b/src/test/ui/issues/issue-5950.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-5950.rs
rename to src/test/ui/issues/issue-5950.rs
index 239f96804139..6cdd36efaa71 100644
--- a/src/test/run-pass/issues/issue-5950.rs
+++ b/src/test/ui/issues/issue-5950.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-6341.rs b/src/test/ui/issues/issue-6341.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-6341.rs
rename to src/test/ui/issues/issue-6341.rs
index ca79e304b15f..758e33536bd3 100644
--- a/src/test/run-pass/issues/issue-6341.rs
+++ b/src/test/ui/issues/issue-6341.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 #[derive(PartialEq)]
diff --git a/src/test/run-pass/issues/issue-6470.rs b/src/test/ui/issues/issue-6470.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-6470.rs
rename to src/test/ui/issues/issue-6470.rs
index a23a6532b155..00eb3b6348d3 100644
--- a/src/test/run-pass/issues/issue-6470.rs
+++ b/src/test/ui/issues/issue-6470.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
 
diff --git a/src/test/run-pass/issues/issue-6557.rs b/src/test/ui/issues/issue-6557.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-6557.rs
rename to src/test/ui/issues/issue-6557.rs
index 886d13c4c6f1..ddec8b3f9345 100644
--- a/src/test/run-pass/issues/issue-6557.rs
+++ b/src/test/ui/issues/issue-6557.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-6898.rs b/src/test/ui/issues/issue-6898.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-6898.rs
rename to src/test/ui/issues/issue-6898.rs
index b9a3a24585b5..20174f241a40 100644
--- a/src/test/run-pass/issues/issue-6898.rs
+++ b/src/test/ui/issues/issue-6898.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 // pretty-expanded FIXME #23616
 
 use std::mem;
diff --git a/src/test/run-pass/issues/issue-7607-2.rs b/src/test/ui/issues/issue-7607-2.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-7607-2.rs
rename to src/test/ui/issues/issue-7607-2.rs
index fa97eae7cb33..9c05717c1d71 100644
--- a/src/test/run-pass/issues/issue-7607-2.rs
+++ b/src/test/ui/issues/issue-7607-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs b/src/test/ui/issues/issue-7673-cast-generically-implemented-trait.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs
rename to src/test/ui/issues/issue-7673-cast-generically-implemented-trait.rs
index 6e5a6c551ebf..d3af62e8836c 100644
--- a/src/test/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs
+++ b/src/test/ui/issues/issue-7673-cast-generically-implemented-trait.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs b/src/test/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
rename to src/test/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
index 9ddc63a208ae..27859e1a2aef 100644
--- a/src/test/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
+++ b/src/test/ui/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-8398.rs b/src/test/ui/issues/issue-8398.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-8398.rs
rename to src/test/ui/issues/issue-8398.rs
index 2458e91daeb8..36c24be5fce3 100644
--- a/src/test/run-pass/issues/issue-8398.rs
+++ b/src/test/ui/issues/issue-8398.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-8578.rs b/src/test/ui/issues/issue-8578.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-8578.rs
rename to src/test/ui/issues/issue-8578.rs
index 4cf39e3e5f05..0c5cbf24700a 100644
--- a/src/test/run-pass/issues/issue-8578.rs
+++ b/src/test/ui/issues/issue-8578.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
diff --git a/src/test/run-pass/issues/issue-9110.rs b/src/test/ui/issues/issue-9110.rs
similarity index 97%
rename from src/test/run-pass/issues/issue-9110.rs
rename to src/test/ui/issues/issue-9110.rs
index 150df681ea4d..86314659fcbe 100644
--- a/src/test/run-pass/issues/issue-9110.rs
+++ b/src/test/ui/issues/issue-9110.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 #![allow(non_snake_case)]
diff --git a/src/test/run-pass/issues/issue-9719.rs b/src/test/ui/issues/issue-9719.rs
similarity index 98%
rename from src/test/run-pass/issues/issue-9719.rs
rename to src/test/ui/issues/issue-9719.rs
index f98eba1cfdf8..c3845dd61066 100644
--- a/src/test/run-pass/issues/issue-9719.rs
+++ b/src/test/ui/issues/issue-9719.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// run-pass
+// compile-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616