diff --git a/.airtap.yml b/.airtap.yml
new file mode 100644
index 00000000..da2f955a
--- /dev/null
+++ b/.airtap.yml
@@ -0,0 +1,7 @@
+sauce_connect: true
+loopback: airtap.local
+browsers:
+  - name: chrome
+    version: latest
+  - name: firefox
+    version: latest
diff --git a/.travis.yml b/.travis.yml
index b9cac9ab..b89b2d33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,21 @@
 language: node_js
 node_js:
-  - 'node'
+  - lts/*
 sudo: true
 env:
   global:
   - secure: AJsEWFnWC5W8hcF3hJzm3PT7heazJpKg85xiSvIWVzLHZU/s0h4+WfJ6t0F9v3L4awaowm62vy8CRaxRkB4lJyJg+JK2K0QN7lNFGj2f8Jx2cFlVJ1IyY959GY4iUg66JrNj1yzS02+yQfweDngyifqzb7IlxnowiveDjUO2gyo=
   - secure: hvihwLUqlPchrGFXKWFF7iKRugISU7r/gLBo6O63nPeg0OwnYqYcC2BnBWoSiOdu9oR5bM4a5u0os04XL+bP3dqt324g0uBTqvyyxD6NhBsphVFkUmdUH3HMe7IQY6JTns96KT/6UkQapKhIuW4CUDeidR+5NFKvyRdKIjSawS4=
 
-# For Electron testing on Linux
-# https://github.com/electron/electron/blob/master/docs/tutorial/testing-on-headless-ci.md
 addons:
+  sauce_connect: true
+  hosts:
+    - airtap.local
+  # For Electron testing on Linux
+  # https://github.com/electron/electron/blob/master/docs/tutorial/testing-on-headless-ci.md
   apt:
     packages:
       - xvfb
 before_script:
   - export DISPLAY=':99.0'
   - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-cache:
-  directories:
-    - node_modules
diff --git a/.zuul.yml b/.zuul.yml
deleted file mode 100644
index 6f2c7b62..00000000
--- a/.zuul.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-ui: tape
-browsers:
-  - name: chrome
-    version: -1..latest
-  - name: firefox
-    version: -1..latest
diff --git a/bin/test.js b/bin/test.js
index 7c6da9cc..f1be65fd 100644
--- a/bin/test.js
+++ b/bin/test.js
@@ -6,11 +6,9 @@ var runSauceLabs = !process.env.CI ||
   (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY)
 
 npmRun('test-node', function () {
-  npmRun('test-browser-headless', function () {
-    if (runSauceLabs) {
-      npmRun('test-browser')
-    }
-  })
+  if (runSauceLabs) {
+    npmRun('test-browser')
+  }
 })
 
 function npmRun (scriptName, onSuccess) {
diff --git a/package.json b/package.json
index 4fed9ccb..750ccdc3 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "zero-fill": "^2.2.3"
   },
   "devDependencies": {
+    "airtap": "0.0.1",
     "babili": "^0.1.4",
     "bittorrent-tracker": "^9.4.0",
     "brfs": "^1.4.3",
@@ -82,8 +83,7 @@
     "serve-static": "^1.11.1",
     "standard": "*",
     "tape": "^4.6.0",
-    "webtorrent-fixtures": "^1.5.0",
-    "zuul": "^3.10.1"
+    "webtorrent-fixtures": "^1.5.0"
   },
   "engines": {
     "node": ">=4"
@@ -116,9 +116,8 @@
     "build-debug": "browserify -s WebTorrent -e ./ > webtorrent.debug.js",
     "size": "npm run build && cat webtorrent.min.js | gzip | wc -c",
     "test": "standard && node ./bin/test.js",
-    "test-browser": "zuul -- test/*.js test/browser/*.js",
-    "test-browser-headless": "zuul --electron -- test/*.js test/browser/*.js",
-    "test-browser-local": "zuul --local -- test/*.js test/browser/*.js",
+    "test-browser": "airtap -- test/*.js test/browser/*.js",
+    "test-browser-local": "airtap --local -- test/*.js test/browser/*.js",
     "test-node": "tape test/*.js test/node/*.js",
     "update-authors": "./bin/update-authors.sh"
   }