diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 90%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index 9879a52..d0ea034 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -1,6 +1,6 @@
 <?php
 
-$config = PhpCsFixer\Config::create()
+$config = (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
@@ -13,13 +13,14 @@ $config = PhpCsFixer\Config::create()
         'declare_equal_normalize' => ['space' => 'single'],
         'heredoc_to_nowdoc' => true,
         'increment_style' => ['style' => 'post'],
-        'is_null' => ['use_yoda_style' => false],
-        'method_argument_space' => ['ensure_fully_multiline' => true],
+        'method_argument_space' => [
+            'on_multiline' => 'ensure_fully_multiline'
+        ],
         'modernize_types_casting' => true,
         'no_break_comment' => ['comment_text' => 'do nothing'],
         'no_empty_phpdoc' => false,
         'no_null_property_initialization' => true,
-        'no_short_echo_tag' => true,
+        'echo_tag_syntax' => false,
         'no_superfluous_elseif' => true,
         'no_superfluous_phpdoc_tags' => false,
         'no_unneeded_control_parentheses' => ['statements' => ['break', 'clone', 'continue', 'echo_print', 'switch_case', 'yield']],
@@ -37,7 +38,7 @@ $config = PhpCsFixer\Config::create()
         'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
         'phpdoc_separation' => false,
         'protected_to_private' => true,
-        'psr4' => true,
+        'psr_autoloading' => true,
         'return_type_declaration' => ['space_before' => 'one'],
         'semicolon_after_instruction' => true,
         'simplified_null_return' => false,
diff --git a/.travis.yml b/.travis.yml
index 365ee59..d5121c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ before_script:
 script:
   - |
     if [[ "$WITH_CS" == "true" ]]; then
-        vendor/bin/php-cs-fixer fix --config=.php_cs.dist --verbose --diff --dry-run --diff-format=udiff
+        vendor/bin/php-cs-fixer fix --verbose --diff --dry-run --diff-format=udiff
     fi
   - |
     if [[ "$WITH_PHPUNIT" == "true" ]]; then
diff --git a/README.md b/README.md
index 1c3ec96..0a7bced 100644
--- a/README.md
+++ b/README.md
@@ -48,12 +48,18 @@ First install the dependencies with docker-compose
 docker-compose run --rm -u ${UID} php composer install
 ```
 
-Then launch the tests
+Then launch the PHPUnit tests
 
 ```bash
 docker-compose run --rm php vendor/bin/phpunit
 ```
 
+Same for CS Fixer tests
+
+```bash
+docker-compose run --rm php vendor/bin/php-cs-fixer fix --verbose --diff --dry-run --diff-format=udiff
+```
+
 ## Support
 
 You can ask questions, submit new features ideas or discuss Spout in the chat room:<br>