diff --git a/src/test/compile-fail-fulldeps/proc-macro/feature-gate-proc_macro.rs b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-proc_macro.rs
index 7e32800e0f9b8..eeede4b8aa13c 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/feature-gate-proc_macro.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-proc_macro.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // aux-build:attr_proc_macro.rs
-// gate-test-proc_macro
 #![feature(use_extern_macros)]
 
 extern crate attr_proc_macro;
@@ -21,4 +20,4 @@ struct Foo;
 
 fn main() {
     let _ = Foo;
-}
\ No newline at end of file
+}
diff --git a/src/test/compile-fail/feature-gate-global_asm.rs b/src/test/compile-fail/feature-gate-global_asm.rs
index 0560abb6af498..77f61ba47b005 100644
--- a/src/test/compile-fail/feature-gate-global_asm.rs
+++ b/src/test/compile-fail/feature-gate-global_asm.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// gate-test-global_asm
-
 global_asm!(""); //~ ERROR `global_asm!` is not stable
 
 fn main() {}
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index ad0d2fa0b3635..791b8d77e0b90 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -70,7 +70,7 @@ pub fn check(path: &Path, bad: &mut bool) {
         }
 
         let filen_underscore = filename.replace("-","_").replace(".rs","");
-        test_filen_gate(&filen_underscore, &mut features);
+        let filename_is_gate_test = test_filen_gate(&filen_underscore, &mut features);
 
         contents.truncate(0);
         t!(t!(File::open(&file), &file).read_to_string(&mut contents));
@@ -92,17 +92,20 @@ pub fn check(path: &Path, bad: &mut bool) {
                 },
                 None => continue,
             };
-            let found_feature = features.get_mut(feature_name)
-                                        .map(|v| { v.has_gate_test = true; () })
-                                        .is_some();
-
-            let found_lib_feature = features.get_mut(feature_name)
-                                            .map(|v| { v.has_gate_test = true; () })
-                                            .is_some();
-
-            if !(found_feature || found_lib_feature) {
-                err(&format!("gate-test test found referencing a nonexistent feature '{}'",
-                             feature_name));
+            match features.get_mut(feature_name) {
+                Some(f) => {
+                    if filename_is_gate_test {
+                        err(&format!("The file is already marked as gate test \
+                                      through its name, no need for a \
+                                      'gate-test-{}' comment",
+                                     feature_name));
+                    }
+                    f.has_gate_test = true;
+                }
+                None => {
+                    err(&format!("gate-test test found referencing a nonexistent feature '{}'",
+                                 feature_name));
+                }
             }
         }
     });
@@ -265,4 +268,4 @@ pub fn collect_lib_features(base_src_path: &Path,
         }
     });
     lib_features
-}
\ No newline at end of file
+}