diff --git a/testing/tests/regression-suite/0310-Chandler-PUT-1.test b/testing/tests/regression-suite/0310-Chandler-PUT-1.test
index dd9898ea..7a046b0e 100644
--- a/testing/tests/regression-suite/0310-Chandler-PUT-1.test
+++ b/testing/tests/regression-suite/0310-Chandler-PUT-1.test
@@ -5,6 +5,53 @@ TYPE=PUT
 URL=http://mycaldav/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics
 HEADER=Content-Type: text/calendar
 HEAD
+
 #
 # Somewhat atypical Chandler data since I insisted it use a timezone on this occasion
-DATA=71e2ae82-7870-11db-c6d6-f6927c144649.ics
\ No newline at end of file
+BEGINDATA
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:STANDARD
+DTSTART:20000319T030000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=3
+TZNAME:Pacific/Auckland
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20001001T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:Pacific/Auckland
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:71e2ae82-7870-11db-c6d6-f6927c144649
+DTSTAMP:20060511T043751Z
+DTSTART;TZID=Pacific/Auckland:20061103T160000
+DTEND;TZID=Pacific/Auckland:20061103T174500
+DESCRIPTION:
+LOCATION:Level 3
+RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20071222T235900
+STATUS:CONFIRMED
+SUMMARY:Beer O'Clock
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+QUERY
+SELECT caldav_data.user_no, caldav_type, logged_user, 
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart,
+       dtend at time zone tz_locn as dtend, due, summary, location,
+       description, priority, class, transp, rrule, url,
+       percent_complete, tz_id, status,
+       last_modified,
+       caldav_data AS "A1 CalDAV DATA"
+FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id)
+WHERE caldav_data.dav_name =
+ '/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics';
+ENDQUERY
diff --git a/testing/tests/regression-suite/0311-Chandler-PUT-2.test b/testing/tests/regression-suite/0311-Chandler-PUT-2.test
index f391a6d5..80cfb94c 100644
--- a/testing/tests/regression-suite/0311-Chandler-PUT-2.test
+++ b/testing/tests/regression-suite/0311-Chandler-PUT-2.test
@@ -5,6 +5,36 @@ TYPE=PUT
 URL=http://mycaldav/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics
 HEADER=Content-Type: text/calendar
 HEAD
+
 #
 # More typical Chandler data, without any timezone information.
-DATA=da81c0ee-7871-11db-c6d6-f6927c144649.ics
\ No newline at end of file
+BEGINDATA
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:da81c0ee-7871-11db-c6d6-f6927c144649
+DTSTAMP:20061024T115217Z
+DTSTART:20061103T073000
+DTEND:20061103T093000
+DESCRIPTION:
+LOCATION:Olivia's
+RRULE:FREQ=MONTHLY
+STATUS:CONFIRMED
+SUMMARY:Morning Mgmt Mtg
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+QUERY
+SELECT caldav_data.user_no, caldav_type, logged_user, 
+       uid, dtstamp, dtstart::timestamp without time zone,
+       dtend::timestamp without time zone, due, summary, location,
+       description, priority, class, transp, rrule, url,
+       percent_complete, tz_id, status,
+       last_modified,
+       caldav_data AS "A1 CalDAV DATA"
+FROM caldav_data LEFT OUTER JOIN calendar_item USING(dav_id)
+WHERE caldav_data.dav_name = '/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics'
+ENDQUERY
+
diff --git a/testing/tests/regression-suite/71e2ae82-7870-11db-c6d6-f6927c144649.ics.data b/testing/tests/regression-suite/71e2ae82-7870-11db-c6d6-f6927c144649.ics.data
deleted file mode 100644
index 3560139a..00000000
--- a/testing/tests/regression-suite/71e2ae82-7870-11db-c6d6-f6927c144649.ics.data
+++ /dev/null
@@ -1,31 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-DTSTART:20000319T030000
-RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=3
-TZNAME:Pacific/Auckland
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20001001T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:Pacific/Auckland
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:71e2ae82-7870-11db-c6d6-f6927c144649
-DTSTART;TZID=Pacific/Auckland:20061103T160000
-DTEND;TZID=Pacific/Auckland:20061103T174500
-DESCRIPTION:
-LOCATION:Level 3
-RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20071222T235900
-STATUS:CONFIRMED
-SUMMARY:Beer O'Clock
-END:VEVENT
-END:VCALENDAR
diff --git a/testing/tests/regression-suite/da81c0ee-7871-11db-c6d6-f6927c144649.ics.data b/testing/tests/regression-suite/da81c0ee-7871-11db-c6d6-f6927c144649.ics.data
deleted file mode 100644
index 300a9f77..00000000
--- a/testing/tests/regression-suite/da81c0ee-7871-11db-c6d6-f6927c144649.ics.data
+++ /dev/null
@@ -1,14 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:da81c0ee-7871-11db-c6d6-f6927c144649
-DTSTART:20061103T073000
-DTEND:20061103T093000
-DESCRIPTION:
-LOCATION:Olivia's
-RRULE:FREQ=MONTHLY
-STATUS:CONFIRMED
-SUMMARY:Morning Mgmt Mtg
-END:VEVENT
-END:VCALENDAR