diff --git a/src/non_expressive_names.rs b/src/non_expressive_names.rs
index f8f2c4fb9a6..294af274beb 100644
--- a/src/non_expressive_names.rs
+++ b/src/non_expressive_names.rs
@@ -85,14 +85,13 @@ impl<'a, 'b, 'c> SimilarNamesNameVisitor<'a, 'b, 'c> {
                 return;
             }
             self.0.single_char_names.push(c);
-            if self.0.single_char_names.len() < self.0.lint.max_single_char_names {
-                return;
+            if self.0.single_char_names.len() >= self.0.lint.max_single_char_names {
+                span_lint(self.0.cx,
+                          MANY_SINGLE_CHAR_NAMES,
+                          span,
+                          &format!("{}th binding whose name is just one char",
+                                   self.0.single_char_names.len()));
             }
-            span_lint(self.0.cx,
-                      MANY_SINGLE_CHAR_NAMES,
-                      span,
-                      &format!("{}th binding whose name is just one char",
-                               self.0.single_char_names.len()));
             return;
         }
         for &allow in WHITELIST {
diff --git a/tests/compile-fail/blacklisted_name.rs b/tests/compile-fail/blacklisted_name.rs
index efcb810a30e..1afcd94a0b1 100755
--- a/tests/compile-fail/blacklisted_name.rs
+++ b/tests/compile-fail/blacklisted_name.rs
@@ -3,7 +3,7 @@
 
 #![allow(dead_code)]
 #![allow(single_match)]
-#![allow(unused_variables)]
+#![allow(unused_variables, similar_names)]
 #![deny(blacklisted_name)]
 
 fn test(foo: ()) {} //~ERROR use of a blacklisted/placeholder name `foo`