1 files changed, 2 insertions, 7 deletions
diff --git a/spec/frontend/notes/old_notes_spec.js b/spec/frontend/notes/old_notes_spec.js
index b57041cf4d1..96133c601aa 100644
--- a/spec/frontend/notes/old_notes_spec.js
+++ b/spec/frontend/notes/old_notes_spec.js
@@ -49,17 +49,12 @@ describe('Old Notes (~/notes.js)', () => {
     setTestTimeoutOnce(4000);
   });
 
-  afterEach(done => {
+  afterEach(() => {
     // The Notes component sets a polling interval. Clear it after every run.
     // Make sure to use jest.runOnlyPendingTimers() instead of runAllTimers().
     jest.clearAllTimers();
 
-    setImmediate(() => {
-      // Wait for any requests to resolve, otherwise we get failures about
-      // unmocked requests.
-      mockAxios.restore();
-      done();
-    });
+    return axios.waitForAll().finally(() => mockAxios.restore());
   });
 
   it('loads the Notes class into the DOM', () => {