diff --git a/.travis.yml b/.travis.yml
index acf79c4..fa8e7fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,18 @@
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ",
         "python": "3.3"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
+        "python": "3.3"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "3.3"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ",
+        "python": "3.3"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ",
         "python": "3.4"
@@ -48,10 +56,18 @@
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ",
         "python": "3.4"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
+        "python": "3.4"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "3.4"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ",
+        "python": "3.4"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ",
         "python": "3.5"
@@ -64,10 +80,18 @@
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ",
         "python": "3.5"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
+        "python": "3.5"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "3.5"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ",
+        "python": "3.5"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ",
         "python": "3.6"
@@ -80,6 +104,10 @@
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ",
         "python": "3.6"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
+        "python": "3.6"
+      },
       {
         "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=true ",
         "python": "3.6"
@@ -108,6 +136,10 @@
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "3.6"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ",
+        "python": "3.6"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ",
         "python": "pypy3"
@@ -120,10 +152,18 @@
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ",
         "python": "pypy3"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
+        "python": "pypy3"
+      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "pypy3"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ",
+        "python": "pypy3"
+      },
       {
         "env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest BUILD_PRS=true ",
         "python": "3.6"
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 637437d..80a6694 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -46,13 +46,11 @@ matrix.append({
 
 for python, requirements in itertools.product(python_versions,
                                               ("devel", "release", "minimal")):
-    dav_servers = ("radicale",)
+    dav_servers = ("radicale", "xandikos")
     rs_servers = ()
     if python == latest_python and requirements == "release":
         dav_servers += ("owncloud", "nextcloud", "baikal", "davical", "icloud",
                         "fastmail")
-    elif requirements == "devel":
-        dav_servers += ("xandikos",)
 
     for server_type, server in itertools.chain(
         (("REMOTESTORAGE", x) for x in rs_servers),