diff --git a/ghost/core/test/e2e-api/members/well-known.test.js b/ghost/core/test/e2e-api/members/well-known.test.js
index f78183c270..6297f62629 100644
--- a/ghost/core/test/e2e-api/members/well-known.test.js
+++ b/ghost/core/test/e2e-api/members/well-known.test.js
@@ -1,4 +1,4 @@
-const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework');
+const {agentProvider, fixtureManager, matchers, mockManager} = require('../../utils/e2e-framework');
 const {anyString, anyEtag} = matchers;
 
 describe('Members .well-known', function () {
@@ -7,6 +7,11 @@ describe('Members .well-known', function () {
     before(async function () {
         const agents = await agentProvider.getAgentsForMembers();
         membersAgent = agents.membersAgent;
+        mockManager.mockMail();
+    });
+
+    after(function () {
+        mockManager.restore();
     });
 
     describe('GET /jwks.json', function () {
diff --git a/ghost/core/test/e2e-server/well-known.test.js b/ghost/core/test/e2e-server/well-known.test.js
index 5863c38d0a..834ee9c63e 100644
--- a/ghost/core/test/e2e-server/well-known.test.js
+++ b/ghost/core/test/e2e-server/well-known.test.js
@@ -1,13 +1,18 @@
-const {agentProvider, matchers} = require('../utils/e2e-framework');
+const {agentProvider, matchers, mockManager} = require('../utils/e2e-framework');
 const {anyString, anyEtag} = matchers;
 
 describe('.well-known', function () {
     let agentGhostAPI;
 
     before(async function () {
+        mockManager.mockMail();
         agentGhostAPI = await agentProvider.getGhostAPIAgent();
     });
 
+    after(function () {
+        mockManager.restore();
+    });
+
     describe('GET /jwks.json', function () {
         it('should return a JWKS', async function () {
             await agentGhostAPI