diff --git a/ghost/admin/app/components/gh-editor-post-status.js b/ghost/admin/app/components/gh-editor-post-status.js
index 5625aa2480..3b9493f20e 100644
--- a/ghost/admin/app/components/gh-editor-post-status.js
+++ b/ghost/admin/app/components/gh-editor-post-status.js
@@ -1,10 +1,13 @@
 import Component from '@ember/component';
+import Ember from 'ember';
 import {computed} from '@ember/object';
 import {reads} from '@ember/object/computed';
 import {task, timeout} from 'ember-concurrency';
 
+const {testing} = Ember;
+
 // TODO: reduce when in testing mode
-const SAVE_TIMEOUT_MS = 3000;
+const SAVE_TIMEOUT_MS = testing ? 0 : 3000;
 
 export default Component.extend({
     post: null,
diff --git a/ghost/admin/app/templates/editor/edit.hbs b/ghost/admin/app/templates/editor/edit.hbs
index b0adf5736e..064115c559 100644
--- a/ghost/admin/app/templates/editor/edit.hbs
+++ b/ghost/admin/app/templates/editor/edit.hbs
@@ -8,7 +8,7 @@
         <div class="gh-editor-status">
             {{gh-editor-post-status
                 post=model
-                isSaving=autosave.isRunning
+                isSaving=(or autosave.isRunning saveTasks.isRunning)
             }}
         </div>
         {{#if scheduleCountdown}}