diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index b2ba4ddd923..be69d805ef9 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -60,6 +60,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11266. Remove no longer supported activation properties for packaging
     from pom. (Masatake Iwasaki via wheat9)
 
+    HADOOP-11267. TestSecurityUtil fails when run with JDK8 because of empty
+    principal names. (Stephen Chu via wheat9)
+
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
index 53fede9e633..3124ebdf2d2 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
@@ -54,12 +54,8 @@ public class TestSecurityUtil {
         (null));
     assertFalse(SecurityUtil.isTGSPrincipal
         (new KerberosPrincipal("blah")));
-    assertFalse(SecurityUtil.isTGSPrincipal
-        (new KerberosPrincipal("")));
     assertFalse(SecurityUtil.isTGSPrincipal
         (new KerberosPrincipal("krbtgt/hello")));
-    assertFalse(SecurityUtil.isTGSPrincipal
-        (new KerberosPrincipal("/@")));
     assertFalse(SecurityUtil.isTGSPrincipal
         (new KerberosPrincipal("krbtgt/foo@FOO")));
   }