diff --git a/.travis.yml b/.travis.yml
index 399739ed..c76fee9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,46 +9,37 @@ addons:
 matrix:
   fast_finish: true
   include:
-    - node_js: "0.12"
-      env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='0.12'
-    - node_js: "4"
-      env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='4.2'
-    - node_js: "5"
-      env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='5'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-3' BROWSER='chrome 46'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-1' BROWSER='firefox 42'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-7' BROWSER='safari 9'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-4' BROWSER='internet explorer 11'
-    - node_js: "4"
+    - node_js: "8"
+      env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='8'
+    - node_js: "9"
+      env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='9'
+    - node_js: "8"
       env: OPENPGPJSTEST='end2end-0' BROWSER='firefox 38'
-    - node_js: "4"
+    - node_js: "8"
+      env: OPENPGPJSTEST='end2end-1' BROWSER='firefox 54'
+    - node_js: "8"
       env: OPENPGPJSTEST='end2end-2' BROWSER='chrome 38'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-5' BROWSER='microsoft edge 20.10240'
-    - node_js: "4"
+    - node_js: "8"
+      env: OPENPGPJSTEST='end2end-3' BROWSER='chrome 59'
+    - node_js: "8"
       env: OPENPGPJSTEST='end2end-6' BROWSER='safari 8'
-    - node_js: "4"
+    - node_js: "8"
+      env: OPENPGPJSTEST='end2end-7' BROWSER='safari 10'
+    - node_js: "8"
+      env: OPENPGPJSTEST='end2end-5' BROWSER='microsoft edge 15'
+    - node_js: "8"
+      env: OPENPGPJSTEST='end2end-4' BROWSER='internet explorer 11'
+    - node_js: "8"
       env: OPENPGPJSTEST='end2end-8' BROWSER='android 4.4'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-9' BROWSER='android 5.1'
-    - node_js: "4"
+    - node_js: "8"
+      env: OPENPGPJSTEST='end2end-9' BROWSER='android 6.0'
+    - node_js: "8"
       env: OPENPGPJSTEST='end2end-10' BROWSER='iphone 7.0'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-11' BROWSER='iphone 9.1'
+    - node_js: "8"
+      env: OPENPGPJSTEST='end2end-11' BROWSER='iphone 11.0'
   allow_failures:
-    - env: OPENPGPJSTEST='end2end-0' BROWSER='firefox 38'
-    - env: OPENPGPJSTEST='end2end-2' BROWSER='chrome 38'
-    - env: OPENPGPJSTEST='end2end-4' BROWSER='internet explorer 11'
-    - env: OPENPGPJSTEST='end2end-5' BROWSER='microsoft edge 20.10240'
-    - env: OPENPGPJSTEST='end2end-6' BROWSER='safari 8'
+    - env: OPENPGPJSTEST='end2end-5' BROWSER='microsoft edge 15'
     - env: OPENPGPJSTEST='end2end-8' BROWSER='android 4.4'
-    - env: OPENPGPJSTEST='end2end-9' BROWSER='android 5.1'
-    - env: OPENPGPJSTEST='end2end-10' BROWSER='iphone 7.0'
-    - env: OPENPGPJSTEST='end2end-11' BROWSER='iphone 9.1'
 before_script:
   - npm install -g grunt-cli codeclimate-test-reporter
 script:
diff --git a/travis.sh b/travis.sh
index 1ad768dd..4c3be43f 100755
--- a/travis.sh
+++ b/travis.sh
@@ -15,18 +15,18 @@ elif [[ $OPENPGPJSTEST =~ ^end2end-.* ]]; then
   echo "Running OpenPGP.js browser unit tests on Saucelabs."
 
   declare -a capabilities=(
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"firefox\", \"version\":\"38.0\", \"platform\":\"Linux\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"firefox\", \"version\":\"42.0\", \"platform\":\"OS X 10.10\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"chrome\", \"version\":\"38.0\", \"platform\":\"Linux\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"chrome\", \"version\":\"46.0\", \"platform\":\"OS X 10.10\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"internet explorer\", \"version\":\"11\", \"platform\":\"Windows 10\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"microsoftEdge\", \"version\":\"20.10240\", \"platform\":\"Windows 10\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"safari\", \"version\":\"8\", \"platform\":\"OS X 10.10\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"safari\", \"version\":\"9\", \"platform\":\"OS X 10.11\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"android\", \"version\": \"4.4\", \"deviceName\": \"Android Emulator\", \"platform\": \"Linux\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"android\", \"version\": \"5.1\", \"deviceName\": \"Android Emulator\", \"platform\": \"Linux\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\": \"iPhone\", \"version\": \"7.1\", \"deviceName\": \"iPad Simulator\", \"device-orientation\": \"portrait\", \"platform\":\"OS X 10.10\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\": \"iPhone\", \"version\": \"9.1\", \"deviceName\": \"iPad Simulator\", \"device-orientation\": \"portrait\", \"platform\":\"OS X 10.10\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Firefox\", \"version\":\"34\", \"platform\":\"OS X 10.12\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Firefox\", \"version\":\"54\", \"platform\":\"OS X 10.12\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Chrome\", \"version\":\"37\",  \"platform\":\"OS X 10.12\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Chrome\", \"version\":\"59\", \"platform\":\"OS X 10.12\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Internet Explorer\", \"version\":\"11.103\", \"platform\":\"Windows 10\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"MicrosoftEdge\", \"version\":\"15.15063\", \"platform\":\"Windows 10\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Safari\", \"version\":\"8\", \"platform\":\"OS X 10.10\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Safari\", \"version\":\"10\", \"platform\":\"macOS 10.12\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Browser\", \"platformName\":\"Android\", \"platformVersion\": \"4.4\", \"deviceName\": \"Android Emulator\", \"deviceOrientation\": \"portrait\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"Chrome\", \"platformName\":\"Android\", \"platformVersion\": \"6.0\", \"deviceName\": \"Android Emulator\", \"deviceOrientation\": \"portrait\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\": \"Safari\", \"platformName\":\"iOS\", \"platformVersion\": \"8.1\", \"deviceName\": \"iPad Simulator\", \"deviceOrientation\": \"portrait\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
+    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\": \"Safari\", \"platformName\":\"iOS\", \"platformVersion\": \"11.0\", \"deviceName\": \"iPad Air 2 Simulator\", \"deviceOrientation\": \"portrait\", \"maxDuration\":\"7200\", \"commandTimeout\":\"600\", \"idleTimeout\":\"270\"}'"
   )
 
   testkey=$(echo $OPENPGPJSTEST | cut -f2 -d-)