diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java b/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java
index 7857c1ca2f..f9d4469779 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java
@@ -302,10 +302,15 @@ public static X509Certificate generateCertificate(String dn, KeyPair pair, int d
     KeyPair keyPair = pair;
     X509V3CertificateGenerator certGen = new X509V3CertificateGenerator();
 
+    String hostName = InetAddress.getLocalHost().getHostName();
     String hostAddress = InetAddress.getLocalHost().getHostAddress();
     certGen.addExtension(X509Extensions.SubjectAlternativeName, false,
-        new GeneralNames(new GeneralName[] { new GeneralName(GeneralName.iPAddress, hostAddress),
-            new GeneralName(GeneralName.dNSName, "localhost") }));
+        new GeneralNames(new GeneralName[] {
+            new GeneralName(GeneralName.iPAddress, hostAddress),
+            new GeneralName(GeneralName.dNSName, hostName),
+            new GeneralName(GeneralName.dNSName, "localhost")
+        })
+    );
     X500Principal dnName = new X500Principal(dn);
 
     certGen.setSerialNumber(sn);