diff --git a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.data b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.data
deleted file mode 100644
index a86bedc8..00000000
--- a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.data
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:propfind xmlns:ns0="DAV:"><ns0:prop><ns0:getetag /><ns0:resourcetype /><ns0:displayname /></ns0:prop></ns0:propfind>
diff --git a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
index 983af434..fc863ff9 100644
--- a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
+++ b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "f84caa3260d2af7217585b51b264d1f0"
+ETag: "deadbeefcafef00ddeadbeefcafefeed"
 Content-Length: 469
 Content-Type: text/xml; charset="utf-8"
 
@@ -17,7 +17,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:schedule-calendar/>
     </resourcetype>
     <displayname>home</displayname>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.test b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.test
index 6e2fa99b..ee6a1163 100644
--- a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.test
+++ b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.test
@@ -8,3 +8,11 @@ HEADER=Depth: 0
 HEADER=Content-Type: text/xml; charset=utf-8
 HEADER=Chandler/0.7alpha4 (Linux)
 HEAD
+
+BEGINDATA
+<?xml version='1.0' encoding='UTF-8'?>
+<ns0:propfind xmlns:ns0="DAV:"><ns0:prop><ns0:getetag /><ns0:resourcetype /><ns0:displayname /></ns0:prop></ns0:propfind>
+ENDDATA
+
+REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
diff --git a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.data b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.data
deleted file mode 100644
index 0c0302aa..00000000
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.data
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:propfind xmlns:ns0="DAV:"><ns0:prop><ns0:current-user-privilege-set /><ns0:getetag /><ns0:resourcetype /><ns0:displayname /></ns0:prop></ns0:propfind>
diff --git a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
index 57fbda1c..dce40296 100644
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
+++ b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "049e01c768102e2278e853d6a94ffa20"
+ETag: "deadbeefcafef00ddeadbeefcafefeed"
 Content-Length: 584
 Content-Type: text/xml; charset="utf-8"
 
@@ -17,7 +17,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:schedule-calendar/>
     </resourcetype>
     <displayname>home</displayname>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <current-user-privilege-set>
      <privilege>
       <all/>
diff --git a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.test b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.test
index 33678f7d..0f961c39 100644
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.test
+++ b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.test
@@ -8,3 +8,11 @@ HEADER=Depth: 0
 HEADER=Content-Type: text/xml; charset=utf-8
 HEADER=Chandler/0.7alpha4 (Linux)
 HEAD
+
+BEGINDATA
+<?xml version='1.0' encoding='UTF-8'?>
+<ns0:propfind xmlns:ns0="DAV:"><ns0:prop><ns0:current-user-privilege-set /><ns0:getetag /><ns0:resourcetype /><ns0:displayname /></ns0:prop></ns0:propfind>
+ENDDATA
+
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
+REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-3.test b/testing/tests/regression-suite/309-Chandler-PROPFIND-3.test
index fac8fc8a..f3864cf5 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-3.test
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-3.test
@@ -9,5 +9,7 @@ HEADER=Depth: 0
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
 
-# The data from our first Chandler-like PROPFIND
-DATA=303-Chandler-PROPFIND-1
+BEGINDATA
+<?xml version='1.0' encoding='UTF-8'?>
+<ns0:propfind xmlns:ns0="DAV:"><ns0:prop><ns0:getetag /><ns0:resourcetype /><ns0:displayname /></ns0:prop></ns0:propfind>
+ENDDATA
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
index 581286eb..c3765fb7 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "16d226967c6cc991117d41ae19588939"
+ETag: "deadbeefcafef00ddeadbeefcafefeed"
 Content-Length: 4261
 Content-Type: text/xml; charset="utf-8"
 
@@ -17,7 +17,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:schedule-calendar/>
     </resourcetype>
     <displayname>home</displayname>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -28,7 +28,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Lunch with David</displayname>
     <resourcetype/>
-    <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -39,7 +39,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>A Meeting</displayname>
     <resourcetype/>
-    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -50,7 +50,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Weekly Project Meeting</displayname>
     <resourcetype/>
-    <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -61,7 +61,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Confidential Event</displayname>
     <resourcetype/>
-    <getetag>"08a435c2abaf38f4a50a997343c098a7"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -72,7 +72,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Private Event</displayname>
     <resourcetype/>
-    <getetag>"5def8ae2b20893a1c7f4dbaeb008f2f1"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -83,7 +83,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Tentative Event</displayname>
     <resourcetype/>
-    <getetag>"ac90acd649c25070b1a2a17fb31a105a"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -94,7 +94,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Incomplete, uncancelled</displayname>
     <resourcetype/>
