diff --git a/spec/PropertyBuilder/OptionTaxonsBuilderSpec.php b/spec/PropertyBuilder/OptionTaxonsBuilderSpec.php
index 87862a19..17fcac68 100644
--- a/spec/PropertyBuilder/OptionTaxonsBuilderSpec.php
+++ b/spec/PropertyBuilder/OptionTaxonsBuilderSpec.php
@@ -32,7 +32,6 @@ function let(
             $productOptionValueRepository,
             $productVariantRepository,
             $productTaxonsMapper,
-            'option',
             'taxons'
         );
     }
diff --git a/tests/Behat/Service/Populate.php b/tests/Behat/Service/Populate.php
index cfc44669..5bc35566 100644
--- a/tests/Behat/Service/Populate.php
+++ b/tests/Behat/Service/Populate.php
@@ -19,7 +19,7 @@
 use FOS\ElasticaBundle\Persister\PagerPersisterInterface;
 use FOS\ElasticaBundle\Persister\PagerPersisterRegistry;
 use FOS\ElasticaBundle\Provider\PagerProviderRegistry;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 final class Populate
 {
@@ -75,7 +75,7 @@ public function populateIndex(): void
 
         foreach ($indexes as $index) {
             $event = new IndexPopulateEvent($index, true, $options);
-            $this->dispatcher->dispatch(IndexPopulateEvent::PRE_INDEX_POPULATE, $event);
+            $this->dispatcher->dispatch($event, IndexPopulateEvent::PRE_INDEX_POPULATE);
 
             if ($event->isReset()) {
                 $this->resetter->resetIndex($index, true);
@@ -86,7 +86,7 @@ public function populateIndex(): void
                 $this->populateIndexType($index, $type, false, $event->getOptions());
             }
 
-            $this->dispatcher->dispatch(IndexPopulateEvent::POST_INDEX_POPULATE, $event);
+            $this->dispatcher->dispatch($event, IndexPopulateEvent::POST_INDEX_POPULATE);
 
             $this->refreshIndex($index);
         }
@@ -101,7 +101,7 @@ public function populateIndex(): void
     private function populateIndexType(string $index, string $type, bool $reset, array $options): void
     {
         $event = new TypePopulateEvent($index, $type, $reset, $options);
-        $this->dispatcher->dispatch(TypePopulateEvent::PRE_TYPE_POPULATE, $event);
+        $this->dispatcher->dispatch($event, TypePopulateEvent::PRE_TYPE_POPULATE);
 
         if ($event->isReset()) {
             $this->resetter->resetIndexType($index, $type);
@@ -116,7 +116,7 @@ private function populateIndexType(string $index, string $type, bool $reset, arr
 
         $this->pagerPersister->insert($pager, $options);
 
-        $this->dispatcher->dispatch(TypePopulateEvent::POST_TYPE_POPULATE, $event);
+        $this->dispatcher->dispatch($event, TypePopulateEvent::POST_TYPE_POPULATE);
 
         $this->refreshIndex($index);
     }