diff --git a/.travis.yml b/.travis.yml
index c16fc1903..cfb72aa81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ sudo: false
 env:
   matrix:
   - BROWSER=chromium EXT=zip
-  - BROWSER=debian EXT=zip
-  - BROWSER=webext EXT=xpi
+  - BROWSER=firefox EXT=xpi
+  - BROWSER=webext EXT=zip
 script: ./tools/make-${BROWSER}.sh all
 deploy:
   provider: releases
diff --git a/platform/debian/manifest.json b/platform/webext/manifest.json
similarity index 100%
rename from platform/debian/manifest.json
rename to platform/webext/manifest.json
diff --git a/platform/debian/vapi-usercss.js b/platform/webext/vapi-usercss.js
similarity index 100%
rename from platform/debian/vapi-usercss.js
rename to platform/webext/vapi-usercss.js
diff --git a/platform/debian/vapi-webrequest.js b/platform/webext/vapi-webrequest.js
similarity index 100%
rename from platform/debian/vapi-webrequest.js
rename to platform/webext/vapi-webrequest.js
diff --git a/tools/make-debian-meta.py b/tools/make-webext-meta.py
similarity index 100%
rename from tools/make-debian-meta.py
rename to tools/make-webext-meta.py
diff --git a/tools/make-debian.sh b/tools/make-webext.sh
similarity index 100%
rename from tools/make-debian.sh
rename to tools/make-webext.sh