diff --git a/src/test/ui/asm/asm-bad-clobber.rs b/src/test/ui/asm/asm-bad-clobber.rs
index c2b54e37e399d9cc724b9af569013f729ea560cb..543eb2ac84263f70cf6ba80d336051b966d69e5f 100644
--- a/src/test/ui/asm/asm-bad-clobber.rs
+++ b/src/test/ui/asm/asm-bad-clobber.rs
@@ -21,11 +21,11 @@
 // ignore-mips
 // ignore-mips64
 
-#![feature(asm, rustc_attrs)]
+#![feature(asm)]
 
 #[cfg(any(target_arch = "x86",
           target_arch = "x86_64"))]
-#[rustc_error]
+
 pub fn main() {
     unsafe {
         // clobber formatted as register input/output
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
index f424e8872010f25d5d4414a5ff07d1e3d636f48f..ee6a61dca4add7a2649a8404f4f41fd5813cba4b 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
+++ b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
@@ -13,7 +13,7 @@
 
 // aux-build:coherence_copy_like_lib.rs
 
-#![feature(rustc_attrs)]
+
 
 extern crate coherence_copy_like_lib as lib;
 
@@ -26,5 +26,5 @@ impl<T: lib::MyCopy> MyTrait for T { }
 // Tuples are not fundamental.
 impl MyTrait for lib::MyFundamentalStruct<(MyType,)> { } //~ ERROR E0119
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/coherence/coherence_local_err_struct.rs b/src/test/ui/coherence/coherence_local_err_struct.rs
index 01f4c1cd8a5c9f311786dfd95be76214e572da04..72772a6efbd12055f5aed5ca003f23e5c46facc2 100644
--- a/src/test/ui/coherence/coherence_local_err_struct.rs
+++ b/src/test/ui/coherence/coherence_local_err_struct.rs
@@ -13,7 +13,7 @@
 
 // aux-build:coherence_copy_like_lib.rs
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 extern crate coherence_copy_like_lib as lib;
@@ -25,5 +25,5 @@ struct MyType { x: i32 }
 // MyStruct is not fundamental.
 impl lib::MyCopy for lib::MyStruct<MyType> { } //~ ERROR E0117
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/coherence/coherence_local_err_tuple.rs b/src/test/ui/coherence/coherence_local_err_tuple.rs
index 590f68cee59ef3fb9898f5e1a6822559344cf39e..88e98c7ce00117c7e19ba3e725f9b6ebeae8d001 100644
--- a/src/test/ui/coherence/coherence_local_err_tuple.rs
+++ b/src/test/ui/coherence/coherence_local_err_tuple.rs
@@ -13,7 +13,7 @@
 
 // aux-build:coherence_copy_like_lib.rs
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 extern crate coherence_copy_like_lib as lib;
@@ -25,5 +25,5 @@ struct MyType { x: i32 }
 // Tuples are not fundamental, so this is not a local impl.
 impl lib::MyCopy for (MyType,) { } //~ ERROR E0117
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute.rs b/src/test/ui/feature-gates/feature-gate-custom_attribute.rs
index ed8392ad7a3d1841a632fcfb1e8881d6db113807..4371de57776dffcc7f45653d86daea7db7863ac3 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_attribute.rs
+++ b/src/test/ui/feature-gates/feature-gate-custom_attribute.rs
@@ -10,7 +10,7 @@
 
 // Check that literals in attributes parse just fine.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 
@@ -29,5 +29,5 @@
 #[fake_doc(r"doc")] //~ ERROR attribute `fake_doc` is currently unknown
 struct Q {  }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs
index 7e9a4f82478bd707569997a432f814e1902e85df..cd0ba5e4a0a5946f41b573fbc2efd59215c60360 100644
--- a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs
+++ b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs
@@ -15,7 +15,7 @@
 
 #![allow(dead_code)]
 #![allow(unused_variables)]
-#![feature(rustc_attrs)]
+
 
 extern crate lifetime_bound_will_change_warning_lib as lib;
 
@@ -59,6 +59,6 @@ fn test3cc<'a>(x: &'a Box<Fn()+'static>) {
     lib::ref_obj(x)
 }
 
-#[rustc_error]
+
 fn main() {
 }
diff --git a/src/test/ui/on-unimplemented/multiple-impls.rs b/src/test/ui/on-unimplemented/multiple-impls.rs
index 539f5d63c0b3bcc5a7a9d8dd3b78a8fe9bcc179f..4467ac4356b6eb5fe77c11d464a8649e171e4df0 100644
--- a/src/test/ui/on-unimplemented/multiple-impls.rs
+++ b/src/test/ui/on-unimplemented/multiple-impls.rs
@@ -11,7 +11,7 @@
 // Test if the on_unimplemented message override works
 
 #![feature(on_unimplemented)]
-#![feature(rustc_attrs)]
+
 
 struct Foo<T>(T);
 struct Bar<T>(T);
@@ -38,7 +38,7 @@ fn index(&self, _index: Bar<usize>) -> &i32 {
     }
 }
 
