diff --git a/karma.conf.js b/karma.conf.js
index 1ae2494add..45f5dd9998 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -171,5 +171,6 @@ module.exports = function (config) {
             },
             devtool: 'inline-source-map',
         },
+        browserNoActivityTimeout: 15000,
     });
 };
diff --git a/test/components/structures/TimelinePanel-test.js b/test/components/structures/TimelinePanel-test.js
index de547b1779..045ccd70b7 100644
--- a/test/components/structures/TimelinePanel-test.js
+++ b/test/components/structures/TimelinePanel-test.js
@@ -210,7 +210,7 @@ describe('TimelinePanel', function() {
         var N_EVENTS = 600;
 
         // sadly, loading all those events takes a while
-        this.timeout(N_EVENTS * 40);
+        this.timeout(N_EVENTS * 20);
 
         // client.getRoom is called a /lot/ in this test, so replace
         // sinon's spy with a fast noop.