-    <getetag>"509b0f0d8a3363379f9f5727f5dd74a0"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -105,7 +105,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>50% Complete, uncancelled</displayname>
     <resourcetype/>
-    <getetag>"cb3d9dc3e8c157f53eba3ea0e1e0f146"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -116,7 +116,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Due 7/8/7 16:30, completed</displayname>
     <resourcetype/>
-    <getetag>"00ad5eb1eb5507884710b0b66aa5d5c4"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -127,7 +127,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>A Cancelled Task, with a start and due date</displayname>
     <resourcetype/>
-    <getetag>"a2990674708634a311bb98a59865ca50"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -138,7 +138,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Morning Meeting</displayname>
     <resourcetype/>
-    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -149,7 +149,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <displayname>Release 0.9.3</displayname>
     <resourcetype/>
-    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.test b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.test
index f8a30b4a..60cd3d78 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.test
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.test
@@ -10,5 +10,10 @@ HEADER=Content-Type: text/xml; charset=utf-8
 HEADER=Chandler/0.7alpha4 (Linux)
 HEAD
 
-# The data from our first Chandler-like PROPFIND
-DATA=303-Chandler-PROPFIND-1
+BEGINDATA
+<?xml version='1.0' encoding='UTF-8'?>
+<ns0:propfind xmlns:ns0="DAV:"><ns0:prop><ns0:getetag /><ns0:resourcetype /><ns0:displayname /></ns0:prop></ns0:propfind>
+ENDDATA
+
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
+REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/
diff --git a/testing/tests/regression-suite/502-iCal-PROPFIND.result b/testing/tests/regression-suite/502-iCal-PROPFIND.result
index f1b42bc4..c7e813bc 100644
--- a/testing/tests/regression-suite/502-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/502-iCal-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "1116acdf20680506104f531b65bd64f1"
+ETag: "5e43be6aa852f2fd57d6691f8f55c755"
 Content-Length: 1835
 Content-Type: text/xml; charset="utf-8"
 
@@ -27,27 +27,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <C:calendar/>
-     <C:schedule-calendar/>
-    </resourcetype>
-    <displayname>home</displayname>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/.in/</href>
   <propstat>
@@ -88,4 +67,25 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <C:calendar/>
+     <C:schedule-calendar/>
+    </resourcetype>
+    <displayname>home</displayname>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:calendar-description/>
+    <A:calendar-color/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/503-iCal-PROPFIND.result b/testing/tests/regression-suite/503-iCal-PROPFIND.result
index 7a3bed81..4f19a629 100644
--- a/testing/tests/regression-suite/503-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/503-iCal-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "74396a63c2c15b2adc74d85db8d2c517"
+ETag: "deadbeefcafef00ddeadbeefcafefeed"
 Content-Length: 696
 Content-Type: text/xml; charset="utf-8"
 
@@ -17,7 +17,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:schedule-calendar/>
     </resourcetype>
     <displayname>home</displayname>
-    <A:getctag>"faf25336de0e470a54075c14cbcf5272"</A:getctag>
+    <A:getctag>"deadbeefcafef00ddeadbeefcafefeed"<.A:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/503-iCal-PROPFIND.test b/testing/tests/regression-suite/503-iCal-PROPFIND.test
index 8c0acb34..f75b272b 100644
--- a/testing/tests/regression-suite/503-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/503-iCal-PROPFIND.test
@@ -21,3 +21,7 @@ BEGINDATA
  </x0:prop>
 </x0:propfind>
 ENDDATA
+
+REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/
+REPLACE=/<A:getctag>"[0-9a-f]{32}"<.A:getctag>/<A:getctag>"deadbeefcafef00ddeadbeefcafefeed"<.A:getctag>/
+
diff --git a/testing/tests/regression-suite/504-iCal-PROPFIND.result b/testing/tests/regression-suite/504-iCal-PROPFIND.result
index 652359bb..763cff85 100644
--- a/testing/tests/regression-suite/504-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/504-iCal-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "b3359149141ebe4d5936e4cf422c3060"
+ETag: "deadbeefcafef00ddeadbeefcafefeed"
 Content-Length: 4135
 Content-Type: text/xml; charset="utf-8"
 
