diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dfdd560..b41432f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,5 +67,5 @@ test:
     - a2enmod rewrite
     - apache2ctl start
     - useradd testrunner
-    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav" ./run_regressions.sh all x'
+    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling" ./run_regressions.sh all x'
   
diff --git a/testing/tests/scheduling/3026-PUT-Accept.result b/testing/tests/scheduling/3026-PUT-Accept.result
index 7e2d43ed..7a745c92 100644
--- a/testing/tests/scheduling/3026-PUT-Accept.result
+++ b/testing/tests/scheduling/3026-PUT-Accept.result
@@ -38,7 +38,8 @@ SEQUENCE:5
 ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
  mailto:manager1@example.net
 ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
- PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
+ PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT;SCHEDULE-STATUS=2.0:mailto:user1@
+ example.net
 END:VEVENT
 END:VCALENDAR
 <
@@ -76,7 +77,8 @@ DTEND;TZID=Pacific/Auckland:20111019T110000
 ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
  mailto:manager1@example.net
 ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
- PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
+ PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT;SCHEDULE-STATUS=2.0:mailto:user1@
+ example.net
 TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T100000
@@ -90,44 +92,23 @@ END:VCALENDAR
       caldav_type: >VEVENT<
          dav_name: >/manager1/.in/user1E1A13F04-iCal-schedule.ics<
       logged_user: >10<
-          summary: >Meeting with User1<
+          summary: >NULL<
           user_no: >20<
         vcalendar: >BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Apple Inc.//iCal 4.0.4//EN
 CALSCALE:GREGORIAN
 METHOD:REPLY
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-DTSTART:20070930T020000
-TZNAME:GMT+13:00
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-DTSTART:20080406T030000
-TZNAME:GMT+12:00
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
 BEGIN:VEVENT
-CREATED:20111018T195845Z
 UID:E1A13F04-iCal-schedule
-DTEND;TZID=Pacific/Auckland:20111019T110000
-TRANSP:OPAQUE
-SUMMARY:Meeting with User1
-DTSTART;TZID=Pacific/Auckland:20111019T100000
-DTSTAMP:looks good
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+DTEND:20111018T220000Z
+DTSTART:20111018T210000Z
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:5
-ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
- mailto:manager1@example.net
-ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
- PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
+ATTENDEE;CN=user1@example.net;EMAIL=user1@example.net;PARTSTAT=ACCEPTED;
+ ROLE=REQ-PARTICIPANT:mailto:user1@example.net
+DTSTAMP:looks good
+REQUEST-STATUS:2.0
 END:VEVENT
 END:VCALENDAR
 <
diff --git a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
index 29a61b75..83761939 100644
--- a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
@@ -97,44 +97,23 @@ END:VCALENDAR
       caldav_type: >VEVENT<
          dav_name: >/manager1/.in/user1E1A13F04-iCal-schedule.ics<
       logged_user: >10<
-          summary: >Meeting with User1<
+          summary: >NULL<
           user_no: >20<
         vcalendar: >BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Apple Inc.//iCal 4.0.4//EN
 CALSCALE:GREGORIAN
 METHOD:REPLY
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-DTSTART:20070930T020000
-TZNAME:GMT+13:00
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-DTSTART:20080406T030000
-TZNAME:GMT+12:00
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
 BEGIN:VEVENT
-CREATED:20111018T195845Z
 UID:E1A13F04-iCal-schedule
-DTEND;TZID=Pacific/Auckland:20111019T110000
-TRANSP:OPAQUE
-SUMMARY:Meeting with User1
-DTSTART;TZID=Pacific/Auckland:20111019T100000
-DTSTAMP:looks good
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+DTEND:20111018T220000Z
+DTSTART:20111018T210000Z
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:5
-ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
- mailto:manager1@example.net
-ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
- PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
+ATTENDEE;CN=user1@example.net;EMAIL=user1@example.net;PARTSTAT=ACCEPTED;
+ ROLE=REQ-PARTICIPANT:mailto:user1@example.net
+DTSTAMP:looks good
+REQUEST-STATUS:2.0
 END:VEVENT
 END:VCALENDAR
 <
diff --git a/testing/tests/scheduling/3030-DELETE-attendee-event.result b/testing/tests/scheduling/3030-DELETE-attendee-event.result
index e2bba008..68f4878d 100644
--- a/testing/tests/scheduling/3030-DELETE-attendee-event.result
+++ b/testing/tests/scheduling/3030-DELETE-attendee-event.result
@@ -54,12 +54,11 @@ METHOD:REPLY
 BEGIN:VEVENT
 UID:E1A13F04-iCal-schedule
 DTEND:20111019T010000Z
-ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
- PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
- :mailto:user1@example.net
 DTSTART:20111019T000000Z
 ORGANIZER;CN=Manager 1:mailto:manager1@example.net
-SEQUENCE:7
+SEQUENCE:6
+ATTENDEE;CN=user1@example.net;EMAIL=user1@example.net;PARTSTAT=DECLINED;
+ ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@example.net
 DTSTAMP:looks good
 REQUEST-STATUS:2.0
 END:VEVENT