diff -r 000000000000 -r 6474c204b198 testing/mozbase/mozprocess/tests/test_mozprocess_kill_broad_wait.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testing/mozbase/mozprocess/tests/test_mozprocess_kill_broad_wait.py	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+
+import os
+import time
+import unittest
+import proctest
+from mozprocess import processhandler
+
+here = os.path.dirname(os.path.abspath(__file__))
+
+class ProcTestKill(proctest.ProcTest):
+    """ Class to test various process tree killing scenatios """
+
+    # This test should ideally be a part of test_mozprocess_kill.py
+    # It has been separated for the purpose of tempporarily disabling it.
+    # See https://bugzilla.mozilla.org/show_bug.cgi?id=921632
+    def test_process_kill_broad_wait(self):
+        """Process is started, we use a broad process tree, we let it spawn
+           for a bit, we kill it"""
+
+        p = processhandler.ProcessHandler([self.python, self.proclaunch, "process_normal_broad_python.ini"],
+                                          cwd=here)
+        p.run()
+        # Let the tree spawn a bit, before attempting to kill
+        time.sleep(3)
+        p.kill()
+
+        detected, output = proctest.check_for_process(self.proclaunch)
+        self.determine_status(detected,
+                              output,
+                              p.proc.returncode,
+                              p.didTimeout,
+                              expectedfail=('returncode',))
+
+if __name__ == '__main__':
+    unittest.main()