diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 5ff852fcc..b6d232993 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -90,7 +90,8 @@ window.mousemoveEvent = (properties={}) ->
 
 window.waitsForPromise = (fn) ->
   window.waitsFor (moveOn) ->
-    fn().done(moveOn)
+    promise = fn()
+    promise.then promise.done(moveOn), promise.fail(moveOn)
 
 window.resetTimeouts = ->
   window.now = 0