diff --git a/testing/tests/regression-suite/208-Moz-REPORT-5.data b/testing/tests/regression-suite/208-Moz-REPORT-5.data
deleted file mode 100644
index 1e078850..00000000
--- a/testing/tests/regression-suite/208-Moz-REPORT-5.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="20061201T120000Z" end="20070506T120000Z"/>
-      </comp-filter>
-    </comp-filter>
-  </filter>
-</calendar-query>
diff --git a/testing/tests/regression-suite/208-Moz-REPORT-5.test b/testing/tests/regression-suite/208-Moz-REPORT-5.test
index 2919442b..c2545727 100644
--- a/testing/tests/regression-suite/208-Moz-REPORT-5.test
+++ b/testing/tests/regression-suite/208-Moz-REPORT-5.test
@@ -13,3 +13,19 @@ HEADER=Keep-Alive: 300
 HEADER=Content-Type: text/xml
 HEADER=Depth: 1
 HEAD
+
+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="20061201T120000Z" end="20070506T120000Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
+ENDDATA
diff --git a/testing/tests/regression-suite/218-Moz-REPORT.test b/testing/tests/regression-suite/218-Moz-REPORT.test
index fa7e3f54..fad88ece 100644
--- a/testing/tests/regression-suite/218-Moz-REPORT.test
+++ b/testing/tests/regression-suite/218-Moz-REPORT.test
@@ -14,4 +14,19 @@ HEADER=Content-Type: text/xml
 HEADER=Depth: 1
 HEAD
 
-DATA=208-Moz-REPORT-5
+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="20061201T120000Z" end="20070506T120000Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
+ENDDATA
+
diff --git a/testing/tests/regression-suite/219-Moz-REPORT.test b/testing/tests/regression-suite/219-Moz-REPORT.test
index 45a0ff7a..a6ec4266 100644
--- a/testing/tests/regression-suite/219-Moz-REPORT.test
+++ b/testing/tests/regression-suite/219-Moz-REPORT.test
@@ -14,4 +14,19 @@ HEADER=Content-Type: text/xml
 HEADER=Depth: 1
 HEAD
 
-DATA=208-Moz-REPORT-5
+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="20061201T120000Z" end="20070506T120000Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
+ENDDATA
+
diff --git a/testing/tests/regression-suite/900-Moz-REPORT.data b/testing/tests/regression-suite/900-Moz-REPORT.data
deleted file mode 100644
index e44ff8da..00000000
--- a/testing/tests/regression-suite/900-Moz-REPORT.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="20061125T110000Z" end="20070107T110000Z"/>
-      </comp-filter>
-    </comp-filter>
-  </filter>
-</calendar-query>
diff --git a/testing/tests/regression-suite/900-Moz-REPORT.test b/testing/tests/regression-suite/900-Moz-REPORT.test
index 92b4ebfc..e16e19b5 100644
--- a/testing/tests/regression-suite/900-Moz-REPORT.test
+++ b/testing/tests/regression-suite/900-Moz-REPORT.test
@@ -14,3 +14,21 @@ HEADER=Connection: keep-alive
 HEADER=Content-Type: text/xml
 HEADER=Depth: 1
 HEAD
+
+
+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="20061125T110000Z" end="20070107T110000Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
+ENDDATA
+