diff --git a/.aegir.js b/.aegir.js
index 58b0db3159..6a0af49287 100644
--- a/.aegir.js
+++ b/.aegir.js
@@ -11,6 +11,7 @@ module.exports = {
       served: true,
       included: false
     }],
+    browserNoActivityTimeout: 100 * 1000,
     singleRun: true
   },
   hooks: {
diff --git a/test/core/bitswap.spec.js b/test/core/bitswap.spec.js
index 8996330088..b06b4c41f8 100644
--- a/test/core/bitswap.spec.js
+++ b/test/core/bitswap.spec.js
@@ -74,7 +74,13 @@ function addNode (inProcNode, callback) {
     config: {
       Addresses: {
         Swarm: [`/ip4/127.0.0.1/tcp/0/ws`]
-      }
+      },
+      Discovery: {
+        MDNS: {
+          Enabled: false
+        }
+      },
+      Bootstrap: []
     }
   }, (err, ipfsd) => {
     expect(err).to.not.exist()
@@ -92,21 +98,19 @@ describe('bitswap', function () {
     this.timeout(60 * 1000)
 
     let config = {
-      config: {
-        Addresses: {
-          Swarm: []
-        },
-        Discovery: {
-          MDNS: {
-            Enabled: false
-          }
-        },
-        Bootstrap: []
-      }
+      Addresses: {
+        Swarm: []
+      },
+      Discovery: {
+        MDNS: {
+          Enabled: false
+        }
+      },
+      Bootstrap: []
     }
 
     if (isNode) {
-      config = Object.assign(config, {
+      config = Object.assign({}, config, {
         config: {
           Addresses: {
             Swarm: ['/ip4/127.0.0.1/tcp/0']