diff --git a/test/e2e-api/admin/__snapshots__/site.test.js.snap b/test/e2e-api/admin/__snapshots__/site.test.js.snap
index 4281cd07bd..a64dd84682 100644
--- a/test/e2e-api/admin/__snapshots__/site.test.js.snap
+++ b/test/e2e-api/admin/__snapshots__/site.test.js.snap
@@ -18,7 +18,7 @@ exports[`Site API can retrieve config and all expected properties 2: [headers] 1
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "167",
+  "content-length": StringMatching /\\\\d\\+/,
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Origin, Accept-Encoding",
diff --git a/test/e2e-api/admin/__snapshots__/webhooks.test.js.snap b/test/e2e-api/admin/__snapshots__/webhooks.test.js.snap
index b2b7fe39ae..0f4472d4a0 100644
--- a/test/e2e-api/admin/__snapshots__/webhooks.test.js.snap
+++ b/test/e2e-api/admin/__snapshots__/webhooks.test.js.snap
@@ -25,7 +25,7 @@ exports[`Webhooks API Can create a webhook 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "392",
+  "content-length": StringMatching /\\\\d\\+/,
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Origin, Accept-Encoding",
@@ -68,7 +68,7 @@ exports[`Webhooks API Can edit a webhook 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "396",
+  "content-length": StringMatching /\\\\d\\+/,
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Origin, Accept-Encoding",
diff --git a/test/e2e-api/admin/site.test.js b/test/e2e-api/admin/site.test.js
index 53e7021c1d..fd58822509 100644
--- a/test/e2e-api/admin/site.test.js
+++ b/test/e2e-api/admin/site.test.js
@@ -1,5 +1,5 @@
 const {agentProvider, matchers} = require('../../utils/e2e-framework');
-const {anyEtag, stringMatching} = matchers;
+const {anyEtag, stringMatching, anyContentLength} = matchers;
 
 describe('Site API', function () {
     let agent;
@@ -17,7 +17,8 @@ describe('Site API', function () {
                 }
             })
             .matchHeaderSnapshot({
-                etag: anyEtag
+                etag: anyEtag,
+                'content-length': anyContentLength
             });
     });
 });
diff --git a/test/e2e-api/admin/webhooks.test.js b/test/e2e-api/admin/webhooks.test.js
index e4e8428f66..224baf16bb 100644
--- a/test/e2e-api/admin/webhooks.test.js
+++ b/test/e2e-api/admin/webhooks.test.js
@@ -1,5 +1,5 @@
 const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework');
-const {anyEtag, anyErrorId, anyObjectId, anyISODate, stringMatching} = matchers;
+const {anyEtag, anyErrorId, anyObjectId, anyISODate, stringMatching, anyContentLength} = matchers;
 
 const webhookMatcher = {
     id: anyObjectId,
@@ -35,7 +35,8 @@ describe('Webhooks API', function () {
             .expectStatus(201)
             .matchHeaderSnapshot({
                 // Note: No location header as there is no read method for webhooks
-                etag: anyEtag
+                etag: anyEtag,
+                'content-length': anyContentLength
 
             })
             .matchBodySnapshot({
@@ -93,7 +94,8 @@ describe('Webhooks API', function () {
             })
             .expectStatus(200)
             .matchHeaderSnapshot({
-                etag: anyEtag
+                etag: anyEtag,
+                'content-length': anyContentLength
             })
             .matchBodySnapshot({
                 webhooks: [webhookMatcher]
diff --git a/test/e2e-api/content/__snapshots__/settings.test.js.snap b/test/e2e-api/content/__snapshots__/settings.test.js.snap
index 1787d0eba5..0856c4459d 100644
--- a/test/e2e-api/content/__snapshots__/settings.test.js.snap
+++ b/test/e2e-api/content/__snapshots__/settings.test.js.snap
@@ -96,7 +96,7 @@ exports[`Settings Content API Can request settings 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "*",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "1235",
+  "content-length": StringMatching /\\\\d\\+/,
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Accept-Encoding",
diff --git a/test/e2e-api/content/settings.test.js b/test/e2e-api/content/settings.test.js
index d4073f06fd..e17c995506 100644
--- a/test/e2e-api/content/settings.test.js
+++ b/test/e2e-api/content/settings.test.js
@@ -1,5 +1,5 @@
 const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework');
-const {anyEtag} = matchers;
+const {anyEtag, anyContentLength} = matchers;
 
 const settingsMatcher = {
     version: matchers.anyString
@@ -18,7 +18,8 @@ describe('Settings Content API', function () {
         await agent.get('settings/')
             .expectStatus(200)
             .matchHeaderSnapshot({
-                etag: anyEtag
+                etag: anyEtag,
+                'content-length': anyContentLength
             })
             .matchBodySnapshot({
                 settings: settingsMatcher