diff --git a/src/session.js b/src/session.js
index 4fe882c97d..8e85509b82 100644
--- a/src/session.js
+++ b/src/session.js
@@ -205,7 +205,8 @@ module.exports = class RiotSession {
         return this.browser.close();
     }
 
-    async poll(callback, timeout, interval = 100) {
+    async poll(callback, interval = 100) {
+        const timeout = DEFAULT_TIMEOUT;
         let waited = 0;
         while(waited < timeout) {
             await this.delay(interval);
diff --git a/src/usecases/signup.js b/src/usecases/signup.js
index 66bf773ca1..cc58bff28b 100644
--- a/src/usecases/signup.js
+++ b/src/usecases/signup.js
@@ -68,7 +68,7 @@ module.exports = async function signup(session, username, password, homeserver)
     const foundHomeUrl = await session.poll(async () => {
         const url = session.page.url();
         return url === session.url('/#/home');
-    }, 5000);
+    });
     assert(foundHomeUrl);
     session.log.done();
 }
diff --git a/src/usecases/timeline.js b/src/usecases/timeline.js
index 7b28328e49..580d88ee6a 100644
--- a/src/usecases/timeline.js
+++ b/src/usecases/timeline.js
@@ -63,7 +63,7 @@ module.exports.receiveMessage = async function(session, expectedMessage) {
         return lastMessage &&
             lastMessage.body === expectedMessage.body &&
             lastMessage.sender === expectedMessage.sender;
-    }, 5000, 200);
+    });
     assertMessage(lastMessage, expectedMessage);
     session.log.done();
 }