diff --git a/.travis.yml b/.travis.yml
index 23e1c230..bcb42640 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,19 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-
-before_script:
-  - composer install --dev
-
-script: phpunit
\ No newline at end of file
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+before_script:
+  - composer self-update
+  - composer install --dev --prefer-dist
+
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
+
+script: phpunit