diff --git a/.travis.yml b/.travis.yml
index da3f50c..51aea57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,28 +7,24 @@ php:
   - 5.6
   - hhvm
 
-env:
-    - SYMFONY_VERSION=2.1.*
-    - SYMFONY_VERSION=2.2.*
-    - SYMFONY_VERSION=2.3.*
-    - SYMFONY_VERSION=2.4.*
-    - SYMFONY_VERSION=dev-master
-
 matrix:
+    include:
+        - php: 5.5
+          env: SYMFONY_VERSION='2.1.*'
+        - php: 5.5
+          env: SYMFONY_VERSION='2.2.*'
+        - php: 5.5
+          env: SYMFONY_VERSION='2.3.*'
+        - php: 5.5
+          env: SYMFONY_VERSION='2.4.*'
+        - php: 5.5
+          env: SYMFONY_VERSION='dev-master'
     allow_failures:
         - env: SYMFONY_VERSION=dev-master
 
 before_script:
     - composer self-update
-    - composer require symfony/twig-bundle:${SYMFONY_VERSION} --no-update
-    - composer require symfony/twig-bridge:${SYMFONY_VERSION} --no-update
-    - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
-    - composer require symfony/validator:${SYMFONY_VERSION} --dev --no-update
-    - composer require symfony/console:${SYMFONY_VERSION} --no-update
-    - composer require symfony/css-selector:${SYMFONY_VERSION} --dev --no-update
-    - composer require symfony/browser-kit:${SYMFONY_VERSION} --dev --no-update
-    - composer require symfony/yaml:${SYMFONY_VERSION} --dev --no-update
-    - composer require symfony/form:${SYMFONY_VERSION} --dev --no-update
-    - composer update
+    - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
+    - composer install
 
 script: phpunit --coverage-text
diff --git a/Tests/Parser/ValidationParserTest.php b/Tests/Parser/ValidationParserTest.php
index 7aed2d9..13885b7 100644
--- a/Tests/Parser/ValidationParserTest.php
+++ b/Tests/Parser/ValidationParserTest.php
@@ -13,7 +13,7 @@ class ValidationParserTest extends WebTestCase
     public function setUp()
     {
         $container  = $this->getContainer();
-        $factory = $container->get('validator.mapping.class_metadata_factory');
+        $factory = $container->get('validator')->getMetadataFactory();
 
         if (version_compare(Kernel::VERSION, '2.2.0', '<')) {
             $this->parser = new ValidationParserLegacy($factory);