diff --git a/.travis.yml b/.travis.yml
index 2f5935e9..136257d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,12 @@ sudo: required
 services:
   - docker
 
+env:
+  - TEST=unit
+  - TEST=hipchat
+
 script:
-  - docker-compose -f docker-compose.ci.yml run test ./scripts/wait-for-it.sh postgres:5432 -s -t 30 -- make test-unit
+  - docker-compose -f docker-compose.ci.yml run test ./scripts/wait-for-it.sh postgres:5432 -s -t 30 -- make test-$TEST
 
 notifications:
   slack: