diff --git a/test/karma-browsers.json b/test/karma-browsers.json
index 0374ffbe3dbc..8763193722de 100644
--- a/test/karma-browsers.json
+++ b/test/karma-browsers.json
@@ -12,12 +12,6 @@
       "--no-sandbox"
     ]
   },
-  "FirefoxHeadless": {
-    "base": "Firefox",
-    "flags": [
-      "-headless"
-    ]
-  },
   "SAUCELABS_CHROME": {
     "base": "SauceLabs",
     "browserName": "chrome",
diff --git a/test/karma.conf.js b/test/karma.conf.js
index a8f60e6670ef..a09d66cd45b4 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -81,10 +81,8 @@ module.exports = config => {
       video: false,
     },
 
-    browserDisconnectTimeout: 180000,
-    browserDisconnectTolerance: 3,
+    browserDisconnectTolerance: 1,
     browserNoActivityTimeout: 300000,
-    captureTimeout: 180000,
 
     browsers: ['ChromeHeadlessLocal'],
     singleRun: false,
@@ -139,6 +137,15 @@ module.exports = config => {
       config.reporters.push('saucelabs');
     }
 
+    // If the test platform is not "local", browsers are launched externally and can take
+    // up more time to capture. Also the connection can be flaky and therefore needs a
+    // higher disconnect timeout.
+    if (testPlatform !== 'local') {
+      config.browserDisconnectTimeout = 180000;
+      config.browserDisconnectTolerance = 3;
+      config.captureTimeout = 180000;
+    }
+
     const platformBrowsers = platformMap[testPlatform];
     const browserInstanceChunks = splitBrowsersIntoInstances(
         platformBrowsers, maxParallelContainerInstances);