diff --git a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
index 53a9db59..a95be63e 100644
--- a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
+++ b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
@@ -15,19 +15,7 @@ Content-Type: text/xml; charset="utf-8"
 changed_last_60se: >1<
   dav_displayname: >User One's Not Calendar<
       is_calendar: >0<
-
-       changed_by: >10<
-changed_last_30se: >1<
-         dav_name: >/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/<
-    property_name: >http://apple.com/ns/ical/:calendar-color<
-   property_value: >#391B71A0<
-
-       changed_by: >10<
-changed_last_30se: >1<
-         dav_name: >/user1/collection/<
-    property_name: >urn:ietf:params:xml:ns:caldav:calendar-description<
-   property_value: >My sample calendar
-description<
+    resourcetypes: ><DAV::collection/><
 
        changed_by: >10<
 changed_last_30se: >1<
@@ -44,18 +32,6 @@ changed_last_30se: >1<
        changed_by: >10<
 changed_last_30se: >1<
          dav_name: >/user1/home/<
-    property_name: >urn:mcmillan:bogus:xml:ns:rscds:arbitrary<
+    property_name: >urn:mcmillan:bogus:xml:ns:davical:arbitrary<
    property_value: >A completely bogus property which should be saved.<
 
-       changed_by: >10<
-changed_last_30se: >1<
-         dav_name: >/user1/SOHO collection/<
-    property_name: >com.apple.ical::calendarcolor<
-   property_value: >#FF8000FF<
-
-       changed_by: >10<
-changed_last_30se: >1<
-         dav_name: >/user1/SOHO collection/<
-    property_name: >urn:ietf:params:xml:ns:caldav:calendar-description<
-   property_value: >Calendar description<
-
diff --git a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test
index 2853c636..b0773e9f 100644
--- a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test
+++ b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test
@@ -4,14 +4,14 @@
 # Adding the 'owner' property to a collection
 #
 TYPE=PROPPATCH
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: SpecTest PROPPATCH
 HEADER=Content-type: text/xml
 HEAD
 
 BEGINDATA
 <?xml version="1.0" encoding="utf-8" ?> 
-<propertyupdate xmlns="DAV:" xmlns:X="urn:mcmillan:bogus:xml:ns:rscds"> 
+<propertyupdate xmlns="DAV:" xmlns:X="urn:mcmillan:bogus:xml:ns:davical"> 
   <set> 
     <prop> 
       <X:arbitrary>A completely bogus property which should be saved.</X:arbitrary>
@@ -29,7 +29,7 @@ BEGINDATA
 ENDDATA
 
 QUERY
-SELECT dav_displayname, is_calendar,
+SELECT dav_displayname, is_calendar, resourcetypes,
        modified > (current_timestamp - '60 seconds'::interval) AS changed_last_60secs
   FROM collection WHERE dav_name = '/user1/home/' ORDER BY collection_id
 ENDQUERY
@@ -37,5 +37,7 @@ ENDQUERY
 QUERY
 SELECT dav_name, property_name, property_value, changed_by,
        changed_on > (current_timestamp - '60 seconds'::interval) AS changed_last_30secs
-  FROM property ORDER BY dav_name, property_name
+  FROM property
+ WHERE dav_name = '/user1/home/'
+ ORDER BY dav_name, property_name
 ENDQUERY
diff --git a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
index 10c2973b..06aefd0e 100644
--- a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
+++ b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
@@ -15,4 +15,5 @@ Content-Type: text/xml; charset="utf-8"
 changed_last_60se: >1<
   dav_displayname: >User One's Calendar<
       is_calendar: >1<
+    resourcetypes: ><DAV::collection/><urn:ietf:params:xml:ns:caldav:calendar/><
 
diff --git a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test
index 30bbdb6e..ae2e4db7 100644
--- a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test
+++ b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test
@@ -5,7 +5,7 @@
 # again, and remove the owner property.
 #
 TYPE=PROPPATCH
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: SpecTest PROPPATCH
 HEADER=Content-type: text/xml
 HEAD
@@ -24,14 +24,14 @@ BEGINDATA
   </set> 
   <remove> 
     <prop> 
-      <arbitrary xmlns="urn:mcmillan:bogus:xml:ns:rscds"/> 
+      <arbitrary xmlns="urn:mcmillan:bogus:xml:ns:davical"/> 
     </prop> 
   </remove> 
 </propertyupdate>
 ENDDATA
 
 QUERY
-SELECT dav_displayname, is_calendar, 
+SELECT dav_displayname, is_calendar, resourcetypes,
        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 8ed257c5..740150d2 100644
--- a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
+++ b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
@@ -22,4 +22,5 @@ Content-Type: text/xml; charset="utf-8"
 changed_last_60se: >1<
   dav_displayname: >User One's Calendar<
       is_calendar: >1<
+    resourcetypes: ><DAV::collection/><urn:ietf:params:xml:ns:caldav:calendar/><
 
diff --git a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.test b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.test
index e4895f49..33486829 100644
--- a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.test
+++ b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.test
@@ -4,7 +4,7 @@
 # An attempt to remove the collection resourcetype should fail.
 #
 TYPE=PROPPATCH
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: SpecTest PROPPATCH
 HEADER=Content-type: text/xml
 HEAD
@@ -23,7 +23,7 @@ BEGINDATA
 ENDDATA
 
 QUERY
-SELECT dav_displayname, is_calendar, 
+SELECT dav_displayname, is_calendar, resourcetypes,
        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/843-Spec-PROPFIND.result b/testing/tests/regression-suite/843-Spec-PROPFIND.result
index 41d6ecf8..f338ce1b 100644
--- a/testing/tests/regression-suite/843-Spec-PROPFIND.result
+++ b/testing/tests/regression-suite/843-Spec-PROPFIND.result
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:R="urn:mcmillan:bogus:xml:ns:rscds">
+<multistatus xmlns="DAV:" xmlns:D="urn:mcmillan:bogus:xml:ns:davical">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -13,7 +13,7 @@
   </propstat>
   <propstat>
    <prop>
-    <R:arbitrary/>
+    <D:arbitrary/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
diff --git a/testing/tests/regression-suite/843-Spec-PROPFIND.test b/testing/tests/regression-suite/843-Spec-PROPFIND.test
index f9dcaca1..44e3e3be 100644
--- a/testing/tests/regression-suite/843-Spec-PROPFIND.test
+++ b/testing/tests/regression-suite/843-Spec-PROPFIND.test
@@ -2,7 +2,7 @@
 # PROPFIND based on RFC2518 Spec against an iCalendar resource
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
@@ -10,7 +10,7 @@ HEADER=Content-Type: application/xml
 
 BEGINDATA
 <?xml version="1.0" encoding="utf-8"?>
-<propfind xmlns="DAV:" xmlns:X="urn:mcmillan:bogus:xml:ns:rscds"> 
+<propfind xmlns="DAV:" xmlns:X="urn:mcmillan:bogus:xml:ns:davical"> 
   <prop> 
     <owner/> 
     <X:arbitrary/>
diff --git a/testing/tests/regression-suite/967-PROPFIND.result b/testing/tests/regression-suite/967-PROPFIND.result
index 41a81997..6266bbd9 100644
--- a/testing/tests/regression-suite/967-PROPFIND.result
+++ b/testing/tests/regression-suite/967-PROPFIND.result
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:X="http://xmlns.davical.org/davical">
  <response>
   <href>/caldav.php/user4/user2/</href>
   <propstat>
@@ -8,6 +8,7 @@
     <resourcetype>
      <collection/>
      <C:calendar/>
+     <X:webdav-binding/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>