diff --git a/src/com/sun/ts/tests/servlet/spec/serverpush/Client.java b/src/com/sun/ts/tests/servlet/spec/serverpush/Client.java
index a1f7dba137..aa28a53971 100644
--- a/src/com/sun/ts/tests/servlet/spec/serverpush/Client.java
+++ b/src/com/sun/ts/tests/servlet/spec/serverpush/Client.java
@@ -246,23 +246,22 @@ public void serverPushInitTest() throws Fault {
           + "HttpServletRequest should be added to the builder");
     }
 
-    if (response.contains("If-Match")) {
+    if (response.contains("if-match")) {
       throw new Fault(
           "Test fail: Conditional headers should NOT be added to the builder");
     }
 
-    if (response.contains("Range")) {
+    if (response.contains("range")) {
       throw new Fault(
           "Test fail: Range headers should NOT be added to the builder");
     }
 
-    if (!response.contains("Authorization")) {
+    if (!response.contains("authorization")) {
       throw new Fault(
           "Test fail: Authorization headers should be added to the builder");
     }
 
-    if (!(response.contains("referer=" + requestURI)
-        || response.contains("Referer=" + requestURI))) {
+    if (!response.contains("referer=" + requestURI)) {
       throw new Fault(
           "Test fail: Referer headers should be set to " + requestURI);
     }
diff --git a/src/com/sun/ts/tests/servlet/spec/serverpush/TestServlet2.java b/src/com/sun/ts/tests/servlet/spec/serverpush/TestServlet2.java
index 2a9ec853be..0a9a3a0320 100644
--- a/src/com/sun/ts/tests/servlet/spec/serverpush/TestServlet2.java
+++ b/src/com/sun/ts/tests/servlet/spec/serverpush/TestServlet2.java
@@ -24,6 +24,7 @@
 import javax.servlet.http.PushBuilder;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Locale;
 
 public class TestServlet2 extends HttpServlet {
 
@@ -40,7 +41,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
     pw.println("JSESSIONID: " + pb.getSessionId());
     pw.println("The headers of PushBuilder: ");
     for (String name : pb.getHeaderNames()) {
-      pw.print(name);
+      /*
+       * Header names are case insensitive. Force to lower case to make client
+       * side test logic simpler.
+       */
+      pw.print(name.toLowerCase(Locale.ENGLISH));
       pw.print("=");
       pw.println(pb.getHeader(name));
     }