--- a/mail/config/mozconfigs/common
+++ b/mail/config/mozconfigs/common
@@ -1,9 +1,9 @@
 ac_add_options --enable-application=comm/mail
-ac_add_options --enable-calendar
+# ac_add_options --enable-calendar
 
 # Disable enforcing that add-ons are signed by the trusted root.
 # This is the default on trunk, but it is toggled for beta causing
 # MozMill to fail since its add-ons aren't signed. So we force it here.
 MOZ_REQUIRE_SIGNING=0
 
 . "$topsrcdir/build/mozconfig.common.override"

--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -44,18 +44,18 @@ xpcshell:
                     - unittests/thunderbird_extra.py
         extra-options:
             - "--xpcshell-suite=xpcshell"
         requires-signed-builds:
             by-test-platform:
                 windows.*: true
                 default: false
     fetches:
-        build:
-            - gdata-provider.xpi
+        # build:
+        #     - gdata-provider.xpi
         toolchain:
             by-test-platform:
                 linux.*:
                     - linux64-node
                 macosx.*:
                     - macosx64-node
                 win.*64.*:
                     - win64-node