-#[rustc_error]
+
 fn main() {
     Index::index(&[] as &[i32], 2u32);
     //~^ ERROR E0277
diff --git a/src/test/ui/on-unimplemented/on-impl.rs b/src/test/ui/on-unimplemented/on-impl.rs
index da56ae649934434e1dec568a3deaaf290ddcdb79..d104d1ed033eaa1b05c74a9cb55b3be89c7cff72 100644
--- a/src/test/ui/on-unimplemented/on-impl.rs
+++ b/src/test/ui/on-unimplemented/on-impl.rs
@@ -11,7 +11,7 @@
 // Test if the on_unimplemented message override works
 
 #![feature(on_unimplemented)]
-#![feature(rustc_attrs)]
+
 
 #[rustc_on_unimplemented = "invalid"]
 trait Index<Idx: ?Sized> {
@@ -27,7 +27,7 @@ fn index(&self, index: usize) -> &i32 {
     }
 }
 
-#[rustc_error]
+
 fn main() {
     Index::<u32>::index(&[1, 2, 3] as &[i32], 2u32);
     //~^ ERROR E0277
diff --git a/src/test/ui/on-unimplemented/slice-index.rs b/src/test/ui/on-unimplemented/slice-index.rs
index 7d67e89a78e36ab97b3afb7a6a8b2b1e7fe0a79e..79bb277d2c1e6fbbfcd67d74d5e298f1cea946c3 100644
--- a/src/test/ui/on-unimplemented/slice-index.rs
+++ b/src/test/ui/on-unimplemented/slice-index.rs
@@ -11,11 +11,11 @@
 // Test new Index error message for slices
 // ignore-tidy-linelength
 
-#![feature(rustc_attrs)]
+
 
 use std::ops::Index;
 
-#[rustc_error]
+
 fn main() {
     let x = &[1, 2, 3] as &[i32];
     x[1i32]; //~ ERROR E0277
diff --git a/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs b/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs
index ec0631a881a37bdaee81aaae3e1bcfd227f1d1f8..270e20f2e6dce4954bba4fc77bb283e9e512e8f6 100644
--- a/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs
+++ b/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs
@@ -12,7 +12,7 @@
 // "outlives" requirements. Issue #22246.
 
 #![allow(dead_code)]
-#![feature(rustc_attrs)]
+
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -64,6 +64,6 @@ fn with_assoc_sub<'a,'b>() {
     //~^ ERROR reference has a longer lifetime
 }
 
-#[rustc_error]
+
 fn main() {
 }
diff --git a/src/test/ui/retslot-cast.rs b/src/test/ui/retslot-cast.rs
index c5e26a26744df659742c97c58d2c5c46bfe3d2fa..a4681633326472a2527a8a1ff0d294148e4d27f1 100644
--- a/src/test/ui/retslot-cast.rs
+++ b/src/test/ui/retslot-cast.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(rustc_attrs)]
+
 #![allow(warnings)]
 
 pub fn fail(x: Option<&(Iterator<Item=()>+Send)>)
@@ -29,5 +29,5 @@ pub fn inner(x: Option<&(Iterator<Item=()>+Send)>)
     x
 }
 
-#[rustc_error]
+
 fn main() {}
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs b/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
index 44af621ef24dc8b7ca649828db6408b14d2b4386..77b5b401c42f15afe9363f8c105d18ed8f14a7ad 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
+++ b/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
@@ -13,7 +13,7 @@
 //
 // Rule OutlivesNominalType from RFC 1214.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 mod rev_variant_struct_region {
@@ -28,5 +28,5 @@ impl<'a, 'b> Trait<'a, 'b> for usize {
     }
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs b/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
index 93f16350a7b4dcb7a7e70d59c7f3c580aa28bf30..b6ac7aa3a9cd2ac46ab677592ee6f587f58d9856 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
+++ b/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
@@ -13,7 +13,7 @@
 //
 // Rule OutlivesNominalType from RFC 1214.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 mod variant_struct_region {
@@ -28,5 +28,5 @@ impl<'a, 'b> Trait<'a, 'b> for usize {
     }
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs b/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
index e44e049a9e5dc3a3cf5ec123420917eaa5898369..3f7d086a6ae19c4347ceab84de8fa4d6e17b2487 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
+++ b/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
@@ -13,7 +13,7 @@
 //
 // Rule OutlivesNominalType from RFC 1214.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 mod variant_struct_type {
@@ -28,5 +28,5 @@ impl<'a, 'b> Trait<'a, 'b> for usize {
     }
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs b/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
index 1293e6c234bc14de26722937d2b2cc12d63e314e..dff9b8a862f6c74ab8270eb0aee090bbb60de799 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
+++ b/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
@@ -13,7 +13,7 @@
 //
 // Rule OutlivesNominalType from RFC 1214.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 mod variant_struct_type {
@@ -28,5 +28,5 @@ impl<'a, 'b> Trait<'a, 'b> for usize {
     }
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/variance/variance-btree-invariant-types.rs b/src/test/ui/variance/variance-btree-invariant-types.rs
index e9607de00a34f0bac195bd437dea2ec5948d9f11..59fc0136612dd9d5c0c79740b68a128ab73963d1 100644
--- a/src/test/ui/variance/variance-btree-invariant-types.rs
+++ b/src/test/ui/variance/variance-btree-invariant-types.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(rustc_attrs)]
+
 
 use std::collections::btree_map::{IterMut, OccupiedEntry, VacantEntry};
 
