diff --git a/.travis.yml b/.travis.yml
index 55542df..cc20b1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -136,18 +136,6 @@
         "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ",
         "python": "3.6"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=devel BUILD_PRS=true ",
-        "python": "pypy3"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=release BUILD_PRS=true ",
-        "python": "pypy3"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=skip 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 49f1b0f..1988198 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -2,7 +2,7 @@ import itertools
 import json
 import sys
 
-python_versions = ("3.3", "3.4", "3.5", "3.6", "pypy3")
+python_versions = ("3.3", "3.4", "3.5", "3.6")
 latest_python = "3.6"
 
 cfg = {}
@@ -46,10 +46,7 @@ matrix.append({
 
 for python, requirements in itertools.product(python_versions,
                                               ("devel", "release", "minimal")):
-    if python == "pypy3":
-        dav_servers = ("skip",)
-    else:
-        dav_servers = ("radicale", "xandikos")
+    dav_servers = ("radicale", "xandikos")
 
     if python == latest_python and requirements == "release":
         dav_servers += ("owncloud", "nextcloud", "baikal", "davical",
diff --git a/scripts/travis-install.sh b/scripts/travis-install.sh
index 8bc0f04..9b78409 100644
--- a/scripts/travis-install.sh
+++ b/scripts/travis-install.sh
@@ -1,23 +1,5 @@
 #!/bin/sh
 
-# Travis uses an outdated PyPy, this installs the most recent one.  This
-# makes the tests run on Travis' legacy infrastructure, but so be it.
-# temporary pyenv installation to get pypy-2.6 before container infra
-# upgrade
-# Taken from werkzeug, which took it from pyca/cryptography
-if [ "$TRAVIS_PYTHON_VERSION" = "pypy3" ]; then
-    PYENV_ROOT="$HOME/.pyenv";
-    rm -rf "$PYENV_ROOT";
-    git clone https://github.com/yyuu/pyenv.git "$PYENV_ROOT";
-    PATH="$PYENV_ROOT/bin:$PATH";
-    eval "$(pyenv init -)";
-    pypyversion="pypy3.5-5.7-beta";
-    pyenv install $pypyversion;
-    pyenv global $pypyversion;
-    python --version;
-    pip --version;
-fi
-
 # The OS X VM doesn't have any Python support at all
 # See https://github.com/travis-ci/travis-ci/issues/2312
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then