diff --git a/tests/Behat/Context/Setup/AkeneoContext.php b/tests/Behat/Context/Setup/AkeneoProductContext.php
similarity index 88%
rename from tests/Behat/Context/Setup/AkeneoContext.php
rename to tests/Behat/Context/Setup/AkeneoProductContext.php
index 3ba4f437..9df6396b 100644
--- a/tests/Behat/Context/Setup/AkeneoContext.php
+++ b/tests/Behat/Context/Setup/AkeneoProductContext.php
@@ -11,13 +11,8 @@
 use Tests\Webgriffe\SyliusAkeneoPlugin\InMemory\Client\InMemoryAkeneoPimClient;
 use Webmozart\Assert\Assert;
 
-final class AkeneoContext implements Context
+final class AkeneoProductContext implements Context
 {
-    public function __construct(
-        private InMemoryAkeneoPimClient $apiClient,
-    ) {
-    }
-
     /**
      * @BeforeScenario
      */
@@ -32,9 +27,7 @@ public function clear(): void
      */
     public function thereIsAProductUpdatedAtOnAkeneo(string $identifier, DateTime $date = null): void
     {
-        $productsApi = $this->apiClient->getProductApi();
-        Assert::isInstanceOf($productsApi, InMemoryProductApi::class);
-        $productsApi::addResource(Product::create($identifier, ['updated' => $date]));
+        InMemoryProductApi::addResource(Product::create($identifier, ['updated' => $date]));
     }
 
     /**
diff --git a/tests/Behat/Resources/services.xml b/tests/Behat/Resources/services.xml
index f62ecee4..dbf1f2ca 100644
--- a/tests/Behat/Resources/services.xml
+++ b/tests/Behat/Resources/services.xml
@@ -7,9 +7,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="webgriffe_sylius_akeneo.behat.context.setup.akeneo" class="Tests\Webgriffe\SyliusAkeneoPlugin\Behat\Context\Setup\AkeneoContext">
-            <argument type="service" id="webgriffe_sylius_akeneo.api_client" />
-        </service>
+        <service id="webgriffe_sylius_akeneo.behat.context.setup.akeneo_product" class="Tests\Webgriffe\SyliusAkeneoPlugin\Behat\Context\Setup\AkeneoProductContext"/>
 
         <service id="webgriffe_sylius_akeneo.behat.context.setup.akeneo_product_model" class="Tests\Webgriffe\SyliusAkeneoPlugin\Behat\Context\Setup\AkeneoProductModelContext"/>
 
diff --git a/tests/Behat/Resources/suites.yml b/tests/Behat/Resources/suites.yml
index 4df5b142..806af573 100644
--- a/tests/Behat/Resources/suites.yml
+++ b/tests/Behat/Resources/suites.yml
@@ -7,7 +7,7 @@ default:
                 - sylius.behat.context.setup.product
                 - sylius.behat.context.setup.channel
                 - sylius.behat.context.setup.locale
-                - webgriffe_sylius_akeneo.behat.context.setup.akeneo
+                - webgriffe_sylius_akeneo.behat.context.setup.akeneo_product
                 - webgriffe_sylius_akeneo.behat.context.setup.akeneo_product_model
                 - webgriffe_sylius_akeneo.behat.context.setup.akeneo_family_variant
                 - webgriffe_sylius_akeneo.behat.context.setup.akeneo_attribute
@@ -30,7 +30,7 @@ default:
                 - sylius.behat.context.setup.channel
                 - sylius.behat.context.setup.admin_security
                 - sylius.behat.context.setup.product
-                - webgriffe_sylius_akeneo.behat.context.setup.akeneo
+                - webgriffe_sylius_akeneo.behat.context.setup.akeneo_product
 
                 - webgriffe_sylius_akeneo.behat.context.db.product
 
@@ -47,7 +47,7 @@ default:
                 - sylius.behat.context.setup.product
                 - sylius.behat.context.setup.product_association
                 - sylius.behat.context.setup.channel
-                - webgriffe_sylius_akeneo.behat.context.setup.akeneo
+                - webgriffe_sylius_akeneo.behat.context.setup.akeneo_product
 
                 - webgriffe_sylius_akeneo.behat.context.db.product
 
@@ -65,7 +65,7 @@ default:
 
                 - sylius.behat.context.setup.admin_security
                 - sylius.behat.context.setup.product_association
-                - webgriffe_sylius_akeneo.behat.context.setup.akeneo
+                - webgriffe_sylius_akeneo.behat.context.setup.akeneo_product
 
                 - webgriffe_sylius_akeneo.behat.context.cli.import_command
 
@@ -89,7 +89,7 @@ default:
 
                 - sylius.behat.context.setup.channel
                 - sylius.behat.context.setup.product
-                - webgriffe_sylius_akeneo.behat.context.setup.akeneo
+                - webgriffe_sylius_akeneo.behat.context.setup.akeneo_product
 
                 - webgriffe_sylius_akeneo.behat.context.db.product