@@ -10,3 +10,7 @@ tokenkeys.py*
 *.pyc
 from-preloads/
 test_profile/
+.venv/
+Vagrantfile
+.vagrant
+src/chrome/content/rulesets.json
@@ -1,10 +1,6 @@
 [submodule "addon-sdk"]
 	path = addon-sdk
 	url = https://github.com/mozilla/addon-sdk.git
-[submodule "https-everywhere-checker"]
-	path = test/rules
-	url = https://github.com/jsha/https-everywhere-checker.git
-	branch = updates
 [submodule "translations"]
 	path = translations
 	url = https://git.torproject.org/translation.git
 
@@ -11,36 +11,27 @@ addons:
   apt:
     packages:
       - libxml2-dev
+      - libxml2-utils
       - python-dev
       - libcurl4-openssl-dev
       - python-lxml
       - python-software-properties
       - chromium-browser
-  firefox: "37.0"
 virtualenv:
   system_site_packages: true
 install:
   - pip install -r test/rules/requirements.txt
   - pip install -r test/chromium/requirements.txt
 env:
-  - DISPLAY=':99.0'
+  - FIREFOX_VERSION=firefox-latest
+  - FIREFOX_VERSION=firefox-esr-latest
 before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - wget https://chromedriver.storage.googleapis.com/2.12/chromedriver_linux64.zip
-  - unzip chromedriver_linux64.zip
-  - mv chromedriver test/chromium/chromedriver
+  - sudo apt-get install chromium-chromedriver
+  - wget -O /tmp/firefox.tar.bz2 'https://download.mozilla.org/?os=linux64&lang=en-US&product='$FIREFOX_VERSION
+  - tar xpjf /tmp/firefox.tar.bz2
+  - export FIREFOX=$PWD/firefox/firefox
 script:
   - ./test.sh
   - test/travis-ruleset-fetch.sh
-sudo: false
-notifications:
-  email:
-    recipients:
-      - jsha@eff.org
-  notifications:
-    irc:
-      channels:
-        - "irc.oftc.net#https-everywhere"
-      on_success: change
-      on_failure: change
+sudo: required
+dist: trusty
@@ -12,6 +12,5 @@ clean:
 	rm -rf pkg/xpi-amo/ pkg/xpi-eff/
 	rm -f pkg/*.xpi
 	rm -f src/chrome/content/rules/default.rulesets
-	rm -f src/defaults/rulesets.sqlite
 
 .PHONY: clean prerelease
@@ -8,17 +8,17 @@ Get the packages you need and install a git hook to run tests before push:
 
     bash install-dev-dependencies.sh
 
-Run the tests for the Firefox version:
+Run all the tests:
 
     bash test.sh
 
 Run the latest code and rulesets in a standalone Firefox profile:
 
-    bash test.sh --justrun
+    bash test/firefox.sh --justrun
 
 Run the latest code and rulesets in a standalone Chromium profile:
 
-    bash test-chromium.sh --justrun
+    bash test/chromium.sh --justrun
 
 Build the Firefox extension as a .xpi package:
 
@@ -56,6 +56,8 @@ Important directories you might want to know about
 
     src/chrome/content/rules  The rulesets live here
 
+    test/                     The tests live here
+
 Hacking on the Source Code
 --------------------------
 
@@ -88,14 +90,14 @@ https://www.transifex.com/projects/p/torproject/.
 
 ### Bug trackers and mailing lists
 
-We currently have two bug trackers. The one on Github (https://github.com/EFForg/https-everywhere/issues) is recommended because it gets checked more frequently and has a friendlier user interface. The one on trac.torproject.org (https://trac.torproject.org/projects/tor/report/19) has a large backlog of bugs at this point, but it has the advantage of allowing you to post bugs anonymously using the "cypherpunks" / "writecode" account. (Note that you won't see replies unless you put an email address in the CC field.)
+We currently have two bug trackers. The one on GitHub (https://github.com/EFForg/https-everywhere/issues) is recommended because it gets checked more frequently and has a friendlier user interface. The one on trac.torproject.org (https://trac.torproject.org/projects/tor/report/19) has a large backlog of bugs at this point, but it has the advantage of allowing you to post bugs anonymously using the "cypherpunks" / "writecode" account. (Note that you won't see replies unless you put an email address in the CC field.)
 
 We have two publicly-archived mailing lists: the https-everywhere list (https://lists.eff.org/mailman/listinfo/https-everywhere) is for discussing the project as a whole, and the https-everywhere-rulesets list (https://lists.eff.org/mailman/listinfo/https-everywhere-rules) is for discussing the rulesets and their contents, including patches and git pull requests.
 
 Tests
 -------------
 
-There are some very basic unittests under https-everywhere-tests/. These are run with
+There are some very basic unittests under test/. These are run with
 
     bash test.sh
 
@@ -106,7 +108,7 @@ loading URLs in a browser and watching for Mixed Content Blocking to fire.
 The easiest way to run ruleset tests is to load a standalone Firefox instance
 with the tests enabled:
 
-    bash test.sh --justrun
+    bash test/firefox.sh --justrun
 
 Then click the HTTPS Everywhere icon on the toolbar, and click "Run HTTPS
 Everywhere Ruleset Tests." When you run the tests, be prepared to let your