diff --git a/testing/tests/regression-suite/0102-Evo-REPORT-1.data b/testing/tests/regression-suite/0102-Evo-REPORT-1.data
deleted file mode 100644
index 16ac817c..00000000
--- a/testing/tests/regression-suite/0102-Evo-REPORT-1.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>
diff --git a/testing/tests/regression-suite/0105-Evo-REPORT-1.data b/testing/tests/regression-suite/0105-Evo-REPORT-1.data
deleted file mode 100644
index 16ac817c..00000000
--- a/testing/tests/regression-suite/0105-Evo-REPORT-1.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>
diff --git a/testing/tests/regression-suite/0105-Evo-REPORT-1.test b/testing/tests/regression-suite/0105-Evo-REPORT-1.test
index 7b00d278..2c0ef352 100644
--- a/testing/tests/regression-suite/0105-Evo-REPORT-1.test
+++ b/testing/tests/regression-suite/0105-Evo-REPORT-1.test
@@ -6,3 +6,18 @@ HEAD
 HEADER=Depth: 1
 HEADER=User-Agent: Evolution/1.8.1
 HEADER=Content-Type: text/xml
+
+BEGINDATA
+<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>
+ENDDATA
diff --git a/testing/tests/regression-suite/0107-Evo-REPORT-1.test b/testing/tests/regression-suite/0107-Evo-REPORT-1.test
index a9323010..820ae583 100644
--- a/testing/tests/regression-suite/0107-Evo-REPORT-1.test
+++ b/testing/tests/regression-suite/0107-Evo-REPORT-1.test
@@ -7,4 +7,19 @@ HEAD
 HEADER=Depth: 1
 HEADER=User-Agent: Evolution/1.8.1
 HEADER=Content-Type: text/xml
-DATA=105-Evo-REPORT-1
+
+BEGINDATA
+<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>
+ENDDATA
+
diff --git a/testing/tests/regression-suite/0108-Evo-REPORT-1.test b/testing/tests/regression-suite/0108-Evo-REPORT-1.test
index a1a24e83..b3188080 100644
--- a/testing/tests/regression-suite/0108-Evo-REPORT-1.test
+++ b/testing/tests/regression-suite/0108-Evo-REPORT-1.test
@@ -7,4 +7,18 @@ HEAD
 HEADER=Depth: 1
 HEADER=User-Agent: Evolution/1.8.1
 HEADER=Content-Type: text/xml
-DATA=105-Evo-REPORT-1
+
+BEGINDATA
+<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>
+ENDDATA
diff --git a/testing/tests/regression-suite/0202-Moz-REPORT-1.data b/testing/tests/regression-suite/0202-Moz-REPORT-1.data
deleted file mode 100644
index c27d131e..00000000
--- a/testing/tests/regression-suite/0202-Moz-REPORT-1.data
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
-  <D:prop>
-    <calendar-data/>
-  </D:prop>
-  <filter>
-    <comp-filter name="VCALENDAR">
-      <comp-filter name="VEVENT">
-        <time-range start="20061009T003736Z" end="20061209T003736Z"/>
-      </comp-filter>
-    </comp-filter>
-  </filter>
-</calendar-query>
diff --git a/testing/tests/regression-suite/0202-Moz-REPORT-1.test b/testing/tests/regression-suite/0202-Moz-REPORT-1.test
index 9f4bbfc2..37cfd665 100644
--- a/testing/tests/regression-suite/0202-Moz-REPORT-1.test
+++ b/testing/tests/regression-suite/0202-Moz-REPORT-1.test
@@ -11,3 +11,19 @@ HEADER=Accept-Language: en-us,en;q=0.5
 HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
 HEADER=Content-Type: text/xml
 HEADER=Depth: 1
+
+BEGINDATA
+<?xml version="1.0" encoding="UTF-8"?>
+<calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
+  <D:prop>
+    <calendar-data/>
+  </D:prop>
+  <filter>
+    <comp-filter name="VCALENDAR">
+      <comp-filter name="VEVENT">
+        <time-range start="20061009T003736Z" end="20061209T003736Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
+ENDDATA
diff --git a/testing/tests/regression-suite/0204-Moz-REPORT-3.test b/testing/tests/regression-suite/0204-Moz-REPORT-3.test
index d82b3ff7..891d0a70 100644
--- a/testing/tests/regression-suite/0204-Moz-REPORT-3.test
+++ b/testing/tests/regression-suite/0204-Moz-REPORT-3.test
@@ -11,4 +11,18 @@ HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
 HEADER=Content-Type: text/xml
 HEADER=Depth: 1
 
-DATA=202-Moz-REPORT-1
+BEGINDATA
+<?xml version="1.0" encoding="UTF-8"?>
+<calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
+  <D:prop>
+    <calendar-data/>
+  </D:prop>
+  <filter>
+    <comp-filter name="VCALENDAR">
+      <comp-filter name="VEVENT">
+        <time-range start="20061009T003736Z" end="20061209T003736Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
+ENDDATA
diff --git a/testing/tests/regression-suite/0207-Moz-REPORT-4.data b/testing/tests/regression-suite/0207-Moz-REPORT-4.data
deleted file mode 100644
index e9a0992d..00000000
--- a/testing/tests/regression-suite/0207-Moz-REPORT-4.data
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
-  <D:prop>
-    <calendar-data/>
-  </D:prop>
-  <filter>
-    <comp-filter name="VCALENDAR">
-      <comp-filter name="VEVENT">
-        <time-range start="20061209T110000Z" end="20061217T110000Z"/>
-      </comp-filter>
-    </comp-filter>
-  </filter>
-</calendar-query>
\ No newline at end of file
diff --git a/testing/tests/regression-suite/0304-Chandler-TEST-1.data b/testing/tests/regression-suite/0304-Chandler-TEST-1.data
deleted file mode 100644
index 60c72dc1..00000000
--- a/testing/tests/regression-suite/0304-Chandler-TEST-1.data
+++ /dev/null
@@ -1 +0,0 @@
-Write access test
\ No newline at end of file
diff --git a/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.data b/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.data
deleted file mode 100644
index 4e471cad..00000000
--- a/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.data
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<propfind xmlns="DAV:"><prop>
-<getcontentlength xmlns="DAV:"/>
-<getlastmodified xmlns="DAV:"/>
-<executable xmlns="http://apache.org/dav/props/"/>
-<resourcetype xmlns="DAV:"/>
-<checked-in xmlns="DAV:"/>
-<checked-out xmlns="DAV:"/>
-</prop></propfind>