diff --git a/src/test/compile-fail/attr-literals.rs b/src/test/compile-fail/attr-literals.rs
index b54288035175d..e77fde845ae16 100644
--- a/src/test/compile-fail/attr-literals.rs
+++ b/src/test/compile-fail/attr-literals.rs
@@ -10,6 +10,8 @@
 
 // Check that literals in attributes parse just fine.
 
+// gate-test-custom_attribute
+
 #![feature(rustc_attrs, attr_literals)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/compile-fail/attr-on-generic-formals-are-visited.rs b/src/test/compile-fail/attr-on-generic-formals-are-visited.rs
index c902cfdd756df..0d89c52d885f9 100644
--- a/src/test/compile-fail/attr-on-generic-formals-are-visited.rs
+++ b/src/test/compile-fail/attr-on-generic-formals-are-visited.rs
@@ -15,6 +15,8 @@
 // checking feature-gating of the attributes themselves, not the
 // capability to parse such attributes in that context.
 
+// gate-test-custom_attribute
+
 #![feature(generic_param_attrs)]
 #![allow(dead_code)]
 
diff --git a/src/test/compile-fail/gated-attr-literals.rs b/src/test/compile-fail/gated-attr-literals.rs
index 04abc44caecd7..b500bfc3c2139 100644
--- a/src/test/compile-fail/gated-attr-literals.rs
+++ b/src/test/compile-fail/gated-attr-literals.rs
@@ -11,6 +11,7 @@
 // Check that literals in attributes don't parse without the feature gate.
 
 // gate-test-attr_literals
+// gate-test-custom_attribute
 
 #![feature(rustc_attrs)]
 #![allow(dead_code)]
diff --git a/src/test/compile-fail/macro-with-seps-err-msg.rs b/src/test/compile-fail/macro-with-seps-err-msg.rs
index d5fc9a510f0db..6cc682bde997f 100644
--- a/src/test/compile-fail/macro-with-seps-err-msg.rs
+++ b/src/test/compile-fail/macro-with-seps-err-msg.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// gate-test-use_extern_macros
+
 fn main() {
     globnar::brotz!(); //~ ERROR non-ident macro paths are experimental
     ::foo!(); //~ ERROR non-ident macro paths are experimental
diff --git a/src/test/compile-fail/struct-path-self-feature-gate.rs b/src/test/compile-fail/struct-path-self-feature-gate.rs
index a2050182a7e30..c40d057495591 100644
--- a/src/test/compile-fail/struct-path-self-feature-gate.rs
+++ b/src/test/compile-fail/struct-path-self-feature-gate.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// gate-test-more_struct_aliases
+
 struct S;
 
 trait Tr {
diff --git a/src/test/compile-fail/type-parameter-invalid-lint.rs b/src/test/compile-fail/type-parameter-invalid-lint.rs
index b99ef9258049a..a2c8116c9ba1c 100644
--- a/src/test/compile-fail/type-parameter-invalid-lint.rs
+++ b/src/test/compile-fail/type-parameter-invalid-lint.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// gate-test-default_type_parameter_fallback
+
 #![deny(future_incompatible)]
 #![allow(dead_code)]
 
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index 9e365456a6c0d..f540dc3d3e6ad 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -166,10 +166,8 @@ pub fn check(path: &Path, bad: &mut bool) {
     // FIXME get this whitelist empty.
     let whitelist = vec![
         "abi_ptx", "simd", "macro_reexport",
-        "more_struct_aliases", "static_recursion", "reflect",
-        "quote", "cfg_target_has_atomic", "custom_attribute",
-        "default_type_parameter_fallback",
-        "use_extern_macros", "staged_api", "const_indexing",
+        "static_recursion", "reflect", "quote",
+        "cfg_target_has_atomic", "staged_api", "const_indexing",
         "unboxed_closures", "stmt_expr_attributes",
         "cfg_target_thread_local", "unwind_attributes",
         "inclusive_range_syntax", "proc_macro"