diff --git a/test/data/etag.php b/test/data/etag.php
index f6abc26e4..66eca4bb1 100644
--- a/test/data/etag.php
+++ b/test/data/etag.php
@@ -4,13 +4,16 @@ error_reporting(0);
 $ts = $_REQUEST['ts'];
 $etag = md5($ts);
 
-$ifNoneMatch = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : false;
+$ifNoneMatch = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : "";
+preg_match('/"([^"]+)"/', $ifNoneMatch, $matches);
+$ifNoneMatch = isset($matches[1]) ? $matches[1] : false;
+
 if ($ifNoneMatch == $etag) {
 	header('HTTP/1.0 304 Not Modified');
 	die; // stop processing
 }
 
-header("Etag: " . $etag);
+header("Etag: W/\"" . $etag . "\"");
 
 if ( $ifNoneMatch ) {
 	echo "OK: " . $etag;