diff --git a/.php_cs b/.php-cs-fixer.dist.php
similarity index 87%
rename from .php_cs
rename to .php-cs-fixer.dist.php
index 3762bf4..e363615 100644
--- a/.php_cs
+++ b/.php-cs-fixer.dist.php
@@ -4,18 +4,17 @@
     ->in(['src', 'tests'])
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
         'blank_line_before_statement' => true,
         'declare_strict_types' => true,
-        'native_function_invocation' => true,
+        'native_function_invocation' => ['include' => ['@internal'], 'scope' => 'all', 'strict' => true],
         'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
         'no_empty_statement' => true,
         'no_extra_blank_lines' => true,
-        'no_extra_consecutive_blank_lines' => true,
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_unused_imports' => true,
diff --git a/Makefile b/Makefile
index f21bd11..60c99ec 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ tools/phpunit: vendor/bin/phpunit
 	ln -sf ../vendor/bin/phpunit tools/phpunit
 
 tools/php-cs-fixer:
-	curl -Ls http://cs.symfony.com/download/php-cs-fixer-v2.phar -o tools/php-cs-fixer && chmod +x tools/php-cs-fixer
+	curl -Ls http://cs.symfony.com/download/php-cs-fixer-v3.phar -o tools/php-cs-fixer && chmod +x tools/php-cs-fixer
 
 tools/deptrac:
 	curl -Ls https://github.com/sensiolabs-de/deptrac/releases/download/0.24.0/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
diff --git a/tests/Symfony/TestCase/Fixtures/NoFrameworkBundle/AnotherTestKernel.php b/tests/Symfony/TestCase/Fixtures/NoFrameworkBundle/AnotherTestKernel.php
index bc2ab18..eb1091d 100644
--- a/tests/Symfony/TestCase/Fixtures/NoFrameworkBundle/AnotherTestKernel.php
+++ b/tests/Symfony/TestCase/Fixtures/NoFrameworkBundle/AnotherTestKernel.php
@@ -5,7 +5,6 @@
 
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Kernel;
 use Zalas\Injector\PHPUnit\Symfony\Compiler\Discovery\ClassFinder;
 use Zalas\Injector\PHPUnit\Symfony\Compiler\Discovery\PropertyDiscovery;