diff --git a/src/test/run-pass/attr-before-view-item.rs b/src/test/ui/attributes/attr-before-view-item.rs
similarity index 88%
rename from src/test/run-pass/attr-before-view-item.rs
rename to src/test/ui/attributes/attr-before-view-item.rs
index 3aa2ee77ee5..fc040bd1a5d 100644
--- a/src/test/run-pass/attr-before-view-item.rs
+++ b/src/test/ui/attributes/attr-before-view-item.rs
@@ -1,6 +1,6 @@
+// compile-pass
 // pretty-expanded FIXME #23616
 
-#![allow(unused)]
 #![feature(rustc_attrs)]
 #![feature(test)]
 
diff --git a/src/test/run-pass/attr-before-view-item2.rs b/src/test/ui/attributes/attr-before-view-item2.rs
similarity index 89%
rename from src/test/run-pass/attr-before-view-item2.rs
rename to src/test/ui/attributes/attr-before-view-item2.rs
index 2b3a09b5e6f..c7fad3802e9 100644
--- a/src/test/run-pass/attr-before-view-item2.rs
+++ b/src/test/ui/attributes/attr-before-view-item2.rs
@@ -1,6 +1,6 @@
+// compile-pass
 // pretty-expanded FIXME #23616
 
-#![allow(unused)]
 #![feature(rustc_attrs)]
 #![feature(test)]
 
diff --git a/src/test/run-pass/attr-mix-new.rs b/src/test/ui/attributes/attr-mix-new.rs
similarity index 87%
rename from src/test/run-pass/attr-mix-new.rs
rename to src/test/ui/attributes/attr-mix-new.rs
index ca53bfacf91..d9cb5510960 100644
--- a/src/test/run-pass/attr-mix-new.rs
+++ b/src/test/ui/attributes/attr-mix-new.rs
@@ -1,6 +1,6 @@
+// compile-pass
 // pretty-expanded FIXME #23616
 
-#![allow(unused)]
 #![feature(rustc_attrs)]
 
 #[rustc_dummy(bar)]
diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.rs b/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.rs
similarity index 100%
rename from src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.rs
rename to src/test/ui/attributes/attrs-with-no-formal-in-generics-1.rs
diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.stderr b/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.stderr
similarity index 100%
rename from src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.stderr
rename to src/test/ui/attributes/attrs-with-no-formal-in-generics-1.stderr
diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.rs b/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.rs
similarity index 100%
rename from src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.rs
rename to src/test/ui/attributes/attrs-with-no-formal-in-generics-2.rs
diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.stderr b/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.stderr
similarity index 100%
rename from src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.stderr
rename to src/test/ui/attributes/attrs-with-no-formal-in-generics-2.stderr
diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.rs b/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.rs
similarity index 100%
rename from src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.rs
rename to src/test/ui/attributes/attrs-with-no-formal-in-generics-3.rs
diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.stderr b/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.stderr
similarity index 100%
rename from src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.stderr
rename to src/test/ui/attributes/attrs-with-no-formal-in-generics-3.stderr
diff --git a/src/test/run-pass/structs-enums/class-attributes-1.rs b/src/test/ui/attributes/class-attributes-1.rs
similarity index 95%
rename from src/test/run-pass/structs-enums/class-attributes-1.rs
rename to src/test/ui/attributes/class-attributes-1.rs
index 62cd10ef3bf..7808367f2c1 100644
--- a/src/test/run-pass/structs-enums/class-attributes-1.rs
+++ b/src/test/ui/attributes/class-attributes-1.rs
@@ -1,6 +1,6 @@
+// compile-pass
 // pp-exact - Make sure we actually print the attributes
 
-#![allow(unused)]
 #![feature(rustc_attrs)]
 
 struct Cat {
diff --git a/src/test/run-pass/structs-enums/class-attributes-2.rs b/src/test/ui/attributes/class-attributes-2.rs
similarity index 96%
rename from src/test/run-pass/structs-enums/class-attributes-2.rs
rename to src/test/ui/attributes/class-attributes-2.rs
index 5026ce84ad9..348c70f35c3 100644
--- a/src/test/run-pass/structs-enums/class-attributes-2.rs
+++ b/src/test/ui/attributes/class-attributes-2.rs
@@ -1,4 +1,5 @@
-#![allow(unused)]
+// compile-pass
+
 #![feature(rustc_attrs)]
 
 struct Cat {
diff --git a/src/test/run-pass/item-attributes.rs b/src/test/ui/attributes/item-attributes.rs
similarity index 99%
rename from src/test/run-pass/item-attributes.rs
rename to src/test/ui/attributes/item-attributes.rs
index 1801fa05f85..72c9a35dc07 100644
--- a/src/test/run-pass/item-attributes.rs
+++ b/src/test/ui/attributes/item-attributes.rs
@@ -2,7 +2,8 @@
 // for completeness since .rs files linked from .rc files support this
 // notation to specify their module's attributes
 
-#![allow(unused)]
+// compile-pass
+
 #![feature(rustc_attrs)]
 
 #![rustc_dummy = "val"]
diff --git a/src/test/run-pass/methods/method-attributes.rs b/src/test/ui/attributes/method-attributes.rs
similarity index 95%
rename from src/test/run-pass/methods/method-attributes.rs
rename to src/test/ui/attributes/method-attributes.rs
index 8a4ce49ffb6..2d608acc71f 100644
--- a/src/test/run-pass/methods/method-attributes.rs
+++ b/src/test/ui/attributes/method-attributes.rs
@@ -1,7 +1,7 @@
+// compile-pass
 // pp-exact - Make sure we print all the attributes
 // pretty-expanded FIXME #23616
 
-#![allow(unused)]
 #![feature(rustc_attrs)]
 
 #[rustc_dummy]
diff --git a/src/test/run-pass/variant-attributes.rs b/src/test/ui/attributes/variant-attributes.rs
similarity index 97%
rename from src/test/run-pass/variant-attributes.rs
rename to src/test/ui/attributes/variant-attributes.rs
index 25a214cea82..a910340f4a0 100644
--- a/src/test/run-pass/variant-attributes.rs
+++ b/src/test/ui/attributes/variant-attributes.rs
@@ -1,7 +1,7 @@
+// compile-pass
 // pp-exact - Make sure we actually print the attributes
 // pretty-expanded FIXME #23616
 
-#![allow(unused)]
 #![allow(non_camel_case_types)]
 #![feature(rustc_attrs)]