diff --git a/servo/.travis.yml b/servo/.travis.yml
index d1f71944887d..186d479af025 100644
--- a/servo/.travis.yml
+++ b/servo/.travis.yml
@@ -12,10 +12,10 @@ matrix:
       dist: trusty
       script:
          - ./mach build -d --verbose
+         - ./mach test-compiletest
+         - ./mach test-unit
          - ./mach build-geckolib
          - ./mach test-geckolib
-         - ./mach test-unit
-         - ./mach test-compiletest
          - bash etc/ci/check_no_unwrap.sh
          - bash etc/ci/lockfile_changed.sh
          - bash etc/ci/manifest_changed.sh
diff --git a/servo/appveyor.yml b/servo/appveyor.yml
index f75c29e6ed32..a313b572d5bd 100644
--- a/servo/appveyor.yml
+++ b/servo/appveyor.yml
@@ -2,7 +2,6 @@ version: 1.0.{build}
 
 environment:
   RUST_BACKTRACE: 1
-  HOME: '%APPVEYOR_BUILD_FOLDER%'
   # The appveyor image we use has a pretty huge set of things installed... we make the
   # initial PATH something sane so we know what to expect
   PATH: "C:\\windows\\system32;\
@@ -69,6 +68,6 @@ install:
 
 build_script:
   - if %BUILD_ENV%==msvc mach build -d -v && mach test-unit
-  - if %BUILD_ENV%==gnu  bash -lc "./mach build -d -v && ./mach test-unit"
+  - if %BUILD_ENV%==gnu  bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./mach build -d -v && ./mach test-unit"
 
 test: off