diff --git a/testing/tests/chandler/OPTIONS-dotchandler.test b/testing/tests/chandler/OPTIONS-dotchandler.test
deleted file mode 100644
index 78a9ec9d..00000000
--- a/testing/tests/chandler/OPTIONS-dotchandler.test
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Test the initial OPTIONS for the root
-#
-TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/andrew/.chandler/
-HEAD
\ No newline at end of file
diff --git a/testing/tests/chandler/OPTIONS-top.test b/testing/tests/chandler/OPTIONS-top.test
deleted file mode 100644
index 029a4dd2..00000000
--- a/testing/tests/chandler/OPTIONS-top.test
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Test the initial OPTIONS for the root
-#
-TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/andrew/
-HEAD
\ No newline at end of file
diff --git a/testing/tests/chandler/PROPFIND-dotchandler.test b/testing/tests/chandler/PROPFIND-dotchandler.test
deleted file mode 100644
index 2080127f..00000000
--- a/testing/tests/chandler/PROPFIND-dotchandler.test
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Test the initial PROPFIND for the root.
-#
-TYPE=PROPFIND
-HEADER=Depth: 0
-URL=http://mycaldav/caldav.php/andrew/.chandler/
-HEADER=Content-Type: text/xml; charset="utf-8"
-DATA=PROPFIND
\ No newline at end of file
diff --git a/testing/tests/chandler/PROPFIND.data b/testing/tests/chandler/PROPFIND.data
deleted file mode 100644
index a86bedc8..00000000
--- a/testing/tests/chandler/PROPFIND.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/chandler/PROPFIND.test b/testing/tests/chandler/PROPFIND.test
deleted file mode 100644
index 2dff8529..00000000
--- a/testing/tests/chandler/PROPFIND.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Test the initial PROPFIND for the root.
-#
-TYPE=PROPFIND
-HEADER=Depth: 0
-URL=http://mycaldav/caldav.php/andrew/
-HEADER=Content-Type: text/xml; charset="utf-8"
diff --git a/testing/tests/chandler/PROPFIND1.test b/testing/tests/chandler/PROPFIND1.test
deleted file mode 100644
index b134388d..00000000
--- a/testing/tests/chandler/PROPFIND1.test
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Test the initial PROPFIND for the root.
-#
-TYPE=PROPFIND
-HEADER=Depth: 0
-HEADER=Content-Type: text/xml; charset="utf-8"
-URL=http://mycaldav/caldav.php/andrew/
-DATA=PROPFIND
-HEAD
diff --git a/testing/tests/chandler/PROPFIND2.test b/testing/tests/chandler/PROPFIND2.test
deleted file mode 100644
index aef95705..00000000
--- a/testing/tests/chandler/PROPFIND2.test
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Test the initial PROPFIND for the root.
-#
-TYPE=PROPFIND
-HEADER=Depth: 1
-HEADER=Content-Type: text/xml; charset="utf-8"
-URL=http://mycaldav/caldav.php/
-DATA=PROPFIND
-HEAD
diff --git a/testing/tests/chandler/REPORT.test b/testing/tests/chandler/REPORT.test
deleted file mode 100644
index f1fa10df..00000000
--- a/testing/tests/chandler/REPORT.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Test the REPORT request from Mulberry
-#
-TYPE=REPORT
-HEADER=Content-Type: text/xml; charset=utf-8
-URL=http://mycaldav/caldav.php/andrew/mulberry/
-HEAD
\ No newline at end of file
diff --git a/testing/tests/chandler/privilege.data b/testing/tests/chandler/privilege.data
deleted file mode 100644
index 318e485a..00000000
--- a/testing/tests/chandler/privilege.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>
\ No newline at end of file
diff --git a/testing/tests/chandler/privilege.test b/testing/tests/chandler/privilege.test
deleted file mode 100644
index 12e21bd0..00000000
--- a/testing/tests/chandler/privilege.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Test the initial PROPFIND for the root.
-#
-TYPE=PROPFIND
-HEADER=Depth: 0
-HEADER=Content-Type: text/xml; charset="utf-8"
-URL=http://mycaldav/caldav.php/andrew/
diff --git a/testing/tests/chandler/ticketdiscovery.data b/testing/tests/chandler/ticketdiscovery.data
deleted file mode 100644
index f179b57a..00000000
--- a/testing/tests/chandler/ticketdiscovery.data
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:propfind xmlns:ns0="DAV:"><ns0:prop><ns1:ticketdiscovery xmlns:ns1="http://www.xythos.com/namespaces/StorageServer" /><ns0:getetag /><ns0:resourcetype /><ns0:displayname /></ns0:prop></ns0:propfind>
\ No newline at end of file
diff --git a/testing/tests/chandler/ticketdiscovery.test b/testing/tests/chandler/ticketdiscovery.test
deleted file mode 100644
index 12e21bd0..00000000
--- a/testing/tests/chandler/ticketdiscovery.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Test the initial PROPFIND for the root.
-#
-TYPE=PROPFIND
-HEADER=Depth: 0
-HEADER=Content-Type: text/xml; charset="utf-8"
-URL=http://mycaldav/caldav.php/andrew/
diff --git a/testing/tests/evolution/DELETE1.test b/testing/tests/evolution/DELETE1.test
deleted file mode 100644
index f80f76b0..00000000
--- a/testing/tests/evolution/DELETE1.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# DELETE a calendar entry by Evolution
-#
-TYPE=DELETE
-URL=http://mycaldav/caldav.php/andrew/20061007T100911Z.ics
-HEADER=If-None-Match: "19eae6c3442ae90f29f17463e64576bc"
-HEAD
\ No newline at end of file
diff --git a/testing/tests/evolution/OPTIONS.test b/testing/tests/evolution/OPTIONS.test
deleted file mode 100644
index 029a4dd2..00000000
--- a/testing/tests/evolution/OPTIONS.test
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Test the initial OPTIONS for the root
-#
-TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/andrew/
-HEAD
\ No newline at end of file
diff --git a/testing/tests/evolution/PUT1.data b/testing/tests/evolution/PUT1.data
deleted file mode 100644
index 4eb74514..00000000
--- a/testing/tests/evolution/PUT1.data
+++ /dev/null
@@ -1,66 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:20061007T100632Z-6619-1000-1-710@ubu
-DTSTAMP:20061007T100632Z
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
- 20061009T090000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
- 20061009T100000
-TRANSP:OPAQUE
-SEQUENCE:3
-SUMMARY:An event with several alarms
-LOCATION:Monday
-CLASS:PUBLIC
-CREATED:20061007T100733
-LAST-MODIFIED:20061007T100733
-X-EVOLUTION-CALDAV-HREF:http:
- //andrew@mycaldav/caldav.php/andrew/20061007T100911Z.ics
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20061007T100733Z-8001-1000-1-21@ubu
-DESCRIPTION:An event with several alarms
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-END:VALARM
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20061007T100821Z-8001-1000-1-26@ubu
-TRIGGER;VALUE=DURATION;RELATED=START:-PT20M
-ACTION:DISPLAY
-DESCRIPTION:An event with several alarms
-END:VALARM
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20061007T100832Z-8001-1000-1-27@ubu
-TRIGGER;VALUE=DURATION;RELATED=START:-PT1H
-ACTION:DISPLAY
-REPEAT:1
-DURATION:PT10M
-DESCRIPTION:An event with several alarms
-END:VALARM
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20061007T100852Z-8001-1000-1-28@ubu
-TRIGGER;VALUE=DURATION;RELATED=START:-P1D
-ACTION:DISPLAY
-DESCRIPTION:An event with several alarms
-END:VALARM
-END:VEVENT
-BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20011030_5/Pacific/Auckland
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
diff --git a/testing/tests/evolution/PUT1.test b/testing/tests/evolution/PUT1.test
deleted file mode 100644
index 64c5a7f9..00000000
--- a/testing/tests/evolution/PUT1.test
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# PUT a calendar entry into the Evolution calendar
-#
-TYPE=PUT
-URL=http://mycaldav/caldav.php/andrew/20061007T100911Z.ics
-HEADER=If-None-Match: *
-HEADER=Content-Type: text/calendar
-HEAD
\ No newline at end of file
diff --git a/testing/tests/evolution/REPORT.data b/testing/tests/evolution/REPORT.data
deleted file mode 100644
index 9e62d01d..00000000
--- a/testing/tests/evolution/REPORT.data
+++ /dev/null
@@ -1,12 +0,0 @@
-<C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:D="DAV:">
-  <D:prop>
-    <D:getetag/>
-  </D:prop>
-  <C:filter>
-    <C:comp-filter name="VCALENDAR">
-      <C:comp-filter name="VEVENT">
-        <C:is-defined/>
-      </C:comp-filter>
-    </C:comp-filter>
-  </C:filter>
-</C:calendar-query>
\ No newline at end of file
diff --git a/testing/tests/evolution/REPORT.test b/testing/tests/evolution/REPORT.test
deleted file mode 100644
index 819ffbbf..00000000
--- a/testing/tests/evolution/REPORT.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Test the REPORT request
-#
-TYPE=REPORT
-URL=http://mycaldav/caldav.php/andrew/
-HEADER=Content-Type: text/xml
-HEAD
\ No newline at end of file
diff --git a/testing/tests/mulberry/GET1.test b/testing/tests/mulberry/GET1.test
deleted file mode 100644
index f74d8153..00000000
--- a/testing/tests/mulberry/GET1.test
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# GET a calendar entry from the Mulberry calendar
-#
-TYPE=GET
-URL=http://mycaldav/caldav.php/andrew/mulberry/30A56217E5719B1453D1942F83106C7A-0.ics
diff --git a/testing/tests/mulberry/PROPFIND-initial.data b/testing/tests/mulberry/PROPFIND-initial.data
deleted file mode 100644
index 032be966..00000000
--- a/testing/tests/mulberry/PROPFIND-initial.data
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:getcontentlength/>
-<D:getcontenttype/>
-<D:resourcetype/>
-</D:prop>
-</D:propfind>
diff --git a/testing/tests/mulberry/PROPFIND-initial.test b/testing/tests/mulberry/PROPFIND-initial.test
deleted file mode 100644
index 89d22748..00000000
--- a/testing/tests/mulberry/PROPFIND-initial.test
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# After creating a calendar in Mulberry, we should be able
-# to do a PROPFIND and discover it.
-TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/
-HEADER=Depth: 1
-HEADER=Content-Type: text/xml; charset=utf-8
-HEAD
-VERBOSE
\ No newline at end of file
diff --git a/testing/tests/mulberry/PROPFIND-mulberry.data b/testing/tests/mulberry/PROPFIND-mulberry.data
deleted file mode 100644
index 20f99279..00000000
--- a/testing/tests/mulberry/PROPFIND-mulberry.data
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:getcontentlength/>
-<D:getcontenttype/>
-<D:resourcetype/>
-<D:getetag/>
-</D:prop>
-</D:propfind>
diff --git a/testing/tests/mulberry/PROPFIND-mulberry.test b/testing/tests/mulberry/PROPFIND-mulberry.test
deleted file mode 100644
index d83d38c0..00000000
--- a/testing/tests/mulberry/PROPFIND-mulberry.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# After creating a calendar in Mulberry, we should be able
-# to do a PROPFIND and discover it.
-TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/andrew/mulberry/
-HEADER=Depth: 1
-HEADER=Content-Type: text/xml; charset=utf-8
diff --git a/testing/tests/mulberry/PUT1.data b/testing/tests/mulberry/PUT1.data
deleted file mode 100644
index 5956e80a..00000000
--- a/testing/tests/mulberry/PUT1.data
+++ /dev/null
@@ -1,31 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20061004T072647Z
-DTSTART;TZID=New Zealand Standard Time:20061004T111500
-DURATION:PT1H
-SUMMARY:A new event
-UID:73CEA660B2AB08BE90C9D6B5@D76FAF7B10D9E8D2D41F779C
-END:VEVENT
-END:VCALENDAR
diff --git a/testing/tests/mulberry/PUT1.test b/testing/tests/mulberry/PUT1.test
deleted file mode 100644
index f2426912..00000000
--- a/testing/tests/mulberry/PUT1.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# PUT a calendar entry into the Mulberry calendar
-#
-TYPE=PUT
-URL=http://mycaldav/caldav.php/andrew/mulberry/30A56217E5719B1453D1942F83106C7A-0.ics
-HEADER=Content-Type: text/calendar; charset=utf-8
-HEAD
\ No newline at end of file
diff --git a/testing/tests/mulberry/PUT2.data b/testing/tests/mulberry/PUT2.data
deleted file mode 100644
index 73adafe2..00000000
--- a/testing/tests/mulberry/PUT2.data
+++ /dev/null
@@ -1,33 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DESCRIPTION:Weigh a pie
-DTSTAMP:20061004T102416Z
-DTSTART;TZID=New Zealand Standard Time:20061004T110000
-DURATION:PT1H
-LOCATION:Somewhere over the rainbow
-SUMMARY:11am on Wednesday\, 4th
-UID:A1E59F7D54EF85BE2A7E6900@CA1CBED546AAE36FF3BC722E
-END:VEVENT
-END:VCALENDAR
diff --git a/testing/tests/mulberry/PUT2.test b/testing/tests/mulberry/PUT2.test
deleted file mode 100644
index ce3a9fd2..00000000
--- a/testing/tests/mulberry/PUT2.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# PUT a calendar entry into the Mulberry calendar
-#
-TYPE=PUT
-URL=http://mycaldav/caldav.php/andrew/mulberry/F91ACE37725E396C1A4BB87568CE36C0-0.ics
-HEADER=Content-Type: text/calendar; charset=utf-8
-HEAD
\ No newline at end of file
diff --git a/testing/tests/mulberry/REPORT-1href.data b/testing/tests/mulberry/REPORT-1href.data
deleted file mode 100644
index f6eea5b7..00000000
--- a/testing/tests/mulberry/REPORT-1href.data
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<D:href>/caldav.php/andrew/mulberry/30A56217E5719B1453D1942F83106C7A-0.ics</D:href>
-<D:href>/caldav.php/andrew/mulberry/F91ACE37725E396C1A4BB87568CE36C0-0.ics</D:href>
-</C:calendar-multiget>
\ No newline at end of file
diff --git a/testing/tests/mulberry/REPORT-1href.test b/testing/tests/mulberry/REPORT-1href.test
deleted file mode 100644
index 54bb72d1..00000000
--- a/testing/tests/mulberry/REPORT-1href.test
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Test the REPORT request
-#
-TYPE=REPORT
-URL=http://mycaldav/caldav.php/andrew/mulberry/
-HEADER=Content-Type: text/xml; charset=utf-8
-HEAD
\ No newline at end of file