diff --git a/testing/tests/carddav/2035-REPORT-addressbook-query-prep.result b/testing/tests/carddav/2035-REPORT-addressbook-query-prep.result
new file mode 100644
index 00000000..e69de29b
diff --git a/testing/tests/carddav/2035-REPORT-addressbook-query-prep.test b/testing/tests/carddav/2035-REPORT-addressbook-query-prep.test
new file mode 100644
index 00000000..9f5f5996
--- /dev/null
+++ b/testing/tests/carddav/2035-REPORT-addressbook-query-prep.test
@@ -0,0 +1,22 @@
+#
+# Prepare for the next test.
+#
+TYPE=PUT
+URL=http://regression.host/caldav.php/user1/addressbook/test_multiple_email.vcf
+
+HEADER=Accept: text/xml,application/xml
+HEADER=Content-Type: text/vcard
+
+# HEAD
+
+BEGINDATA
+BEGIN:VCARD
+VERSION:4.0
+PRODID:-//Sabre//Sabre VObject 4.3.3//EN
+UID:sabre-vobject-131cdf91-5460-423b-a836-e420e5affe13
+FN:CardDavClient Test212420682
+N:Test212420682;CardDavClient;;;
+EMAIL;TYPE=HOME:john6doe@example.com
+EMAIL;TYPE=WORK:doe6@example.com
+END:VCARD
+ENDDATA
diff --git a/testing/tests/carddav/2036-REPORT-addressbook-query.result b/testing/tests/carddav/2036-REPORT-addressbook-query.result
new file mode 100644
index 00000000..1401db3c
--- /dev/null
+++ b/testing/tests/carddav/2036-REPORT-addressbook-query.result
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:" xmlns:VC="urn:ietf:params:xml:ns:carddav">
+ <response>
+  <href>/caldav.php/user1/addressbook/test_multiple_email.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:4.0
+PRODID:-//Sabre//Sabre VObject 4.3.3//EN
+UID:sabre-vobject-131cdf91-5460-423b-a836-e420e5affe13
+FN:CardDavClient Test212420682
+N:Test212420682;CardDavClient;;;
+EMAIL;TYPE=HOME:john6doe@example.com
+EMAIL;TYPE=WORK:doe6@example.com
+REV:date
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/carddav/2036-REPORT-addressbook-query.test b/testing/tests/carddav/2036-REPORT-addressbook-query.test
new file mode 100644
index 00000000..3c57110e
--- /dev/null
+++ b/testing/tests/carddav/2036-REPORT-addressbook-query.test
@@ -0,0 +1,29 @@
+#
+# Request a REPORT 
+#
+TYPE=REPORT
+URL=http://regression.host/caldav.php/user1/addressbook/
+
+HEADER=Accept: text/xml,application/xml
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
+
+# HEAD
+
+BEGINDATA
+<?xml version="1.0"?>
+<C:addressbook-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+ <D:prop>
+  <D:getetag/>
+  <C:address-data/>
+ </D:prop>
+ <C:filter test="anyof">
+  <C:prop-filter name="EMAIL" test="anyof">
+   <C:text-match negate-condition="no" collation="i;unicode-casemap" match-type="equals">doe6@example.com</C:text-match>
+  </C:prop-filter>
+ </C:filter>
+</C:addressbook-query>
+ENDDATA
+
+REPLACE=_<getetag>"[0-9a-f]+"</getetag>_<getetag>some valid etag</getetag>_
+REPLACE=/^REV:.*$/REV:date/
diff --git a/testing/tests/carddav/2039-REPORT-sync-changed.result b/testing/tests/carddav/2039-REPORT-sync-changed.result
index b984c011..43ef6f61 100644
--- a/testing/tests/carddav/2039-REPORT-sync-changed.result
+++ b/testing/tests/carddav/2039-REPORT-sync-changed.result
@@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 ETag: "a fine looking etag"
-Content-Length: 1795
+Content-Length: 2031
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -62,6 +62,15 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/addressbook/test_multiple_email.vcf</href>
+  <propstat>
+   <prop>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/addressbook/van_houtte.vcf</href>
   <propstat>