diff --git a/scripts/php-cs-fixer.php b/scripts/php-cs-fixer.php
index 33fc798..d77ac55 100644
--- a/scripts/php-cs-fixer.php
+++ b/scripts/php-cs-fixer.php
@@ -22,7 +22,7 @@
         @license   MIT
         COMMENT;
 
-    $finder = Finder::create();
+    $finder = new Finder();
     foreach ($directories as $directory) {
         $finder = $finder->in($directory);
     }
@@ -74,7 +74,6 @@
     if ($usePhp7) {
         $rules['declare_strict_types'] = true;
         $rules['ternary_to_null_coalescing'] = true;
-        $rules['assign_null_coalescing_to_coalesce_equal'] = false;
     }
 
     $cache = \tempnam(\sys_get_temp_dir(), $packageName).'-php_cs.cache';
diff --git a/tests/Unit/Cache/Delivery/CacheClearerTest.php b/tests/Unit/Cache/Delivery/CacheClearerTest.php
index 7804587..ac1b2dc 100644
--- a/tests/Unit/Cache/Delivery/CacheClearerTest.php
+++ b/tests/Unit/Cache/Delivery/CacheClearerTest.php
@@ -11,14 +11,11 @@
 
 namespace Contentful\Tests\ContentfulBundle\Unit\Cache\Delivery;
 
-use Cache\Adapter\PHPArray\ArrayCachePool;
 use Contentful\ContentfulBundle\Cache\Delivery\CacheClearer;
 use Contentful\Delivery\Client;
 use Contentful\Tests\ContentfulBundle\TestCase;
-use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\CacheItem;
 
 class CacheClearerTest extends TestCase
 {
diff --git a/tests/Unit/DependencyInjection/ClientFactoryTest.php b/tests/Unit/DependencyInjection/ClientFactoryTest.php
index 0d32e45..fef1706 100644
--- a/tests/Unit/DependencyInjection/ClientFactoryTest.php
+++ b/tests/Unit/DependencyInjection/ClientFactoryTest.php
@@ -11,7 +11,6 @@
 
 namespace Contentful\Tests\ContentfulBundle\Unit\DependencyInjection;
 
-use Cache\Adapter\PHPArray\ArrayCachePool;
 use Contentful\ContentfulBundle\DependencyInjection\ClientFactory;
 use Contentful\Tests\ContentfulBundle\TestCase;
 use GuzzleHttp\Client as HttpClient;