diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
index f0182075ffe..40a533713a0 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
@@ -313,8 +313,6 @@ public class HttpParser
     /* ------------------------------------------------------------------------------- */
     protected String legacyString(String orig, String cached)
     {                   
-        System.err.printf("o=%s%n",orig);
-        System.err.printf("c=%s%n",cached);
         return (orig.equals(cached) || !checkCompliance(LEGACY,"case sensitive"))?cached:orig;
     }
     
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java
index 56b4cd72a79..96f3db1e0e4 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelOverHttp.java
@@ -260,6 +260,9 @@ public class HttpChannelOverHttp extends HttpChannel implements HttpParser.Reque
     @Override
     public boolean headerComplete()
     {
+        if(_complianceViolations != null)
+            this.getRequest().setAttribute(ATTR_COMPLIANCE_VIOLATIONS, _complianceViolations);
+        
         boolean persistent;
 
         switch (_metadata.getVersion())
@@ -447,8 +450,6 @@ public class HttpChannelOverHttp extends HttpChannel implements HttpParser.Reque
     @Override
     public boolean messageComplete()
     {
-        if(_complianceViolations != null)
-            this.getRequest().setAttribute(ATTR_COMPLIANCE_VIOLATIONS, _complianceViolations);
         return onRequestComplete();
     }
 
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ComplianceViolations2616Test.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ComplianceViolations2616Test.java
index a576a53e0ce..5c38f0823ba 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ComplianceViolations2616Test.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ComplianceViolations2616Test.java
@@ -147,7 +147,7 @@ public class ComplianceViolations2616Test
 
         String response = connector.getResponses(req1.toString());
         assertThat("Response status", response, containsString("HTTP/1.1 200 OK"));
-        assertThat("Response headers", response, containsString("X-Http-Violation-0: RFC7230 (name only header)"));
+        assertThat("Response headers", response, containsString("X-Http-Violation-0: RFC2616<=RFC2616: name only header"));
 
         assertThat("Response body", response, containsString("[Name] = []"));
     }
@@ -165,44 +165,27 @@ public class ComplianceViolations2616Test
 
         String response = connector.getResponses(req1.toString());
         assertThat("Response status", response, containsString("HTTP/1.1 200"));
-        assertThat("Response headers", response, containsString("X-Http-Violation-0: RFC7230 (name only header)"));
+        assertThat("Response headers", response, containsString("X-Http-Violation-0: RFC2616<=RFC2616: name only header"));
 
         assertThat("Response body", response, containsString("[Name] = []"));
     }
 
     @Test
-    public void testEmptyQuotedHeader() throws Exception
+    public void testFoldedHeader() throws Exception
     {
         StringBuffer req1 = new StringBuffer();
         req1.append("GET /dump/ HTTP/1.1\r\n");
         req1.append("Host: local\r\n");
-        req1.append("Name: \"\"\r\n");
+        req1.append("Name: Some\r\n");
+        req1.append(" Value\r\n");
         req1.append("Connection: close\r\n");
         req1.append("Accept: */*\r\n");
         req1.append("\r\n");
 
         String response = connector.getResponses(req1.toString());
         assertThat("Response status", response, containsString("HTTP/1.1 200"));
-        assertThat("Response headers", response, containsString("X-Http-Violation-0: RFC7230 (name only header)"));
+        assertThat("Response headers", response, containsString("X-Http-Violation-0: RFC2616<=RFC2616: header folding"));
 
-        assertThat("Response body", response, containsString("[Name] = []"));
-    }
-
-    @Test
-    public void testEmptyHeader() throws Exception
-    {
-        StringBuffer req1 = new StringBuffer();
-        req1.append("GET /dump/ HTTP/1.1\r\n");
-        req1.append("Host: local\r\n");
-        req1.append("Name:\r\n");
-        req1.append("Connection: close\r\n");
-        req1.append("Accept: */*\r\n");
-        req1.append("\r\n");
-
-        String response = connector.getResponses(req1.toString());
-        assertThat("Response status", response, containsString("HTTP/1.1 200"));
-        assertThat("Response headers", response, containsString("X-Http-Violation-0: RFC7230 (name only header)"));
-
-        assertThat("Response body", response, containsString("[Name] = []"));
+        assertThat("Response body", response, containsString("[Name] = [Some Value]"));
     }
 }