diff --git a/Tests/Integration/test-webdav.py b/Tests/Integration/test-webdav.py
index 4a55067c9..2eefcbe32 100755
--- a/Tests/Integration/test-webdav.py
+++ b/Tests/Integration/test-webdav.py
@@ -104,8 +104,8 @@ class WebDAVTest(unittest.TestCase):
         ## property-search at a time:
         # ["{urn:ietf:params:xml:ns:caldav}calendar-home-set",
         #            "/SOGo/dav/%s/Calendar" % subscriber_username]]
-        query = webdavlib.WebDAVPrincipalPropertySearch(resource, matches,
-                                                        ["displayname"])
+        query = webdavlib.WebDAVPrincipalPropertySearch(resource,
+                                                        ["displayname"], matches)
         self.client.execute(query)
         self.assertEquals(query.response["status"], 207)
         response = query.xpath_evaluate('/D:multistatus/D:response')[0]
diff --git a/Tests/Integration/webdavlib.py b/Tests/Integration/webdavlib.py
index 2db6aadc1..f7d657634 100644
--- a/Tests/Integration/webdavlib.py
+++ b/Tests/Integration/webdavlib.py
@@ -274,7 +274,7 @@ class WebDAVPUT(WebDAVQuery):
         return self.content
 
 class WebDAVPrincipalPropertySearch(WebDAVREPORT):
-    def __init__(self, url, matches, properties):
+    def __init__(self, url, properties, matches):
         WebDAVQuery.__init__(self, url)
         ppsearch_tag = self.ns_mgr.register("principal-property-search",
                                             xmlns_dav)
@@ -367,7 +367,7 @@ class CalDAVPOST(WebDAVQuery):
         return self.content
 
 class CalDAVCalendarMultiget(WebDAVREPORT):
-    def __init__(self, url, hrefs, properties):
+    def __init__(self, url, properties, hrefs):
         WebDAVQuery.__init__(self, url)
         multiget_tag = self.ns_mgr.register("calendar-multiget", xmlns_caldav)
         self.top_node = _WD_XMLTreeElement(multiget_tag)