diff --git a/testing/mozharness/configs/hazards/build_b2g.py b/testing/mozharness/configs/hazards/build_b2g.py
index c8c86b417bd..d915080259a 100644
--- a/testing/mozharness/configs/hazards/build_b2g.py
+++ b/testing/mozharness/configs/hazards/build_b2g.py
@@ -14,7 +14,8 @@ config = {
       'setup-analysis',
       'run-analysis',
       'collect-analysis-output',
-      'upload-analysis',
+      # Temporarily disabled - see bug 1211402
+      #'upload-analysis',
       'check-expectations',
    ],
 
diff --git a/testing/mozharness/scripts/spidermonkey_build.py b/testing/mozharness/scripts/spidermonkey_build.py
index 99bf5b55bb0..43d949d7bf5 100755
--- a/testing/mozharness/scripts/spidermonkey_build.py
+++ b/testing/mozharness/scripts/spidermonkey_build.py
@@ -115,7 +115,8 @@ class SpidermonkeyBuild(MockMixin,
                                 'setup-analysis',
                                 'run-analysis',
                                 'collect-analysis-output',
-                                'upload-analysis',
+                                # Temporary - see bug 1211402
+                                #'upload-analysis',
                                 'check-expectations',
                             ],
                             config={