diff --git a/test/features/step_definitions/hooks.ts b/test/features/step_definitions/hooks.ts
index 708bd3aef..7f844ad37 100644
--- a/test/features/step_definitions/hooks.ts
+++ b/test/features/step_definitions/hooks.ts
@@ -3,6 +3,10 @@ import fs = require("fs");
 import BluebirdPromise = require("bluebird");
 import ChildProcess = require("child_process");
 
+Cucumber.defineSupportCode(function({ setDefaultTimeout }) {
+  setDefaultTimeout(20 * 1000);
+});
+
 Cucumber.defineSupportCode(function({ After, Before }) {
   const exec = BluebirdPromise.promisify(ChildProcess.exec);
 
diff --git a/test/features/step_definitions/redirection.ts b/test/features/step_definitions/redirection.ts
index 240fa3184..8b29ee726 100644
--- a/test/features/step_definitions/redirection.ts
+++ b/test/features/step_definitions/redirection.ts
@@ -12,6 +12,6 @@ Cucumber.defineSupportCode(function ({ Given, When, Then }) {
   });
 
   Then("I'm redirected to {stringInDoubleQuotes}", function (link: string) {
-    return this.driver.wait(seleniumWebdriver.until.urlContains(link), 5000);
+    return this.driver.wait(seleniumWebdriver.until.urlContains(link), 15000);
   });
 });
\ No newline at end of file