diff --git a/.travis.yml b/.travis.yml
index f8fe2c5..e38096b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,33 @@ php:
     - 5.3
     - 5.4
     - 5.5
+    - 5.6
+    - hhvm
 
 env:
-    - SYMFONY_VERSION="2.0.*"
-    - SYMFONY_VERSION="2.1.*"
-    - SYMFONY_VERSION="2.2.*"
-    - SYMFONY_VERSION="2.3.*"
+    - SYMFONY_VERSION=2.3.*
+
+matrix:
+  allow_failures:
+    - env: SYMFONY_VERSION=dev-master
+    - php: hhvm
+  include:
+    - php: 5.5
+      env: SYMFONY_VERSION=2.0.*
+    - php: 5.5
+      env: SYMFONY_VERSION=2.1.*
+    - php: 5.5
+      env: SYMFONY_VERSION=2.2.*
+    - php: 5.5
+      env: SYMFONY_VERSION=2.4.*
+    - php: 5.5
+      env: SYMFONY_VERSION=2.5.*
+    - php: 5.5
+      env: SYMFONY_VERSION=dev-master
 
 before_script:
     - composer self-update
-    - composer require --no-update symfony/framework-bundle:${SYMFONY_VERSION}
-    - composer install --prefer-source
+    - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
 
 script: bin/phpunit