diff --git a/.travis.yml b/.travis.yml
index e12bc0c..59a2f35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,6 @@
       },
       {
         "env": "BUILD=test-storage DAV_SERVER=fastmail REQUIREMENTS=release ",
-        "if": "NOT (type IN (pull_request))",
         "python": "3.6"
       },
       {
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 07f4342..8a2d630 100755
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -64,8 +64,7 @@ for python, requirements in itertools.product(
         if python == '3.5':
             job['dist'] = 'trusty'
 
-        build_prs = dav_server not in ("fastmail", "davical", "icloud")
-        if not build_prs:
+        if dav_server in ("davical", "icloud"):
             job['if'] = 'NOT (type IN (pull_request))'
 
         matrix.append(job)
diff --git a/tests/storage/dav/test_caldav.py b/tests/storage/dav/test_caldav.py
index 1d3f2fa..b999e25 100644
--- a/tests/storage/dav/test_caldav.py
+++ b/tests/storage/dav/test_caldav.py
@@ -133,6 +133,8 @@ class TestCalDAVStorage(DAVStorageTests):
 
     @pytest.mark.skipif(dav_server == 'icloud',
                         reason='iCloud only accepts VEVENT')
+    @pytest.mark.skipif(dav_server == 'fastmail',
+                        reason='Fastmail has non-standard hadling of VTODOs.')
     def test_item_types_general(self, s):
         event = s.upload(format_item(EVENT_TEMPLATE))[0]
         task = s.upload(format_item(TASK_TEMPLATE))[0]