diff --git a/.travis.yml b/.travis.yml
index 88a8d902..891fdcc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,18 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
-    - hhvm
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
 
 sudo: false
 
 cache:
   directories:
-    - $HOME/.composer/cache
+    - $HOME/.composer/cache/files
 
 env:
   - SYMFONY_VERSION=2.7.*
@@ -21,22 +21,16 @@ matrix:
   include:
     - php: 5.6
       env: SYMFONY_VERSION=2.3.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.4.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.5.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.6.*
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*@dev
     - php: 5.6
       env: SYMFONY_VERSION=3.0.*@dev
     - php: 5.3
-      env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
+      env: COMPOSER_FLAGS="--prefer-lowest"
 
 before_install:
   - composer self-update
-  - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
 
 install: composer update --prefer-source $COMPOSER_FLAGS
 
diff --git a/composer.json b/composer.json
index 9f694d5e..7eb31c44 100644
--- a/composer.json
+++ b/composer.json
@@ -23,15 +23,15 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
-        "symfony/framework-bundle": "~2.3",
-        "zendframework/zenddiagnostics": "~1.0.2|~1.1"
+        "php": "^5.3.9|^7.0",
+        "symfony/framework-bundle": "~2.3|~3.0",
+        "zendframework/zenddiagnostics": "^1.0.2"
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^0.7.4",
         "sensiolabs/security-checker": "~1.3",
         "guzzle/guzzle": "~3.8",
-        "symfony/expression-language": "~2.3",
+        "symfony/expression-language": "~2.3|~3.0",
         "swiftmailer/swiftmailer": "~5.4"
 },
     "suggest": {