diff --git a/.travis.yml b/.travis.yml
index c33216d19fe..8e877ae7f3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,82 +1,2 @@
-language: python
-python: 2.7
-
-matrix:
-  fast_finish: true
-  include:
-    - sudo: false
-      before_install:
-        - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y
-        - pip install virtualenv
-        - source ~/.profile
-      script:
-         - ./mach test-tidy --no-progress --all
-         - ./mach test-tidy --no-progress --self-test
-         - python ./etc/memory_reports_over_time.py --test
-         - bash etc/ci/check_no_panic.sh
-      cache: false
-    - sudo: 9000
-      dist: xenial
-      before_install:
-        - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-        - sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main' -y
-        - sudo apt-get update -q
-        - sudo apt-get install clang-3.9 llvm-3.9-dev llvm-3.9-runtime libunwind8-dev -y
-        - pip install virtualenv
-        - curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.16-x86_64-linux-gnu.20190515.tar.gz | tar xz
-        - sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc
-        - export PKG_CONFIG_PATH=$PWD/gst/lib/pkgconfig
-        - export GST_PLUGIN_SYSTEM_PATH=$PWD/gst/lib/gstreamer-1.0
-        - export GST_PLUGIN_SCANNER=$PWD/gst/libexec/gstreamer-1.0/gst-plugin-scanner
-        - export PATH=$PATH:$PWD/gst/bin
-        - export LD_LIBRARY_PATH=$PWD/gst/lib:$LD_LIBRARY_PATH
-        - export LLVM_CONFIG=llvm-config-3.9
-        - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y
-        - source ~/.profile
-      script:
-         # see https://github.com/servo/servo/issues/20664
-         #- ./mach cargo check -p compositing --no-default-features
-         - ./mach build -d --verbose -p servo
-         - ./mach test-unit
-         - ./mach clean
-         - bash etc/ci/lockfile_changed.sh
-      cache:
-        directories:
-          - .servo
-          - $HOME/.cargo
-          - $HOME/.rustup
-          - $HOME/.ccache
-      before_cache:
-        - ./mach clean-nightlies --keep 2 --force
-        - ./mach clean-cargo-cache --keep 2 --force
-        - rm -rf $HOME/.cargo/registry
-        - rm -rf $HOME/.servo/target
-      env:
-        CC=gcc-6
-        CXX=g++-6
-        CCACHE=/usr/bin/ccache
-        RUSTFLAGS=-Dwarnings
-        CARGO_INCREMENTAL=0
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - autoconf2.13
-            - cmake
-            - gcc-6
-            - g++-6
-            - gperf
-            - libosmesa6-dev
-            - libglu1-mesa-dev
-            - libgles2-mesa-dev
-            - python-virtualenv
-            - xorg-dev
-            - ccache
-            - libdbus-glib-1-dev
-            - libedit-dev
-            - libglib2.0-dev
-
 branches:
-  only:
-    - master
+  only: none
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index e8e6479c052..20c85ac1e9c 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -85,7 +85,7 @@ def main(task_for):
         # https://github.com/servo/servo/pull/22597#issuecomment-451518810
         CONFIG.git_sha_is_current_head()
 
-        tidy_untrusted()
+        linux_tidy_unit_untrusted()
 
     # https://tools.taskcluster.net/hooks/project-servo/daily
     elif task_for == "daily":
@@ -158,17 +158,24 @@ windows_sparse_checkout = [
 ]
 
 
-def tidy_untrusted():
+def linux_tidy_unit_untrusted():
     return (
-        decisionlib.DockerWorkerTask("Tidy")
+        decisionlib.DockerWorkerTask("Tidy + dev build + unit tests")
         .with_worker_type("servo-docker-untrusted")
-        .with_treeherder("Linux x64", "Tidy")
+        .with_treeherder("Linux x64", "Tidy+Unit")
         .with_max_run_time_minutes(60)
         .with_dockerfile(dockerfile_path("build"))
         .with_env(**build_env, **unix_build_env, **linux_build_env)
         .with_repo()
         .with_script("""
             ./mach test-tidy --no-progress --all
+            ./mach test-tidy --no-progress --self-test
+            ./mach build --dev
+            ./mach test-unit
+
+            ./etc/ci/lockfile_changed.sh
+            ./etc/memory_reports_over_time.py --test
+            ./etc/ci/check_no_panic.sh
         """)
         .create()
     )