diff --git a/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result
new file mode 100644
index 00000000..772afcc8
--- /dev/null
+++ b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:" xmlns:VC="urn:ietf:params:xml:ns:carddav">
+ <response>
+  <href>/caldav.php/user5/addresses/sabre-vobject-131cdf91-5460-423b-a836-e420e5affe13.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;;;
+NICKNAME:Jonny0
+EMAIL;TYPE=HOME:john6doe@example.com
+EMAIL;TYPE=WORK:doe6@example.com
+X-CUSTOMPROP;X-CUSTOMPARAM=WORK:foobar
+REV:date
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user5/addresses/sabre-vobject-8121cd7a-8251-4b74-a952-ca91fdc21e36.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-8121cd7a-8251-4b74-a952-ca91fdc21e36
+FN:CardDavClient Test913043917
+N:Test913043917;CardDavClient;;;
+NICKNAME:Jonny1
+EMAIL:maxmu@abcd.com
+X-CUSTOMPROP;X-CUSTOMPARAM=HOME,WORK:foobar
+REV:date
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user5/addresses/sabre-vobject-34cd55a8-330f-47cd-8b69-6fbd16a0880b.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-34cd55a8-330f-47cd-8b69-6fbd16a0880b
+FN:CardDavClient Test1520108081
+N:Test1520108081;CardDavClient;;;
+NICKNAME:Jonny3
+ITEM1.EMAIL:foo@ex.com
+ITEM1.X-ABLABEL:CustomLabel
+IMPP;X-SERVICE-TYPE=Jabber;TYPE=HOME:xmpp:foo@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/2052-REPORT-carddavclient-HasEmailAndIMP.test b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.test
new file mode 100644
index 00000000..8d2463b7
--- /dev/null
+++ b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.test
@@ -0,0 +1,32 @@
+#
+# Request a REPORT for two properties, both of which must be defined
+#
+# (Jonny0 and Jonny1 have only one of them and must not be returned)
+#
+TYPE=REPORT
+URL=http://regression.host/caldav.php/user5/addresses/
+
+HEADER=Accept: text/xml,application/xml
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
+
+AUTH=user5:user5
+
+# HEAD
+
+BEGINDATA
+<?xml version="1.0"?>
+<CARDDAV:addressbook-query xmlns:DAV="DAV:" xmlns:CARDDAV="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/">
+ <DAV:prop>
+  <DAV:getetag/>
+  <CARDDAV:address-data/>
+ </DAV:prop>
+ <CARDDAV:filter test="allof">
+  <CARDDAV:prop-filter name="EMAIL" test="anyof"/>
+  <CARDDAV:prop-filter name="IMPP" test="anyof"/>
+ </CARDDAV:filter>
+</CARDDAV:addressbook-query>
+ENDDATA
+
+REPLACE=_<getetag>"[0-9a-f]+"</getetag>_<getetag>some valid etag</getetag>_
+REPLACE=/^REV:.*$/REV:date/
diff --git a/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result
new file mode 100644
index 00000000..28dabef6
--- /dev/null
+++ b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:"/>
diff --git a/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.test b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.test
new file mode 100644
index 00000000..a8bf4e64
--- /dev/null
+++ b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.test
@@ -0,0 +1,35 @@
+#
+# Request a REPORT for a property which satisfies any of two text-match
+# conditions, only one of which actually matches
+#
+# (this must return both Jonny0 and Jonny1)
+#
+TYPE=REPORT
+URL=http://regression.host/caldav.php/user5/addresses/
+
+HEADER=Accept: text/xml,application/xml
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
+
+AUTH=user5:user5
+
+# HEAD
+
+BEGINDATA
+<?xml version="1.0"?>
+<CARDDAV:addressbook-query xmlns:DAV="DAV:" xmlns:CARDDAV="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/">
+ <DAV:prop>
+  <DAV:getetag/>
+  <CARDDAV:address-data/>
+ </DAV:prop>
+ <CARDDAV:filter test="anyof">
+  <CARDDAV:prop-filter name="EMAIL" test="anyof">
+   <CARDDAV:text-match negate-condition="no" collation="i;unicode-casemap" match-type="starts-with">doe</CARDDAV:text-match>
+   <CARDDAV:text-match negate-condition="no" collation="i;unicode-casemap" match-type="ends-with">abcd.com</CARDDAV:text-match>
+  </CARDDAV:prop-filter>
+ </CARDDAV:filter>
+</CARDDAV:addressbook-query>
+ENDDATA
+
+REPLACE=_<getetag>"[0-9a-f]+"</getetag>_<getetag>some valid etag</getetag>_
+REPLACE=/^REV:.*$/REV:date/