diff --git a/testing/tests/carddav/2045-REPORT-addressbook-query.result b/testing/tests/carddav/2045-REPORT-addressbook-query.result
new file mode 100644
index 00000000..54099610
--- /dev/null
+++ b/testing/tests/carddav/2045-REPORT-addressbook-query.result
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:" xmlns:VC="urn:ietf:params:xml:ns:carddav">
+ <response>
+  <href>/caldav.php/user1/addressbook/andrew_mcmillan.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:3.0
+TEL;X-EVOLUTION-UI-SLOT=3;TYPE=CELL:+64 22 123 4567
+TEL;X-EVOLUTION-UI-SLOT=2;TYPE=HOME,VOICE:+64 4 123 4567
+TEL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK,VOICE:+64 22 123 4567
+FN:Andrew Watson McMillan
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/addressbook/van_houtte.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:3.0
+FN:Vincent VAN HOUTTE
+TEL;TYPE=CELL,VOICE:0486 11 22 33
+TEL;TYPE=HOME,VOICE:052 11 22 33
+TEL;TYPE=HOME,FAX:052 44 55 66
+TEL;TYPE=WORK,VOICE:052 11 22 33
+TEL;TYPE=WORK,FAX:052 44 55 66
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/addressbook/andresenesq.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:4.0
+FN:Sven Joseph Klaus Michael Andresen\, Esq.
+TEL;TYPE=WORK,VOICE:+49 89 11 11 111
+TEL;TYPE=WORK,VOICE:+49 234 222 222
+TEL;TYPE=WORK,FAX:+49 7373 73
+TEL;TYPE=PAGER:+49 160 073 727 272
+TEL;TYPE=PAGER:+49 2626 26
+TEL;TYPE=CELL,VOICE:+49 39292 82
+TEL;TYPE=CELL,VOICE:+49 7272 722
+TEL;TYPE=PREF,VOICE:+49 12 34 567
+TEL;TYPE=CAR,VOICE:+49 8292 38 383
+TEL;TYPE=HOME,VOICE:+49 7327 272 727
+TEL;TYPE=HOME,VOICE:+49 7272 7282
+TEL;TYPE=HOME,FAX:+49 1010 1
+TEL;TYPE=ISDN:8797
+TEL;TYPE=ISDN:98732947234
+TEL;TYPE=X-EVOLUTION-RADIO:+49 88 298 723 498 32
+TEL;TYPE=X-EVOLUTION-RADIO:+49 9872 394 872 34
+TEL;TYPE=X-EVOLUTION-TELEX:+49 2763 382 882 28 82
+TEL;TYPE=X-EVOLUTION-TELEX:+49 7722 88 28 282
+TEL;TYPE=MAIN:+49 6237 623 723 84 76
+TEL;TYPE=MAIN:+49 9324 32 479 234234
+TEL;X-EVOLUTION-CALLBACK:+49 8383 73 723
+TEL;X-EVOLUTION-CALLBACK:+49 7363 6363
+TEL;TYPE=MODEM:+49 8383 73 723
+TEL;TYPE=MODEM:+49 7363 6363
+TEL;X-EVOLUTION-TTYTDD:+49 3377 37 373
+TEL;X-EVOLUTION-TTYTDD:+49 8378 33
+TEL;X-QUICKDIAL:13355
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/addressbook/hans_dieter.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:4.0
+FN:Hans Dieter Schmidt
+TEL;TYPE=WORK,VOICE:+49 9823 9084
+TEL;TYPE=WORK,VOICE:+49 234 234 234
+TEL;TYPE=WORK,FAX:+49 7373 73
+TEL;TYPE=PAGER:+49 2626 26
+TEL;TYPE=CELL,VOICE:+49 7272 722
+TEL;TYPE=PREF,VOICE:+49 12 34 567
+TEL;TYPE=CAR,VOICE:+49 8292 38 383
+TEL;TYPE=HOME,VOICE:+49 7327 272 727
+TEL;TYPE=HOME,FAX:+49 40 812 387 21
+TEL;TYPE=ISDN:4234234235
+TEL;TYPE=ISDN:98732947234
+TEL;TYPE=X-EVOLUTION-RADIO:+49 9872 349 832
+TEL;TYPE=X-EVOLUTION-RADIO:+49 9872 394 872 34
+TEL;TYPE=X-EVOLUTION-TELEX:+49 38 288 228 82
+TEL;TYPE=X-EVOLUTION-TELEX:+49 7722 88 28 282
+TEL;TYPE=MAIN:+49 6237 623 723 84 76
+TEL;TYPE=MAIN:+49 9324 32 479 234234
+TEL;X-EVOLUTION-CALLBACK:+49 8383 73 723
+TEL;TYPE=MODEM:+49 8383 73 723
+TEL;X-EVOLUTION-TTYTDD:+49 7373 73
+TEL;X-EVOLUTION-TTYTDD:+49 8378 33
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/addressbook/J%C3%B6rg_Test-Ro%C3%9Fdeutscher_2_0.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:2.1
+FN;CHARSET=UTF-8:Jörg Test-Roßdeutscher
+TEL;WORK:040 999999432571-43
+TEL;CELL:017799999978200
+TEL;HOME:040999999793017
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/addressbook/J%C3%B6rg_Test-Ro%C3%9Fdeutscher_3_0.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:3.0
+FN:Jörg Test-Roßdeutscher
+TEL;TYPE=WORK;TYPE=pref:040 999999432571-43
+TEL;TYPE=CELL:017799999978200
+TEL;TYPE=HOME:040999999793017
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/carddav/2045-REPORT-addressbook-query.test b/testing/tests/carddav/2045-REPORT-addressbook-query.test
new file mode 100644
index 00000000..0a5cbaa7
--- /dev/null
+++ b/testing/tests/carddav/2045-REPORT-addressbook-query.test
@@ -0,0 +1,40 @@
+#
+# Request a REPORT
+#
+# param-filter should filter on parameter value, allof says all
+# filters must match.
+#
+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" xmlns:CS="http://calendarserver.org/ns/">
+ <D:prop>
+  <D:getetag/>
+  <C:address-data>
+    <C:prop name="VERSION"/>
+    <C:prop name="FN"/>
+    <C:prop name="TEL"/>
+  </C:address-data>
+ </D:prop>
+ <C:prop-filter name="TEL" test="allof">
+  <C:param-filter name="TYPE">
+   <C:text-match match-type="equals">WORK</C:text-match>
+  </C:param-filter>
+  <C:param-filter name="TYPE">
+   <C:text-match match-type="equals">HOME</C:text-match>
+  </C:param-filter>
+ </C:prop-filter>
+</C:addressbook-query>
+ENDDATA
+
+REPLACE=_<getetag>"[0-9a-f]+"</getetag>_<getetag>some valid etag</getetag>_
+REPLACE=/^REV:.*$/REV:date/
+REPLACE=/^UID:.*$/UID:a nice UID/