diff --git a/.travis.yml b/.travis.yml
index dac275ce..e708382f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,13 +37,13 @@ env:
 matrix:
   include:
     - php: 7.2
-      env: STABILITY=dev SYMFONY_VERSION=4.0.*
+      env: SYMFONY_VERSION=4.0.*
     - php: 7.1
-      env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.2
-      env: STABILITY=dev SYMFONY_VERSION=3.3.*
+      env: SYMFONY_VERSION=3.3.*
     - php: 7.2
-      env: STABILITY=dev SYMFONY_VERSION=3.4.*
+      env: SYMFONY_VERSION=3.4.*
     - env: TEST_INSTALLATION=true
   fast_finish: true
   allow_failures:
@@ -52,12 +52,12 @@ matrix:
 before_install:
   - phpenv config-rm xdebug.ini || true
   - composer self-update
+  - composer validate --no-check-all --ansi
   - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
   - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
 
 install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
-
 script:
   - if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02ef7f21..f612841c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
 Changelog
 =========
 
-* **2017-11-15**: Removed php 5.6 and 7.0 support, removed Symfony 3.0.* and 3.1.* support
+2.2.0
+-----
+
+* Symfony 4 support
+* **2017-11-15**: Removed php 5.6 and 7.0 support, removed support for Symfony 3.0 - 3.2
 
 2.1.0
 -----
diff --git a/composer.json b/composer.json
index 70c6256c..5c16ea5f 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "symfony/monolog-bundle": "~3.1",
         "symfony/phpunit-bridge": "^3.3 || ^4.0",
         "symfony-cmf/routing-bundle": "^1.4 || ^2.0",
-        "symfony-cmf/testing": "^2.1.0-RC1",
+        "symfony-cmf/testing": "^2.1.8",
         "twig/twig": "^1.35 || ^2.4.4",
         "symfony-cmf/core-bundle": "^2.1",
         "doctrine/phpcr-odm": "^1.4.2 || ^2.0"