diff --git a/.travis.yml b/.travis.yml
index 0def6d50f7..b52e18fbf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,24 @@ addons:
     chrome: stable
 install:
     - npm install
-# install synapse prerequisites for end to end tests
-    - sudo apt-get install build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev
+    - ./scripts/travis/install-deps.sh
 script:
     ./scripts/travis.sh
+
+matrix:
+    include:
+        - name: Linting Checks
+          script:
+            # run the linter, but exclude any files known to have errors or warnings.
+            - npm run lintwithexclusions
+        - name: End-to-End Tests
+          install:
+            - npm install
+            - ./scripts/travis/install-deps.sh
+            - sudo apt-get install build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev
+          script:
+            - ./scripts/travis/test-riot.sh
+        - name: Unit Tests
+          script:
+            - npm run test
+
diff --git a/scripts/travis.sh b/scripts/travis/install-deps.sh
similarity index 58%
rename from scripts/travis.sh
rename to scripts/travis/install-deps.sh
index 48410ea904..5acc801af8 100755
--- a/scripts/travis.sh
+++ b/scripts/travis/install-deps.sh
@@ -9,9 +9,3 @@ ln -s ../matrix-js-sdk node_modules/matrix-js-sdk
 cd matrix-js-sdk
 npm install
 cd ..
-
-npm run test
-./.travis-test-riot.sh
-
-# run the linter, but exclude any files known to have errors or warnings.
-npm run lintwithexclusions
diff --git a/.travis-test-riot.sh b/scripts/travis/test-riot.sh
similarity index 100%
rename from .travis-test-riot.sh
rename to scripts/travis/test-riot.sh