diff --git a/.travis.yml b/.travis.yml
index ee7085c6..3de6635a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,14 @@ before_install:
 
 install: true
 
-script:
-  - docker-compose exec -T app npm run test:ci --verbose
+jobs:
+  include:
+    - stage: test
+      name: "Linting"
+      script: docker-compose exec -T app npm run lint
+    - # stage name not required, will continue to use `test`
+      name: "Tests"
+      script: docker-compose exec -T app npm run test
 
 before_deploy:
   - docker-compose stop
@@ -26,7 +32,6 @@ before_deploy:
   - gcloud --quiet version
   - gcloud --quiet components update
   - gcloud --quiet components update kubectl
-
 deploy:
   - provider: script
     script: ./deploy.sh
diff --git a/package.json b/package.json
index 189c3c3f..70d60ca2 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "build:server": "cross-env NODE_ENV=production webpack --config webpack/config.server.js",
     "build:examples": "cross-env NODE_ENV=production webpack --config webpack/config.examples.js",
     "test": "jest",
-    "test:ci": "npm run lint",
+    "test:ci": "npm run lint && npm run test",
     "fetch-examples": "cross-env NODE_ENV=development node ./server/scripts/fetch-examples.js",
     "fetch-examples-gg": "cross-env NODE_ENV=development node ./server/scripts/fetch-examples-gg.js",
     "fetch-examples-ml5": "cross-env NODE_ENV=development node ./server/scripts/fetch-examples-ml5.js",