diff --git a/.travis.yml b/.travis.yml
index ed4c33a..3d1e6ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,10 +120,6 @@
         "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false ",
         "python": "3.6"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=icloud REQUIREMENTS=release BUILD_PRS=false ",
-        "python": "3.6"
-      },
       {
         "env": "BUILD=test DAV_SERVER=fastmail REQUIREMENTS=release BUILD_PRS=false ",
         "python": "3.6"
diff --git a/docs/tutorials/icloud.rst b/docs/tutorials/icloud.rst
index c79b59f..1984190 100644
--- a/docs/tutorials/icloud.rst
+++ b/docs/tutorials/icloud.rst
@@ -4,7 +4,11 @@
 iCloud
 ======
 
-Vdirsyncer is regularly tested against iCloud_.
+Vdirsyncer is tested against iCloud_.
+
+.. note::
+
+    Automated testing against iCloud is broken! See :gh:`646`.
 
 ::
 
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 7877555..7d06717 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -49,7 +49,7 @@ for python, requirements in itertools.product(python_versions,
     dav_servers = ("radicale",)
     rs_servers = ()
     if python == latest_python and requirements == "release":
-        dav_servers += ("owncloud", "nextcloud", "baikal", "davical", "icloud",
+        dav_servers += ("owncloud", "nextcloud", "baikal", "davical",
                         "fastmail")
     if python != "pypy3":
         dav_servers += ("xandikos",)