@@ -16,7 +16,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:calendar/>
      <C:schedule-calendar/>
     </resourcetype>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -26,7 +26,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -36,7 +36,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -46,7 +46,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -56,7 +56,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"08a435c2abaf38f4a50a997343c098a7"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -66,7 +66,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"5def8ae2b20893a1c7f4dbaeb008f2f1"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -76,7 +76,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"ac90acd649c25070b1a2a17fb31a105a"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -86,7 +86,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"509b0f0d8a3363379f9f5727f5dd74a0"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -96,7 +96,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"cb3d9dc3e8c157f53eba3ea0e1e0f146"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -106,7 +106,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"00ad5eb1eb5507884710b0b66aa5d5c4"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -116,7 +116,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"a2990674708634a311bb98a59865ca50"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -126,7 +126,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -136,7 +136,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -146,7 +146,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"0d7a68984bf525342d22b8924a57e8e2"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -156,7 +156,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <getetag>"421abf7e4848d2fecbf64217ed205d4b"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/504-iCal-PROPFIND.test b/testing/tests/regression-suite/504-iCal-PROPFIND.test
index 8e5ddaf3..db137569 100644
--- a/testing/tests/regression-suite/504-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/504-iCal-PROPFIND.test
@@ -18,3 +18,6 @@ BEGINDATA
  </x0:prop>
 </x0:propfind>
 ENDDATA
+
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
+REPLACE=/^ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafef00ddeadbeefcafefeed"/
diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result
index 18107173..d36c1008 100644
--- a/testing/tests/regression-suite/602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "600fd431ac8c5b832d83eadbe3ffb16f"
+ETag: "5439e61fa25f0b24a116986923b9e43b"
 Transfer-Encoding: chunked
 Content-Type: text/xml; charset="utf-8"
 
@@ -29,6 +29,50 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/.in/</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>mailto:user1@example.net</href>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:dropbox-home-URL/>
+    <A:notifications-URL/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/.out/</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>mailto:user1@example.net</href>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:dropbox-home-URL/>
+    <A:notifications-URL/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -381,50 +425,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/.in/</href>
-  <propstat>
-   <prop>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:dropbox-home-URL/>
-    <A:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/.out/</href>
-  <propstat>
-   <prop>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:dropbox-home-URL/>
-    <A:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
   <propstat>
diff --git a/testing/tests/regression-suite/603-Soho-PROPFIND.result b/testing/tests/regression-suite/603-Soho-PROPFIND.result
index 9e45d15e..112e3479 100644
--- a/testing/tests/regression-suite/603-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/603-Soho-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "80e625fe366f8715496d3c75323edd85"
+ETag: "9e307bc2c9ffef84049a6bfb418fa689"
 Content-Length: 2849
 Content-Type: text/xml; charset="utf-8"
 
@@ -29,28 +29,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/</href>
-  <propstat>
-   <prop>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:dropbox-home-URL/>
-    <A:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/.in/</href>
   <propstat>
@@ -95,6 +73,28 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>mailto:user1@example.net</href>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:dropbox-home-URL/>
+    <A:notifications-URL/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
   <propstat>
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
index 3db8242c..2bca1356 100644
--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
@@ -14,7 +14,7 @@
     <displayname>home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <acl>
      <ace>
       <principal>
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.test b/testing/tests/regression-suite/820-Spec-PROPFIND-1.test
index 8e06b523..59ecf766 100644
--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.test
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.test
@@ -29,3 +29,5 @@ BEGINDATA
  </prop>
 </propfind>
 ENDDATA
+
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
index a449cd3a..afcee96f 100644
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
@@ -21,7 +21,7 @@ Content-Type: text/xml; charset="utf-8"
     <displayname>home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.test b/testing/tests/regression-suite/821-Spec-PROPFIND-2.test
index 3b174edd..a2078899 100644
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.test
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.test
@@ -34,3 +34,4 @@ BEGINDATA
 ENDDATA
 
 REPLACE=/ETag: "[0-9a-f]{32}"/ETag: "deadbeefcafefeeddeadbeefcafefeed"/
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
index 1e2b32bf..c2b1d9f2 100644
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
@@ -9,11 +9,12 @@
     <resourcetype>
      <collection/>
      <C:calendar/>
+     <C:schedule-calendar/>
     </resourcetype>
     <displayname>home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -48,7 +49,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -63,6 +64,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
@@ -74,7 +84,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -89,6 +99,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
@@ -100,7 +119,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -115,6 +134,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
@@ -126,7 +154,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"08a435c2abaf38f4a50a997343c098a7"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -141,6 +169,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
@@ -152,7 +189,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"5def8ae2b20893a1c7f4dbaeb008f2f1"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -167,6 +204,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
@@ -178,7 +224,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"ac90acd649c25070b1a2a17fb31a105a"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -193,6 +239,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
@@ -204,7 +259,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"509b0f0d8a3363379f9f5727f5dd74a0"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -219,6 +274,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
@@ -230,7 +294,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"cb3d9dc3e8c157f53eba3ea0e1e0f146"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -245,6 +309,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
@@ -256,7 +329,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"00ad5eb1eb5507884710b0b66aa5d5c4"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -271,6 +344,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics</href>
@@ -282,7 +364,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"a2990674708634a311bb98a59865ca50"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -297,6 +379,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
@@ -308,7 +399,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -323,6 +414,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
@@ -334,7 +434,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -349,6 +449,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics</href>
@@ -360,7 +469,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"0d7a68984bf525342d22b8924a57e8e2"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -375,6 +484,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
@@ -386,7 +504,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"421abf7e4848d2fecbf64217ed205d4b"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -401,6 +519,15 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
  <response>
   <href>/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics</href>