@@ -59,5 +59,5 @@ fn vac_contra_val<'a, 'new>(v: VacantEntry<'a, (), &'new ()>)
     v //~ ERROR mismatched types
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/variance/variance-use-contravariant-struct-1.rs b/src/test/ui/variance/variance-use-contravariant-struct-1.rs
index d2fd2978750e7c922b26f139ee8bd27bec982c9d..47ecec5a1124e00496c7bd1c65a656ce17326e46 100644
--- a/src/test/ui/variance/variance-use-contravariant-struct-1.rs
+++ b/src/test/ui/variance/variance-use-contravariant-struct-1.rs
@@ -11,7 +11,7 @@
 // Test various uses of structs with distint variances to make sure
 // they permit lifetimes to be approximated as expected.
 
-#![feature(rustc_attrs)]
+
 
 struct SomeStruct<T>(fn(T));
 
@@ -22,5 +22,5 @@ fn foo<'min,'max>(v: SomeStruct<&'max ()>)
     v //~ ERROR mismatched types
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.rs b/src/test/ui/variance/variance-use-invariant-struct-1.rs
index c89436b20949c571a260c11e937ab7ebb74ef1d8..2e6c0c16dcd0d04a50a5ba58d9f0f2aa5c8b2d1b 100644
--- a/src/test/ui/variance/variance-use-invariant-struct-1.rs
+++ b/src/test/ui/variance/variance-use-invariant-struct-1.rs
@@ -11,7 +11,7 @@
 // Test various uses of structs with distint variances to make sure
 // they permit lifetimes to be approximated as expected.
 
-#![feature(rustc_attrs)]
+
 
 struct SomeStruct<T>(*mut T);
 
@@ -29,5 +29,5 @@ fn bar<'min,'max>(v: SomeStruct<&'min ()>)
     v //~ ERROR mismatched types
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-array-elem-sized.rs b/src/test/ui/wf/wf-array-elem-sized.rs
index 946341a1a75bb7d0dae60c4ce7ed6c47a04f5ae5..36e9226ae3f8106712aa832989c9b102bfea59a4 100644
--- a/src/test/ui/wf/wf-array-elem-sized.rs
+++ b/src/test/ui/wf/wf-array-elem-sized.rs
@@ -10,12 +10,12 @@
 
 // Check that array elemen types must be Sized. Issue #25692.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 struct Foo {
     foo: [[u8]], //~ ERROR E0277
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-const-type.rs b/src/test/ui/wf/wf-const-type.rs
index c3015afd8dd0d95f00f8ae6841b61a831f9104a0..bc14ce46ff1992e2309a44296807b54c3b8e2a7a 100644
--- a/src/test/ui/wf/wf-const-type.rs
+++ b/src/test/ui/wf/wf-const-type.rs
@@ -11,7 +11,7 @@
 // Test that we check the types of constants are well-formed.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 struct IsCopy<T:Copy> { t: T }
@@ -20,5 +20,5 @@ struct IsCopy<T:Copy> { t: T }
 const FOO: IsCopy<Option<NotCopy>> = IsCopy { t: None };
 //~^ ERROR E0277
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-enum-bound.rs b/src/test/ui/wf/wf-enum-bound.rs
index e3e79fdd940af47cc88842fb0efb45a6b355fe09..6c08f5a4a547e1cc15129f652d6cc8a69e265282 100644
--- a/src/test/ui/wf/wf-enum-bound.rs
+++ b/src/test/ui/wf/wf-enum-bound.rs
@@ -11,7 +11,7 @@
 // Test that we check enum bounds for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait ExtraCopy<T:Copy> { }
@@ -22,5 +22,5 @@ enum SomeEnum<T,U> //~ ERROR E0277
     SomeVariant(T,U)
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.rs b/src/test/ui/wf/wf-enum-fields-struct-variant.rs
index 5eb53e7edde6b8634bdb2f993da98fba90ae8cf1..572b609fe2ef225908f1bc680a1d2b277c12233b 100644
--- a/src/test/ui/wf/wf-enum-fields-struct-variant.rs
+++ b/src/test/ui/wf/wf-enum-fields-struct-variant.rs
@@ -11,7 +11,7 @@
 // Test that we check struct fields for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 struct IsCopy<T:Copy> {
@@ -24,5 +24,5 @@ enum AnotherEnum<A> {
     }
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-enum-fields.rs b/src/test/ui/wf/wf-enum-fields.rs
index 76ad40f845768280ca2b39a22d1d43aa8efcdea0..32e870e9e1b5b586c4d987ab0c8254cbb249c5f2 100644
--- a/src/test/ui/wf/wf-enum-fields.rs
+++ b/src/test/ui/wf/wf-enum-fields.rs
@@ -11,7 +11,7 @@
 // Test that we check struct fields for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 struct IsCopy<T:Copy> {
@@ -22,5 +22,5 @@ enum SomeEnum<A> {
     SomeVariant(IsCopy<A>) //~ ERROR E0277
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-fn-where-clause.rs b/src/test/ui/wf/wf-fn-where-clause.rs
index 59bb8326ddbf5ba07fe69d3785d38fff5f95e5e1..3d97bdb521fa8c32bab88bb9023bc98907d42152 100644
--- a/src/test/ui/wf/wf-fn-where-clause.rs
+++ b/src/test/ui/wf/wf-fn-where-clause.rs
@@ -10,7 +10,7 @@
 
 // Test that we check where-clauses on fn items.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait ExtraCopy<T:Copy> { }
@@ -23,5 +23,5 @@ fn bar() where Vec<dyn Copy>:, {}
 //~^ ERROR E0277
 //~| ERROR E0038
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-impl-associated-type-region.rs b/src/test/ui/wf/wf-impl-associated-type-region.rs
index a319b676eeb880cf660434e616a5e7212ad60638..aa88b3d7377e0cea80c37cca00eabde7764b3fdb 100644
--- a/src/test/ui/wf/wf-impl-associated-type-region.rs
+++ b/src/test/ui/wf/wf-impl-associated-type-region.rs
@@ -10,7 +10,7 @@
 
 // Check that we require that associated types in an impl are well-formed.
 
-#![feature(rustc_attrs)]
+
 
 pub trait Foo<'a> {
     type Bar;
@@ -20,5 +20,5 @@ impl<'a, T> Foo<'a> for T {
     type Bar = &'a T; //~ ERROR E0309
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-impl-associated-type-trait.rs b/src/test/ui/wf/wf-impl-associated-type-trait.rs
index 1e82f609d2a7f7e91a0cf4a329137f449c120ef6..0b5a76db262668ee13bd478bb86ddbfe2c2a6833 100644
--- a/src/test/ui/wf/wf-impl-associated-type-trait.rs
+++ b/src/test/ui/wf/wf-impl-associated-type-trait.rs
@@ -10,7 +10,7 @@
 
 // Check that we require that associated types in an impl are well-formed.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 pub trait MyHash { }
@@ -28,5 +28,5 @@ impl<T> Foo for T {
     //~^ ERROR the trait bound `T: MyHash` is not satisfied
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-in-fn-type-static.rs b/src/test/ui/wf/wf-in-fn-type-static.rs
index 8e3bca09758139ac179680b3ca2ddfa771ef01eb..dfe6688c0b7f2080142e14f695d4bc177a8001c5 100644
--- a/src/test/ui/wf/wf-in-fn-type-static.rs
+++ b/src/test/ui/wf/wf-in-fn-type-static.rs
@@ -12,7 +12,7 @@
 // types in fns.
 
 #![allow(dead_code)]
-#![feature(rustc_attrs)]
+
 
 struct MustBeCopy<T:Copy> {
     t: T
@@ -28,5 +28,5 @@ struct Bar<T> {
     x: fn(&'static T) //~ ERROR E0310
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-in-fn-where-clause.rs b/src/test/ui/wf/wf-in-fn-where-clause.rs
index c2f66a2a460c5690c72905c93b65771aabb73173..f6f14099e738ea8078beb211ffd51b0efb169667 100644
--- a/src/test/ui/wf/wf-in-fn-where-clause.rs
+++ b/src/test/ui/wf/wf-in-fn-where-clause.rs
@@ -10,7 +10,7 @@
 
 // Check that we enforce WF conditions also for where clauses in fn items.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait MustBeCopy<T:Copy> {
@@ -21,5 +21,5 @@ fn bar<T,U>() //~ ERROR E0277
 {
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-in-obj-type-static.rs b/src/test/ui/wf/wf-in-obj-type-static.rs
index 11535fb9f9e45685a710d2ac452f4ca4481cf19a..7cbcf99af3c680ff37c6ba208105b4f70780ff70 100644
--- a/src/test/ui/wf/wf-in-obj-type-static.rs
+++ b/src/test/ui/wf/wf-in-obj-type-static.rs
@@ -10,7 +10,7 @@
 
 // Check that we enforce WF conditions also for types in fns.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait Object<T> { }
@@ -24,5 +24,5 @@ struct Foo<T> {
     x: Object<&'static T> //~ ERROR E0310
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs b/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs
index 78e12c47e24debc7b8f631ece604c86003d5783d..8b65b2e1626679c62e59ad9a8b0524122291a2ea 100644
--- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs
+++ b/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs
@@ -11,7 +11,7 @@
 // Test that we check where-clauses on inherent impl methods.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait ExtraCopy<T:Copy> { }
@@ -23,5 +23,5 @@ fn foo(self) where T: ExtraCopy<U> //~ ERROR E0277
     {}
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.rs b/src/test/ui/wf/wf-inherent-impl-where-clause.rs
index 7edbb11e245200270033c8db2d6446d0867cfce0..ee929282849026103ca3b336c20897316e92091d 100644
--- a/src/test/ui/wf/wf-inherent-impl-where-clause.rs
+++ b/src/test/ui/wf/wf-inherent-impl-where-clause.rs
@@ -11,7 +11,7 @@
 // Test that we check where-clauses on inherent impls.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait ExtraCopy<T:Copy> { }
@@ -22,5 +22,5 @@ impl<T,U> Foo<T,U> where T: ExtraCopy<U> //~ ERROR E0277
 {
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-static-type.rs b/src/test/ui/wf/wf-static-type.rs
index ba02c5dca3e6d7d49635fb92edacae2a88c5dfca..91943b44d97adc8f99618d81f7bb35226bf278a0 100644
--- a/src/test/ui/wf/wf-static-type.rs
+++ b/src/test/ui/wf/wf-static-type.rs
@@ -11,7 +11,7 @@
 // Test that we check the types of statics are well-formed.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 struct IsCopy<T:Copy> { t: T }
@@ -20,5 +20,5 @@ struct IsCopy<T:Copy> { t: T }
 static FOO: IsCopy<Option<NotCopy>> = IsCopy { t: None };
 //~^ ERROR E0277
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-struct-bound.rs b/src/test/ui/wf/wf-struct-bound.rs
index e263b251aa379eb58bf5f12a21ebd7a1d47bf20b..c4a15bbe5407c589c4672c94dd272d26ad5772c8 100644
--- a/src/test/ui/wf/wf-struct-bound.rs
+++ b/src/test/ui/wf/wf-struct-bound.rs
@@ -11,7 +11,7 @@
 // Test that we check struct bounds for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait ExtraCopy<T:Copy> { }
@@ -22,5 +22,5 @@ struct SomeStruct<T,U> //~ ERROR E0277
     data: (T,U)
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-struct-field.rs b/src/test/ui/wf/wf-struct-field.rs
index 8a631a6c335a050598492ad1e5663006edd5e60f..4d1e42829d88bfd31b5bead839472ba040aa91a8 100644
--- a/src/test/ui/wf/wf-struct-field.rs
+++ b/src/test/ui/wf/wf-struct-field.rs
@@ -11,7 +11,7 @@
 // Test that we check struct fields for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 struct IsCopy<T:Copy> {
@@ -22,5 +22,5 @@ struct SomeStruct<A> {
     data: IsCopy<A> //~ ERROR E0277
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.rs b/src/test/ui/wf/wf-trait-associated-type-bound.rs
index 8420edd66a1809dcaa92f1fe5448fe09b43d518b..eaeffa017400e75a8975514a777b2bfdc7805f8d 100644
--- a/src/test/ui/wf/wf-trait-associated-type-bound.rs
+++ b/src/test/ui/wf/wf-trait-associated-type-bound.rs
@@ -11,7 +11,7 @@
 // Test that we check associated type bounds for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait ExtraCopy<T:Copy> { }
@@ -20,5 +20,5 @@ trait SomeTrait<T> { //~ ERROR E0277
     type Type1: ExtraCopy<T>;
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-trait-associated-type-region.rs b/src/test/ui/wf/wf-trait-associated-type-region.rs
index 95d9ffdf9d35958782c0ab8ad105aa2dfc6f5021..61cdbe5e49128d2afb0004a4e14a1d3d448fd21e 100644
--- a/src/test/ui/wf/wf-trait-associated-type-region.rs
+++ b/src/test/ui/wf/wf-trait-associated-type-region.rs
@@ -11,7 +11,7 @@
 // Test that we check associated type default values for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait SomeTrait<'a> {
@@ -20,5 +20,5 @@ trait SomeTrait<'a> {
     //~^ ERROR E0309
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-trait-associated-type-trait.rs b/src/test/ui/wf/wf-trait-associated-type-trait.rs
index 902cbe2676b06a5995ccd67137a695831c1ec096..e752c0a9077ce1c1672a94fa1eed8f510433f5c5 100644
--- a/src/test/ui/wf/wf-trait-associated-type-trait.rs
+++ b/src/test/ui/wf/wf-trait-associated-type-trait.rs
@@ -11,7 +11,7 @@
 // Test that we check associated type default values for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 struct IsCopy<T:Copy> { x: T }
@@ -22,5 +22,5 @@ trait SomeTrait {
     //~^ ERROR E0277
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-trait-bound.rs b/src/test/ui/wf/wf-trait-bound.rs
index ca15a6ab648630d17c15f2502463fa1c7ec80ae8..c02281ab4f9502215c3bf4b0b71050155f4765ef 100644
--- a/src/test/ui/wf/wf-trait-bound.rs
+++ b/src/test/ui/wf/wf-trait-bound.rs
@@ -11,7 +11,7 @@
 // Test that we check supertrait bounds for WFedness.
 
 #![feature(associated_type_defaults)]
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 
 trait ExtraCopy<T:Copy> { }
@@ -21,5 +21,5 @@ trait SomeTrait<T,U> //~ ERROR E0277
 {
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.rs b/src/test/ui/wf/wf-trait-default-fn-arg.rs
index 453aa2428ce5d1ee94dcf0f5236e524a15ea4970..8577bc8963826b6c595f862f138323541a5e803f 100644
--- a/src/test/ui/wf/wf-trait-default-fn-arg.rs
+++ b/src/test/ui/wf/wf-trait-default-fn-arg.rs
@@ -11,7 +11,7 @@
 // Check that we test WF conditions for fn arguments. Because the
 // current code is so goofy, this is only a warning for now.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 
@@ -25,5 +25,5 @@ fn bar(&self, x: &Bar<Self>) {
     }
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.rs b/src/test/ui/wf/wf-trait-default-fn-where-clause.rs
index 29c85250583c7900c8d90875bc9711b83cc7d674..b15767198704182fe2959d2c3264156358d53f87 100644
--- a/src/test/ui/wf/wf-trait-default-fn-where-clause.rs
+++ b/src/test/ui/wf/wf-trait-default-fn-where-clause.rs
@@ -11,7 +11,7 @@
 // Check that we test WF conditions for fn arguments. Because the
 // current code is so goofy, this is only a warning for now.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 
@@ -25,5 +25,5 @@ fn bar<A>(&self) where A: Bar<Self> {
     }
 }
 
-#[rustc_error]
+
 fn main() { }
diff --git a/src/test/ui/wf/wf-trait-fn-where-clause.rs b/src/test/ui/wf/wf-trait-fn-where-clause.rs
index f46a54504a0b5cd7c50835eb4dacf0165d0ad412..44e3d6bda5cd8b782ecd36199aea119714d70ae9 100644
--- a/src/test/ui/wf/wf-trait-fn-where-clause.rs
+++ b/src/test/ui/wf/wf-trait-fn-where-clause.rs
@@ -10,7 +10,7 @@
 
 // Check that we test WF conditions for fn where clauses in a trait definition.
 
-#![feature(rustc_attrs)]
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 
@@ -23,5 +23,5 @@ trait Foo {
         // Here, Eq ought to be implemented.
 }
 
-#[rustc_error]
+
 fn main() { }