diff --git a/.gitignore b/.gitignore
index 6dfd4f32e..a407bbe5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 phpunit.xml
-build
-vendor
+/build
+/vendor
+/bin
 composer.lock
 composer.phar
 .php_cs.cache
diff --git a/.travis.yml b/.travis.yml
index bba4ae06c..b15e7337b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,5 @@
 language: php
 
-php:
-    - nightly
-    - hhvm
-
 branches:
     only:
         - master
@@ -19,12 +15,13 @@ matrix:
         - php: 5.6
           env: SYMFONY_VERSION=3.0.*
         - php: 7.0
-          env: SYMFONY_VERSION=3.0.*
-        - php: 7.1
           env: SYMFONY_VERSION=3.1.*
-
-allow_failures:
-    - php: nightly
+        - php: 7.1
+          env: SYMFONY_VERSION=3.2.*
+        - php: hhvm
+        - php: nightly
+    allow_failures:
+        - php: nightly
 
 cache:
     directories:
@@ -33,11 +30,11 @@ cache:
 before_install:
     - if [[ "$TRAVIS_PHP_VERSION" != "5.6" && "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini || true; fi
     - composer selfupdate
-    - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
+    - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" "symfony/framework-bundle:${SYMFONY_VERSION}" --dev --no-update; fi;
 
 install: composer update --prefer-dist --no-interaction
 
-script: if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then phpunit -d xdebug.max_nesting_level=1000 --debug --coverage-clover=coverage.clover; else phpunit --debug; fi
+script: if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then bin/phpunit -d xdebug.max_nesting_level=1000 --debug --coverage-clover=coverage.clover; else bin/phpunit --debug; fi
 
 after_script:
     - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/composer.json b/composer.json
index e93631b73..356f5f994 100644
--- a/composer.json
+++ b/composer.json
@@ -19,16 +19,17 @@
         ]
     },
     "config" : {
+        "bin-dir": "bin",
         "sort-packages": true
     },
     "require": {
         "php": "^5.4|~7.0",
         "doctrine/doctrine-cache-bundle": "^1.2",
         "overblog/graphql-php-generator": "^0.3.0",
-        "symfony/expression-language": "^2.7|^3.0",
-        "symfony/framework-bundle": "^2.7|^3.0",
-        "symfony/options-resolver": "^2.7|^3.0",
-        "symfony/property-access": "^2.7|^3.0",
+        "symfony/expression-language": "^2.7|^3.1",
+        "symfony/framework-bundle": "^2.7|^3.1",
+        "symfony/options-resolver": "^2.7|^3.1",
+        "symfony/property-access": "^2.7|^3.1",
         "webonyx/graphql-php": "^0.7"
     },
     "suggest": {
@@ -36,15 +37,18 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^1.11",
-        "sensio/framework-extra-bundle": "^3.0.13",
+        "phpunit/phpunit": "^4.1|^5.5",
+        "sensio/framework-extra-bundle": "^3.0",
         "sllh/php-cs-fixer-styleci-bridge": "^1.5",
-        "symfony/browser-kit": "^2.7|^3.0",
-        "symfony/css-selector": "^2.7|^3.0",
-        "symfony/dependency-injection": "^2.7|^3.0",
-        "symfony/phpunit-bridge": "~2.7|^3.0",
-        "symfony/security-bundle": "^2.7|^3.0",
-        "symfony/twig-bundle": "^2.7|^3.0",
-        "symfony/web-profiler-bundle": "^2.7|^3.0",
-        "symfony/yaml": "^2.7|^3.0"
+        "symfony/asset": "^2.7|^3.1",
+        "symfony/browser-kit": "^2.7|^3.1",
+        "symfony/css-selector": "^2.7|^3.1",
+        "symfony/dependency-injection": "^2.7|^3.1",
+        "symfony/phpunit-bridge": "~2.7|^3.1",
+        "symfony/security-bundle": "^2.7|^3.1",
+        "symfony/templating": "^2.7|^3.1",
+        "symfony/twig-bundle": "^2.7|^3.1",
+        "symfony/web-profiler-bundle": "^2.7|^3.1",
+        "symfony/yaml": "^2.7|^3.1"
     }
 }