diff --git a/.travis.yml b/.travis.yml
index 3d1e6ae..55542df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -104,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"
@@ -124,10 +128,6 @@
         "env": "BUILD=test DAV_SERVER=fastmail REQUIREMENTS=release BUILD_PRS=false ",
         "python": "3.6"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ",
-        "python": "3.6"
-      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "3.6"
@@ -137,15 +137,15 @@
         "python": "3.6"
       },
       {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ",
+        "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=devel BUILD_PRS=true ",
         "python": "pypy3"
       },
       {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ",
+        "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=release BUILD_PRS=true ",
         "python": "pypy3"
       },
       {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ",
+        "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "pypy3"
       },
       {
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 7d06717..4a49a23 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -46,13 +46,15 @@ matrix.append({
 
 for python, requirements in itertools.product(python_versions,
                                               ("devel", "release", "minimal")):
-    dav_servers = ("radicale",)
+    if python == "pypy3":
+        dav_servers = ("skip",)
+    else:
+        dav_servers = ("radicale", "xandikos")
+
     rs_servers = ()
     if python == latest_python and requirements == "release":
         dav_servers += ("owncloud", "nextcloud", "baikal", "davical",
-                        "fastmail")
-    if python != "pypy3":
-        dav_servers += ("xandikos",)
+                            "fastmail")
 
     for server_type, server in itertools.chain(
         (("REMOTESTORAGE", x) for x in rs_servers),