diff --git a/tests/ui/attributes/attr-before-view-item.rs b/tests/ui/attributes/attr-before-view-item.rs
index 19874052e3368..5cc80f4bf1a08 100644
--- a/tests/ui/attributes/attr-before-view-item.rs
+++ b/tests/ui/attributes/attr-before-view-item.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 #![feature(rustc_attrs)]
 #![feature(test)]
diff --git a/tests/ui/attributes/attr-before-view-item2.rs b/tests/ui/attributes/attr-before-view-item2.rs
index e58063a13ab0a..eb40b0e6903e8 100644
--- a/tests/ui/attributes/attr-before-view-item2.rs
+++ b/tests/ui/attributes/attr-before-view-item2.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 #![feature(rustc_attrs)]
 #![feature(test)]
diff --git a/tests/ui/attributes/attr-mix-new.rs b/tests/ui/attributes/attr-mix-new.rs
index 3ddb1d0d7335c..b03f3cc25ddd7 100644
--- a/tests/ui/attributes/attr-mix-new.rs
+++ b/tests/ui/attributes/attr-mix-new.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/attributes/class-attributes-1.rs b/tests/ui/attributes/class-attributes-1.rs
deleted file mode 100644
index 0c8f5f324a3ef..0000000000000
--- a/tests/ui/attributes/class-attributes-1.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
-//@ pp-exact - Make sure we actually print the attributes
-
-#![feature(rustc_attrs)]
-
-struct Cat {
-    name: String,
-}
-
-impl Drop for Cat {
-    #[rustc_dummy]
-    fn drop(&mut self) { println!("{} landed on hir feet" , self . name); }
-}
-
-
-#[rustc_dummy]
-fn cat(name: String) -> Cat { Cat{name: name,} }
-
-fn main() { let _kitty = cat("Spotty".to_string()); }
diff --git a/tests/ui/attributes/class-attributes-2.rs b/tests/ui/attributes/class-attributes-2.rs
deleted file mode 100644
index 0ec0cd225969b..0000000000000
--- a/tests/ui/attributes/class-attributes-2.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
-
-#![feature(rustc_attrs)]
-
-struct Cat {
-    name: String,
-}
-
-impl Drop for Cat {
-    #[rustc_dummy]
-    /**
-       Actually, cats don't always land on their feet when you drop them.
-    */
-    fn drop(&mut self) {
-        println!("{} landed on hir feet", self.name);
-    }
-}
-
-#[rustc_dummy]
-/**
-Maybe it should technically be a kitten_maker.
-*/
-fn cat(name: String) -> Cat {
-    Cat {
-        name: name
-    }
-}
-
-fn main() {
-    let _kitty = cat("Spotty".to_string());
-}
diff --git a/tests/ui/attributes/method-attributes.rs b/tests/ui/attributes/method-attributes.rs
index ded72d2457b1c..3d7f6f2149882 100644
--- a/tests/ui/attributes/method-attributes.rs
+++ b/tests/ui/attributes/method-attributes.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 //@ pp-exact - Make sure we print all the attributes
 
 #![feature(rustc_attrs)]
diff --git a/tests/ui/attributes/unrestricted-attribute-tokens.rs b/tests/ui/attributes/unrestricted-attribute-tokens.rs
index 9f91afb59bf81..9a0bb21c79666 100644
--- a/tests/ui/attributes/unrestricted-attribute-tokens.rs
+++ b/tests/ui/attributes/unrestricted-attribute-tokens.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/attributes/variant-attributes.rs b/tests/ui/attributes/variant-attributes.rs
index a08856aa278d3..7020bdaf2557e 100644
--- a/tests/ui/attributes/variant-attributes.rs
+++ b/tests/ui/attributes/variant-attributes.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 //@ pp-exact - Make sure we actually print the attributes
 
 #![allow(non_camel_case_types)]
diff --git a/tests/ui/conditional-compilation/cfg-attr-multi-false.rs b/tests/ui/conditional-compilation/cfg-attr-multi-false.rs
index 871c1b81acd26..b323bc6bef2ab 100644
--- a/tests/ui/conditional-compilation/cfg-attr-multi-false.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-false.rs
@@ -1,7 +1,7 @@
 // Test that cfg_attr doesn't emit any attributes when the
 // configuration variable is false. This mirrors `cfg-attr-multi-true.rs`
 
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 #![warn(unused_must_use)]
 
diff --git a/tests/ui/conditional-compilation/cfg-attr-multi-true.rs b/tests/ui/conditional-compilation/cfg-attr-multi-true.rs
index 24950c8d42341..f4ddc6c89bc3a 100644
--- a/tests/ui/conditional-compilation/cfg-attr-multi-true.rs
+++ b/tests/ui/conditional-compilation/cfg-attr-multi-true.rs
@@ -2,7 +2,7 @@
 // This is done by emitting two attributes that cause new warnings, and then
 // triggering those warnings.
 
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 #![warn(unused_must_use)]
 
diff --git a/tests/ui/range/range_traits-4.rs b/tests/ui/range/range_traits-4.rs
index 4241325e1d9af..39948bebe0be6 100644
--- a/tests/ui/range/range_traits-4.rs
+++ b/tests/ui/range/range_traits-4.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 use std::ops::*;
 
diff --git a/tests/ui/range/range_traits-5.rs b/tests/ui/range/range_traits-5.rs
index a15ea6a711296..0c737c964bcde 100644
--- a/tests/ui/range/range_traits-5.rs
+++ b/tests/ui/range/range_traits-5.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 use std::ops::*;
 
diff --git a/tests/ui/range/range_traits-7.rs b/tests/ui/range/range_traits-7.rs
index 95e101b0988cf..2648a7f023deb 100644
--- a/tests/ui/range/range_traits-7.rs
+++ b/tests/ui/range/range_traits-7.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 use std::ops::*;
 
diff --git a/tests/ui/reachable/expr_andand.rs b/tests/ui/reachable/expr_andand.rs
index 40a8c72e52249..f623aa55a94b4 100644
--- a/tests/ui/reachable/expr_andand.rs
+++ b/tests/ui/reachable/expr_andand.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/ui/reachable/expr_oror.rs b/tests/ui/reachable/expr_oror.rs
index 4ee4b80744285..c5426b55b002a 100644
--- a/tests/ui/reachable/expr_oror.rs
+++ b/tests/ui/reachable/expr_oror.rs
@@ -1,4 +1,4 @@
-//@ build-pass (FIXME(62277): could be check-pass?)
+//@ check-pass
 
 #![allow(unused_variables)]
 #![allow(dead_code)]