diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
index db26055be..5a1201775 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
@@ -34,32 +34,32 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
         DefaultConfiguration checkConfig =
                 createCheckConfig(AvoidEscapedUnicodeCharactersCheck.class);
         final String[] expected = {
-            "5: " + MSG,
             "7: " + MSG,
             "9: " + MSG,
-            "13: " + MSG,
-            "14: " + MSG,
-            "17: " + MSG,
-            "21: " + MSG,
-            "22: " + MSG,
-            "23: " + MSG,
+            "11: " + MSG,
+            "15: " + MSG,
+            "16: " + MSG,
+            "20: " + MSG,
+            "24: " + MSG,
+            "25: " + MSG,
             "27: " + MSG,
-            "28: " + MSG,
-            "29: " + MSG,
-            "30: " + MSG,
-            "38: " + MSG,
-            "54: " + MSG,
-            "55: " + MSG,
-            "56: " + MSG,
-            "57: " + MSG,
-            "68: " + MSG,
-            "69: " + MSG,
-            "70: " + MSG,
-            "71: " + MSG,
+            "31: " + MSG,
+            "32: " + MSG,
+            "33: " + MSG,
+            "34: " + MSG,
+            "42: " + MSG,
+            "59: " + MSG,
+            "60: " + MSG,
+            "61: " + MSG,
+            "62: " + MSG,
             "72: " + MSG,
             "73: " + MSG,
+            "74: " + MSG,
             "75: " + MSG,
-            "78: " + MSG,
+            "76: " + MSG,
+            "77: " + MSG,
+            "79: " + MSG,
+            "82: " + MSG,
         };
         verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
     }
@@ -71,29 +71,29 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
                 createCheckConfig(AvoidEscapedUnicodeCharactersCheck.class);
         checkConfig.addAttribute("allowEscapesForControlCharacters", "true");
         final String[] expected = {
-            "5: " + MSG,
             "7: " + MSG,
             "9: " + MSG,
-            "13: " + MSG,
-            "14: " + MSG,
-            "21: " + MSG,
-            "22: " + MSG,
-            "27: " + MSG,
-            "28: " + MSG,
-            "29: " + MSG,
-            "30: " + MSG,
-            "38: " + MSG,
-            "54: " + MSG,
-            "55: " + MSG,
-            "56: " + MSG,
-            "57: " + MSG,
-            "69: " + MSG,
-            "70: " + MSG,
-            "71: " + MSG,
-            "72: " + MSG,
+            "11: " + MSG,
+            "15: " + MSG,
+            "16: " + MSG,
+            "24: " + MSG,
+            "25: " + MSG,
+            "31: " + MSG,
+            "32: " + MSG,
+            "33: " + MSG,
+            "34: " + MSG,
+            "42: " + MSG,
+            "59: " + MSG,
+            "60: " + MSG,
+            "61: " + MSG,
+            "62: " + MSG,
             "73: " + MSG,
+            "74: " + MSG,
             "75: " + MSG,
-            "78: " + MSG,
+            "76: " + MSG,
+            "77: " + MSG,
+            "79: " + MSG,
+            "82: " + MSG,
         };
         verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
     }
@@ -105,24 +105,24 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
                 createCheckConfig(AvoidEscapedUnicodeCharactersCheck.class);
         checkConfig.addAttribute("allowByTailComment", "true");
         final String[] expected = {
-            "5: " + MSG,
-            "13: " + MSG,
-            "21: " + MSG,
-            "27: " + MSG,
-            "29: " + MSG,
-            "30: " + MSG,
-            "54: " + MSG,
-            "55: " + MSG,
-            "56: " + MSG,
-            "57: " + MSG,
-            "68: " + MSG,
-            "69: " + MSG,
-            "70: " + MSG,
-            "71: " + MSG,
+            "7: " + MSG,
+            "15: " + MSG,
+            "24: " + MSG,
+            "31: " + MSG,
+            "33: " + MSG,
+            "34: " + MSG,
+            "59: " + MSG,
+            "60: " + MSG,
+            "61: " + MSG,
+            "62: " + MSG,
             "72: " + MSG,
             "73: " + MSG,
+            "74: " + MSG,
             "75: " + MSG,
-            "78: " + MSG,
+            "76: " + MSG,
+            "77: " + MSG,
+            "79: " + MSG,
+            "82: " + MSG,
         };
         verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
     }