@@ -412,7 +539,7 @@
     <resourcetype/>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"5f050eca5480bbebbe9428222570913d"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -427,5 +554,14 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.test b/testing/tests/regression-suite/822-Spec-PROPFIND-3.test
index 87d5fa06..0d384fc7 100644
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.test
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.test
@@ -28,3 +28,5 @@ BEGINDATA
  </prop>
 </propfind>
 ENDDATA
+
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
diff --git a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
index 0e8cfc15..de2b3c43 100644
--- a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
+++ b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
@@ -34,5 +34,14 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
  </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
index e5ba1f40..7fb6b856 100644
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
@@ -14,7 +14,7 @@
     <displayname>home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontentlanguage/>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.test b/testing/tests/regression-suite/824-Spec-PROPFIND-5.test
index 56aac6ee..569129fe 100644
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.test
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.test
@@ -16,3 +16,5 @@ BEGINDATA
  </prop>
 </propfind>
 ENDDATA
+
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
diff --git a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
index d4827738..74b5e021 100644
--- a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
+++ b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <responsedescription>All requested changes were made.</responsedescription>
  </response>
 </multistatus>
-User One's Not Calendar --- faf25336de0e470a54075c14cbcf5272 --- 0 --- 1
+User One's Not Calendar --- 0 --- 1
 /user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/ --- http://apple.com/ns/ical/:calendar-color --- #391B71A0 --- 10 --- 1
 /user1/home/ --- urn:mcmillan:bogus:xml:ns:rscds:arbitrary --- A completely bogus property which should be saved. --- 10 --- 1
 /user1/SOHO+collection/ --- com.apple.ical::calendarcolor --- #FF8000FF --- 10 --- 1
diff --git a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test
index 532d2ca6..01adb1c2 100644
--- a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test
+++ b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test
@@ -29,7 +29,7 @@ BEGINDATA
 ENDDATA
 
 QUERY
-SELECT dav_displayname, dav_etag, is_calendar,
+SELECT dav_displayname, is_calendar,
        modified > (current_timestamp - '60 seconds'::interval) AS changed_last_60secs
   FROM collection WHERE dav_name = '/user1/home/'
 ENDQUERY
diff --git a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
index ff6f58c5..686cb541 100644
--- a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
+++ b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
@@ -11,4 +11,4 @@ Content-Type: text/xml; charset="utf-8"
   <responsedescription>All requested changes were made.</responsedescription>
  </response>
 </multistatus>
-User One's Calendar --- faf25336de0e470a54075c14cbcf5272 --- 1 --- 1
+User One's Calendar --- 1 --- 1
diff --git a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test
index fb7a4f02..30bbdb6e 100644
--- a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test
+++ b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test
@@ -31,7 +31,7 @@ BEGINDATA
 ENDDATA
 
 QUERY
-SELECT dav_displayname, dav_etag, is_calendar, 
+SELECT dav_displayname, is_calendar, 
        modified > (current_timestamp - '60 seconds'::interval) AS changed_last_60secs 
   FROM collection WHERE dav_name = '/user1/home/';
 ENDQUERY
diff --git a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
index 9705012a..4c733151 100644
--- a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
+++ b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
@@ -18,4 +18,4 @@ Content-Type: text/xml; charset="utf-8"
   <responsedescription>Some properties were not able to be changed.</responsedescription>
  </response>
 </multistatus>
-User One's Calendar --- faf25336de0e470a54075c14cbcf5272 --- 1 --- 1
+User One's Calendar --- 1 --- 1
diff --git a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.test b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.test
index c735cdec..e4895f49 100644
--- a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.test
+++ b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.test
@@ -23,7 +23,7 @@ BEGINDATA
 ENDDATA
 
 QUERY
-SELECT dav_displayname, dav_etag, is_calendar, 
+SELECT dav_displayname, is_calendar, 
        modified > (current_timestamp - '60 seconds'::interval) AS changed_last_60secs 
   FROM collection WHERE dav_name = '/user1/home/';
 ENDQUERY