1 files changed, 4 insertions, 5 deletions
diff --git a/spec/frontend_integration/test_helpers/setup/setup_mock_server.js b/spec/frontend_integration/test_helpers/setup/setup_mock_server.js
index 343aeebf88e..43a21deed25 100644
--- a/spec/frontend_integration/test_helpers/setup/setup_mock_server.js
+++ b/spec/frontend_integration/test_helpers/setup/setup_mock_server.js
@@ -1,13 +1,12 @@
 import { createMockServer } from '../mock_server';
 
 beforeEach(() => {
+  if (global.mockServer) {
+    global.mockServer.shutdown();
+  }
+
   const server = createMockServer();
   server.logging = false;
 
   global.mockServer = server;
 });
-
-afterEach(() => {
-  global.mockServer.shutdown();
-  global.mockServer = null;
-});