diff --git a/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.result b/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.result
new file mode 100644
index 00000000..07e5e293
--- /dev/null
+++ b/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.result
@@ -0,0 +1,24 @@
+
+
+
+ /caldav.php/user5/addresses/sabre-vobject-41956788-1273-449e-bfb7-716850c91ec6.vcf
+
+
+ some valid etag
+ BEGIN:VCARD
+VERSION:4.0
+PRODID:-//Sabre//Sabre VObject 4.3.3//EN
+UID:sabre-vobject-41956788-1273-449e-bfb7-716850c91ec6
+FN:CardDavClient Test879489908
+N:Test879489908;CardDavClient;;;
+NICKNAME:Jonny2
+TEL;TYPE=HOME:12345
+TEL:555
+REV:date
+END:VCARD
+
+
+ HTTP/1.1 200 OK
+
+
+
diff --git a/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.test b/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.test
new file mode 100644
index 00000000..31727940
--- /dev/null
+++ b/testing/tests/carddav/2054-REPORT-carddavclient-HasNoEmailDiffCase.test
@@ -0,0 +1,34 @@
+#
+# Test for nonexistence of a lowercase property, which must treated
+# cases-insensitively (hence EMAIL must not match)
+#
+# (only Jonny2 does not have EMAIL)
+#
+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
+
+
+
+
+
+
+
+
+
+
+
+
+ENDDATA
+
+REPLACE=_"[0-9a-f]+"_some valid etag_
+REPLACE=/^REV:.*$/REV:date/
diff --git a/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.result b/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.result
new file mode 100644
index 00000000..772afcc8
--- /dev/null
+++ b/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.result
@@ -0,0 +1,68 @@
+
+
+
+ /caldav.php/user5/addresses/sabre-vobject-131cdf91-5460-423b-a836-e420e5affe13.vcf
+
+
+ some valid etag
+ 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
+
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user5/addresses/sabre-vobject-8121cd7a-8251-4b74-a952-ca91fdc21e36.vcf
+
+
+ some valid etag
+ 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
+
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user5/addresses/sabre-vobject-34cd55a8-330f-47cd-8b69-6fbd16a0880b.vcf
+
+
+ some valid etag
+ 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
+
+
+ HTTP/1.1 200 OK
+
+
+
diff --git a/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.test b/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.test
new file mode 100644
index 00000000..4613fc81
--- /dev/null
+++ b/testing/tests/carddav/2055-REPORT-carddavclient-HasEmailDiffCase.test
@@ -0,0 +1,32 @@
+#
+# This is the inverse of 2054, we request a REPORT for (lowercase)
+# property 'email' and expect all three results containing EMAIL
+#
+# (Jonny0, Jonny1 and Jonny3 should 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
+
+
+
+
+
+
+
+
+
+
+ENDDATA
+
+REPLACE=_"[0-9a-f]+"_some valid etag_
+REPLACE=/^REV:.*$/REV:date/