diff --git a/testing/tests/regression-suite/871-PROPFIND.result b/testing/tests/regression-suite/871-PROPFIND.result
new file mode 100644
index 00000000..473bbc8d
--- /dev/null
+++ b/testing/tests/regression-suite/871-PROPFIND.result
@@ -0,0 +1,25 @@
+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: "8fb72952c8759377c5f56633e6088a9f"
+Content-Length: 513
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A="http://calendarserver.org/ns/">
+ <response>
+  <href>/caldav.php/user2/home/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <C:calendar/>
+     <C:schedule-calendar/>
+    </resourcetype>
+    <displayname>home</displayname>
+    <A:getctag>"13249ced6c7527191a003f54f7e3cd25"</A:getctag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/871-PROPFIND.test b/testing/tests/regression-suite/871-PROPFIND.test
new file mode 100644
index 00000000..260c6001
--- /dev/null
+++ b/testing/tests/regression-suite/871-PROPFIND.test
@@ -0,0 +1,24 @@
+#
+# Testing for Spec compliance.  PROPFIND on a calendar,
+# Depth: 0, looking for the getctag, resourcetype and displayname
+#
+TYPE=PROPFIND
+AUTH=user2:user2
+URL=http://mycaldav/caldav.php/user2/home/
+HEADER=User-Agent: RFC2518 Spec Tests
+HEADER=Depth: 0
+HEADER=Content-Type: application/xml
+HEAD
+
+REPLACE=#<creationdate>\d{8}T\d{6}</creationdate>#<creationdate>YYYYMMDDThhmmss</creationdate>#
+
+BEGINDATA
+<?xml version="1.0" encoding="utf-8"?>
+<propfind xmlns="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <prop>
+  <displayname/>
+  <CS:getctag/>
+  <resourcetype/>
+ </prop>
+</propfind>
+ENDDATA
diff --git a/testing/tests/regression-suite/872-PROPFIND.result b/testing/tests/regression-suite/872-PROPFIND.result
new file mode 100644
index 00000000..ee92eff8
--- /dev/null
+++ b/testing/tests/regression-suite/872-PROPFIND.result
@@ -0,0 +1,74 @@
+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: "d412a2bd255c9756b0e5ff7d9aa6e28d"
+Content-Length: 1670
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:" xmlns:A="http://calendarserver.org/ns/" xmlns:C="http://complete/bollocks/ns/">
+ <response>
+  <href>/caldav.php/user2/home/</href>
+  <propstat>
+   <prop>
+    <A:getctag>"13249ced6c7527191a003f54f7e3cd25"</A:getctag>
+    <getetag>"13249ced6c7527191a003f54f7e3cd25"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:gobbledegook/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"64d28f4f57515d6c63cec02b5d882eaa"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:getctag/>
+    <C:gobbledegook/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"58cba7e3fafb6080e85619ea77d08c7a"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:getctag/>
+    <C:gobbledegook/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"13249ced6c7527191a003f54f7e3cd25"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:getctag/>
+    <C:gobbledegook/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/872-PROPFIND.test b/testing/tests/regression-suite/872-PROPFIND.test
new file mode 100644
index 00000000..d1c1b121
--- /dev/null
+++ b/testing/tests/regression-suite/872-PROPFIND.test
@@ -0,0 +1,24 @@
+#
+# Testing for Spec compliance.  PROPFIND on a calendar,
+# Depth: 1, looking for the getctag & getetag
+#
+TYPE=PROPFIND
+AUTH=user2:user2
+URL=http://mycaldav/caldav.php/user2/home/
+HEADER=User-Agent: RFC2518 Spec Tests
+HEADER=Depth: 1
+HEADER=Content-Type: application/xml
+HEAD
+
+REPLACE=#<creationdate>\d{8}T\d{6}</creationdate>#<creationdate>YYYYMMDDThhmmss</creationdate>#
+
+BEGINDATA
+<?xml version="1.0" encoding="utf-8"?>
+<propfind xmlns="DAV:" xmlns:CS="http://calendarserver.org/ns/" xmlns:BS="http://complete/bollocks/ns/">
+ <prop>
+  <CS:getctag/>
+  <getetag/>
+  <BS:gobbledegook/>
+ </prop>
+</propfind>
+ENDDATA