diff --git a/spec/async-spec-helpers.coffee b/spec/async-spec-helpers.coffee
index 5f8e03ca3..2faa5ab91 100644
--- a/spec/async-spec-helpers.coffee
+++ b/spec/async-spec-helpers.coffee
@@ -19,7 +19,7 @@ exports.afterEach = (fn) ->
 
 waitsForPromise = (fn) ->
   promise = fn()
-  waitsFor 'spec promise to resolve', 30000, (done) ->
+  waitsFor 'spec promise to resolve', 10000, (done) ->
     promise.then(
       done,
       (error) ->
diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js
index b031cba33..b1f457ddd 100644
--- a/spec/text-editor-component-spec.js
+++ b/spec/text-editor-component-spec.js
@@ -5008,7 +5008,7 @@ describe('TextEditorComponent', function () {
       let timeout = window.setTimeout(function () {
         timeoutError.message += ' Frame pending? ' + atom.views.animationFrameRequest + ' Same next update promise pending? ' + (nextUpdatePromise === atom.views.nextUpdatePromise)
         reject(timeoutError)
-      }, 30000)
+      }, 5000)
     })
   }