@@ -134,15 +134,15 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
                 createCheckConfig(AvoidEscapedUnicodeCharactersCheck.class);
         checkConfig.addAttribute("allowIfAllCharactersEscaped", "true");
         final String[] expected = {
-            "5: " + MSG,
             "7: " + MSG,
             "9: " + MSG,
-            "13: " + MSG,
-            "14: " + MSG,
-            "27: " + MSG,
-            "28: " + MSG,
-            "29: " + MSG,
-            "38: " + MSG,
+            "11: " + MSG,
+            "15: " + MSG,
+            "16: " + MSG,
+            "31: " + MSG,
+            "32: " + MSG,
+            "33: " + MSG,
+            "42: " + MSG,
         };
         verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
     }
@@ -154,18 +154,18 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
                 createCheckConfig(AvoidEscapedUnicodeCharactersCheck.class);
         checkConfig.addAttribute("allowNonPrintableEscapes", "true");
         final String[] expected = {
-            "5: " + MSG,
             "7: " + MSG,
             "9: " + MSG,
-            "13: " + MSG,
-            "14: " + MSG,
-            "21: " + MSG,
-            "22: " + MSG,
-            "27: " + MSG,
-            "28: " + MSG,
-            "29: " + MSG,
-            "30: " + MSG,
-            "38: " + MSG,
+            "11: " + MSG,
+            "15: " + MSG,
+            "16: " + MSG,
+            "24: " + MSG,
+            "25: " + MSG,
+            "31: " + MSG,
+            "32: " + MSG,
+            "33: " + MSG,
+            "34: " + MSG,
+            "42: " + MSG,
         };
         verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/InputAvoidEscapedUnicodeCharactersCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/InputAvoidEscapedUnicodeCharactersCheck.java
index 48180a3c4..10b5f69bd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/InputAvoidEscapedUnicodeCharactersCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/InputAvoidEscapedUnicodeCharactersCheck.java
@@ -1,12 +1,14 @@
 package com.puppycrawl.tools.checkstyle;
 
-public class InputForbidEscapedUnicodeCharactersCheck {
+import java.util.concurrent.TimeUnit;
+
+public class InputAvoidEscapedUnicodeCharactersCheck {
 
 	private String unitAbbrev2 = "\u03bcs";
 
 	private String unitAbbrev3 = "\u03bcs"; // Greek letter mu
 
-	private String unitAbbrev3 = "\u03bcs"; // Greek letter mu
+	private String unitAbbrev4 = "\u03bcs"; // Greek letter mu
 
 	public Object fooString() {
 		String unitAbbrev = "μs";
@@ -14,12 +16,14 @@ public class InputForbidEscapedUnicodeCharactersCheck {
 		String unitAbbrev3 = "\u03bcs"; // Greek letter mu, "s"
 		String fakeUnicode = "asd\tsasd";
 		String fakeUnicode2 = "\\u23\\u123i\\u";
+		String content = null;
 		return "\ufeff" + content; // byte order mark
 	}
 
 	public Object fooChar() {
 		char unitAbbrev2 = '\u03bc';
 		char unitAbbrev3 = '\u03bc'; // Greek letter mu, "s"
+		char content = 0;
 		return '\ufeff' + content; // byte order mark
 	}
 
@@ -49,13 +53,13 @@ public class InputForbidEscapedUnicodeCharactersCheck {
 		default:
 			throw new AssertionError();
 		}
-
+	}
+		
 		static final String WHITESPACE_TABLE = ""
 				+ "\u2002\u3000\r\u0085\u200A\u2005\u2000\u3000\\"
 				+ "\u2029\u000B\u3000\u2008\u2003\u205F\u3000\u1680"
 				+ "\u0009\u0020\u2006\u2001\u202F\u00A0\u000C\u2009"
 				+ "\u3000\u2004\u3000\u3000\u2028\n\u2007\u3000";
-	    }
 	
 	      public boolean matches(char c) {
 	        switch (c) {