diff --git a/.travis.yml b/.travis.yml
index cd94491..84034f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,18 +30,6 @@
         "env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal BUILD_PRS=false",
         "python": "2.7"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true",
-        "python": "2.7"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true",
-        "python": "2.7"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true",
-        "python": "2.7"
-      },
       {
         "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false",
         "python": "2.7"
@@ -178,18 +166,6 @@
         "env": "BUILD=style BUILD_PRS=true",
         "python": "pypy"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
-        "python": "pypy"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
-        "python": "pypy"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
-        "python": "pypy"
-      },
       {
         "env": "BUILD=test",
         "language": "generic",
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 85b2ec9..1be8e07 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -44,9 +44,15 @@ for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
         'env': 'BUILD=style BUILD_PRS=true'
     })
 
-    if python in ("2.7", "3.5"):
+    if python == "3.5":
         dav_servers = ("radicale", "owncloud", "baikal", "davical")
         rs_servers = ("mysteryshack",)
+    elif python == "2.7":
+        dav_servers = ("owncloud", "baikal", "davical")
+        rs_servers = ("mysteryshack",)
+    elif python == "pypy":
+        dav_servers = ()
+        rs_servers = ()
     else:
         dav_servers = ("radicale",)
         rs_servers = ()
@@ -59,7 +65,7 @@ for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
         ("devel", "release", "minimal")
     ):
         build_prs = (
-            python in ("2.7", "3.5") and
+            python == "3.5" and
             server_type == 'DAV' and
             server == 'radicale'
         )