diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingAdministratorsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingAdministratorsContext.php
index fc14000e043..a22955d2f30 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingAdministratorsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingAdministratorsContext.php
@@ -127,15 +127,6 @@ public function iAddIt(): void
         $this->client->create();
     }
 
-    /**
-     * @When I save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $response = $this->client->update();
-        $this->responseChecker->isUpdateSuccessful($response);
-    }
-
     /**
      * @When I delete administrator with email :adminUser
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php
index b4e4c7d6262..e3a7e3de1de 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php
@@ -321,14 +321,6 @@ public function iMakeCatalogPromotionOperateFrom(string $startDate): void
         $this->client->updateRequestData(['startDate' => $startDate]);
     }
 
-    /**
-     * @When I save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I browse catalog promotions
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingChannelsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingChannelsContext.php
index 7c688ce55b4..c975e6c6862 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingChannelsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingChannelsContext.php
@@ -204,14 +204,6 @@ public function iWantToModifyThisChannel(ChannelInterface $channel): void
         $this->client->buildUpdateRequest(Resources::CHANNELS, $channel->getCode());
     }
 
-    /**
-     * @When I save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @Then I should be notified that it has been successfully created
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingCountriesContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingCountriesContext.php
index dce98acabf1..f06eaf53978 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingCountriesContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingCountriesContext.php
@@ -84,15 +84,6 @@ public function iDisableIt(): void
         $this->client->addRequestData('enabled', false);
     }
 
-    /**
-     * @When I save my changes
-     * @When I try to save changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I name the province :provinceName
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingCustomerGroupsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingCustomerGroupsContext.php
index beb144bfc9a..3d2db2b7bb4 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingCustomerGroupsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingCustomerGroupsContext.php
@@ -72,14 +72,6 @@ public function iWantToEditThisCustomerGroup(CustomerGroupInterface $customerGro
         $this->client->buildUpdateRequest(Resources::CUSTOMER_GROUPS, $customerGroup->getCode());
     }
 
-    /**
-     * @When I (try to) save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I browse customer groups
      * @When I want to browse customer groups
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingExchangeRatesContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingExchangeRatesContext.php
index 8c3f74ce3da..9e6aedcb6ef 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingExchangeRatesContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingExchangeRatesContext.php
@@ -110,14 +110,6 @@ public function iChangeRatioTo(string $ratio): void
         $this->client->updateRequestData(['ratio' => $ratio]);
     }
 
-    /**
-     * @When I save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When /^I delete the (exchange rate between "[^"]+" and "[^"]+")$/
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingProductAssociationTypesContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingProductAssociationTypesContext.php
index 52be7231a77..fa51c5137aa 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingProductAssociationTypesContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingProductAssociationTypesContext.php
@@ -170,14 +170,6 @@ public function iRenameItToIn(string $name, string $language): void
         $this->client->updateRequestData(['translations' => [$language => ['name' => $name, 'locale' => $language]]]);
     }
 
-    /**
-     * @When I (try to) save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @Then I should be notified that it has been successfully edited
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingProductOptionsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingProductOptionsContext.php
index ac175b836cd..8925ad45e29 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingProductOptionsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingProductOptionsContext.php
@@ -123,14 +123,6 @@ public function iAddIt(): void
         $this->client->create();
     }
 
-    /**
-     * @When I (try to) save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @Then I should see :count product options in the list
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingProductReviewsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingProductReviewsContext.php
index aea0ae14554..22cf5eb3e4c 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingProductReviewsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingProductReviewsContext.php
@@ -64,14 +64,6 @@ public function iChangeItsCommentTo(?string $comment = ''): void
         $this->client->updateRequestData(['comment' => $comment]);
     }
 
-    /**
-     * @When I (try to) save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I choose :rating as its rating
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingProductsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingProductsContext.php
index f7ecde3e64d..9a4af12398c 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingProductsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingProductsContext.php
@@ -165,14 +165,6 @@ public function iChooseMainTaxon(TaxonInterface $taxon): void
         $this->client->updateRequestData(['mainTaxon' => $this->iriConverter->getIriFromItem($taxon)]);
     }
 
-    /**
-     * @When I (try to) save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I filter them by :taxon taxon
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingShippingCategoriesContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingShippingCategoriesContext.php
index 0b3c5ce4bfb..8db3935aacb 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingShippingCategoriesContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingShippingCategoriesContext.php
@@ -107,14 +107,6 @@ public function iSpecifyItsDescriptionAs(string $description): void
         $this->client->addRequestData('description', $description);
     }
 
-    /**
-     * @When I save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @Then I should be notified that shipping category with this code already exists
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingShippingMethodsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingShippingMethodsContext.php
index 434a544466d..979e4b79a94 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingShippingMethodsContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingShippingMethodsContext.php
@@ -254,14 +254,6 @@ public function iWantToModifyShippingMethod(ShippingMethodInterface $shippingMet
         $this->client->buildUpdateRequest(Resources::SHIPPING_METHODS, $shippingMethod->getCode());
     }
 
-    /**
-     * @When I (try to) save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I sort the shipping methods :sortType by code
      * @When I switch the way shipping methods are sorted :sortType by code
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingTaxCategoriesContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingTaxCategoriesContext.php
index fe5ce8ccba6..0134a3acbfb 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingTaxCategoriesContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingTaxCategoriesContext.php
@@ -100,14 +100,6 @@ public function iDescribeItAs(string $description): void
         $this->client->addRequestData('description', $description);
     }
 
-    /**
-     * @When I (try to) save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I browse tax categories
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingTaxRatesContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingTaxRatesContext.php
index e9ec7de3620..e837a0ba2b8 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingTaxRatesContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingTaxRatesContext.php
@@ -170,15 +170,6 @@ public function iRemoveItsAmount(): void
         $this->client->addRequestData('amount', '');
     }
 
-    /**
-     * @When I save my changes
-     * @When I try to save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I browse tax rates
      */
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingZonesContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingZonesContext.php
index e0455024055..28924394eef 100644
--- a/src/Sylius/Behat/Context/Api/Admin/ManagingZonesContext.php
+++ b/src/Sylius/Behat/Context/Api/Admin/ManagingZonesContext.php
@@ -199,14 +199,6 @@ public function iRemoveTheZoneMember(ZoneInterface $zone): void
         $this->removeZoneMember($zone);
     }
 
-    /**
-     * @When I save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @Then the zone named :zone with the :country country member should appear in the registry
      */
diff --git a/src/Sylius/Behat/Context/Api/Common/SaveContext.php b/src/Sylius/Behat/Context/Api/Common/SaveContext.php
new file mode 100644
index 00000000000..54d241c75ce
--- /dev/null
+++ b/src/Sylius/Behat/Context/Api/Common/SaveContext.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Behat\Context\Api\Common;
+
+use Behat\Behat\Context\Context;
+use Sylius\Behat\Client\ApiClientInterface;
+
+final class SaveContext implements Context
+{
+    public function __construct(private ApiClientInterface $client)
+    {
+    }
+
+    /**
+     * @When I save my changes
+     * @When I try to save my changes
+     */
+    public function iSaveMyChanges(): void
+    {
+        $this->client->update();
+    }
+}
diff --git a/src/Sylius/Behat/Context/Api/Shop/CustomerContext.php b/src/Sylius/Behat/Context/Api/Shop/CustomerContext.php
index f03d6de424f..3c28bd1fc62 100644
--- a/src/Sylius/Behat/Context/Api/Shop/CustomerContext.php
+++ b/src/Sylius/Behat/Context/Api/Shop/CustomerContext.php
@@ -96,14 +96,6 @@ public function iSpecifyCustomerTheEmail(string $email = ''): void
         $this->client->addRequestData('email', $email);
     }
 
-    /**
-     * @When I (try to) save my changes
-     */
-    public function iSaveMyChanges(): void
-    {
-        $this->client->update();
-    }
-
     /**
      * @When I specify the current password as :password
      */
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/common.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/common.xml
new file mode 100644
index 00000000000..2c2beddbf30
--- /dev/null
+++ b/src/Sylius/Behat/Resources/config/services/contexts/api/common.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ This file is part of the Sylius package.
+
+ (c) Paweł Jędrzejewski
+
+ For the full copyright and license information, please view the LICENSE
+ file that was distributed with this source code.
+
+-->
+
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <defaults public="true" />
+
+        <service id="sylius.behat.context.api.admin.save" class="Sylius\Behat\Context\Api\Common\SaveContext">
+            <argument type="service" id="sylius.behat.api_platform_client.admin" />
+        </service>
+
+        <service id="sylius.behat.context.api.shop.save" class="Sylius\Behat\Context\Api\Common\SaveContext">
+            <argument type="service" id="sylius.behat.api_platform_client.shop" />
+        </service>
+    </services>
+</container>
diff --git a/src/Sylius/Behat/Resources/config/suites/api/account/address_book.yml b/src/Sylius/Behat/Resources/config/suites/api/account/address_book.yml
index f28212c9c23..9e52ba29d35 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/account/address_book.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/account/address_book.yml
@@ -32,6 +32,7 @@ default:
 
                 - sylius.behat.context.api.shop.address
                 - sylius.behat.context.api.shop.checkout
+                - sylius.behat.context.api.shop.save
 
             filters:
                 tags: "@address_book&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/account/customer.yml b/src/Sylius/Behat/Resources/config/suites/api/account/customer.yml
index 04e9e78883b..eba387653ec 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/account/customer.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/account/customer.yml
@@ -33,12 +33,13 @@ default:
                 - sylius.behat.context.setup.user
                 - sylius.behat.context.setup.zone
 
+                - sylius.behat.context.api.shop.checkout
                 - sylius.behat.context.api.shop.customer
+                - sylius.behat.context.api.shop.login
                 - sylius.behat.context.api.shop.order
                 - sylius.behat.context.api.shop.order_item
-                - sylius.behat.context.api.shop.checkout
-                - sylius.behat.context.api.shop.login
                 - sylius.behat.context.api.shop.payment
+                - sylius.behat.context.api.shop.save
                 - sylius.behat.context.api.shop.shipment
 
             filters:
diff --git a/src/Sylius/Behat/Resources/config/suites/api/addressing/managing_countries.yml b/src/Sylius/Behat/Resources/config/suites/api/addressing/managing_countries.yml
index dde258e5135..815f891c244 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/addressing/managing_countries.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/addressing/managing_countries.yml
@@ -19,6 +19,7 @@ default:
                 - sylius.behat.context.setup.zone
 
                 - sylius.behat.context.api.admin.managing_countries
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_countries&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/addressing/managing_zones.yml b/src/Sylius/Behat/Resources/config/suites/api/addressing/managing_zones.yml
index 53427b3925d..e316f99cc6e 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/addressing/managing_zones.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/addressing/managing_zones.yml
@@ -19,6 +19,7 @@ default:
                 - sylius.behat.context.setup.zone
 
                 - sylius.behat.context.api.admin.managing_zones
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_zones&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/channel/managing_channels.yml b/src/Sylius/Behat/Resources/config/suites/api/channel/managing_channels.yml
index 3adae1d054e..5d551a843e5 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/channel/managing_channels.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/channel/managing_channels.yml
@@ -27,6 +27,7 @@ default:
                 - sylius.behat.context.setup.zone
 
                 - sylius.behat.context.api.admin.managing_channels
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_channels&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/currency/managing_exchange_rates.yml b/src/Sylius/Behat/Resources/config/suites/api/currency/managing_exchange_rates.yml
index 8c40d0e2f97..3e436d2895e 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/currency/managing_exchange_rates.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/currency/managing_exchange_rates.yml
@@ -17,6 +17,7 @@ default:
                 - sylius.behat.context.setup.exchange_rate
 
                 - sylius.behat.context.api.admin.managing_exchange_rates
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_exchange_rates&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_association_types.yml b/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_association_types.yml
index a1b0fa92e51..6088ac70f84 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_association_types.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_association_types.yml
@@ -19,6 +19,7 @@ default:
                 - sylius.behat.context.setup.product_association
 
                 - sylius.behat.context.api.admin.managing_product_association_types
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_product_association_types&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_options.yml b/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_options.yml
index 4726cb4ea05..637309ba115 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_options.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_options.yml
@@ -17,6 +17,7 @@ default:
                 - sylius.behat.context.setup.admin_api_security
 
                 - sylius.behat.context.api.admin.managing_product_options
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_product_options&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_reviews.yml b/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_reviews.yml
index 76409063e7c..9999e862302 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_reviews.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/product/managing_product_reviews.yml
@@ -20,6 +20,7 @@ default:
                 - sylius.behat.context.setup.product_review
 
                 - sylius.behat.context.api.admin.managing_product_reviews
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_product_reviews&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/managing_products.yml b/src/Sylius/Behat/Resources/config/suites/api/product/managing_products.yml
index c870514607b..6aba85b5cf3 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/product/managing_products.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/product/managing_products.yml
@@ -41,9 +41,10 @@ default:
                 - sylius.behat.context.setup.shipping_category
                 - sylius.behat.context.setup.taxonomy
                 - sylius.behat.context.setup.zone
-                - Sylius\Behat\Context\Api\Admin\ManagingProductTaxonsContext
 
                 - sylius.behat.context.api.admin.managing_products
+                - sylius.behat.context.api.admin.save
+                - Sylius\Behat\Context\Api\Admin\ManagingProductTaxonsContext
 
             filters:
                 tags: "@managing_products&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml
index 2598dc13b59..c2740963d6c 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml
@@ -26,6 +26,7 @@ default:
 
                 - sylius.behat.context.api.admin.managing_catalog_promotions
                 - sylius.behat.context.api.admin.managing_product_variants
+                - sylius.behat.context.api.admin.save
                 - sylius.behat.context.api.shop.login
                 - sylius.behat.context.api.shop.product
                 - sylius.behat.context.api.shop.product_variant
diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml
index 0bb2aa4adc8..d9d3ea54042 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml
@@ -25,6 +25,7 @@ default:
                 - Sylius\Behat\Context\Setup\CatalogPromotionContext
 
                 - sylius.behat.context.api.admin.managing_catalog_promotions
+                - sylius.behat.context.api.admin.save
                 - sylius.behat.context.api.shop.product_variant
                 - Sylius\Behat\Context\Api\Admin\BrowsingCatalogPromotionProductVariantsContext
 
diff --git a/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipping_categories.yml b/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipping_categories.yml
index c181cc2fc28..0cc02c41503 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipping_categories.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipping_categories.yml
@@ -15,6 +15,7 @@ default:
                 - sylius.behat.context.transform.shipping_category
 
                 - sylius.behat.context.api.admin.managing_shipping_categories
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_shipping_categories&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipping_methods.yml b/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipping_methods.yml
index aa3e0184698..be4595c44a8 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipping_methods.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipping_methods.yml
@@ -29,6 +29,7 @@ default:
                 - sylius.behat.context.transform.zone
 
                 - sylius.behat.context.api.admin.managing_shipping_methods
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_shipping_methods&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_categories.yml b/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_categories.yml
index be9ba2b710a..8e86c3269b7 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_categories.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_categories.yml
@@ -14,6 +14,7 @@ default:
                 - sylius.behat.context.setup.taxation
 
                 - sylius.behat.context.api.admin.managing_tax_categories
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_tax_categories&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_rates.yml b/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_rates.yml
index 74412552b04..43c432da672 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_rates.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_rates.yml
@@ -18,6 +18,7 @@ default:
                 - sylius.behat.context.setup.zone
 
                 - sylius.behat.context.api.admin.managing_tax_rates
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_tax_rates&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/user/managing_administrators.yml b/src/Sylius/Behat/Resources/config/suites/api/user/managing_administrators.yml
index 59ccb3e09e1..8d56c5ec757 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/user/managing_administrators.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/user/managing_administrators.yml
@@ -17,6 +17,7 @@ default:
 
                 - sylius.behat.context.api.admin.login
                 - sylius.behat.context.api.admin.managing_administrators
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_administrators&&@api"
diff --git a/src/Sylius/Behat/Resources/config/suites/api/user/managing_customer_groups.yml b/src/Sylius/Behat/Resources/config/suites/api/user/managing_customer_groups.yml
index 4bcae49fe00..45231505292 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/user/managing_customer_groups.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/user/managing_customer_groups.yml
@@ -14,6 +14,7 @@ default:
                 - sylius.behat.context.setup.customer_group
 
                 - sylius.behat.context.api.admin.managing_customer_groups
+                - sylius.behat.context.api.admin.save
 
             filters:
                 tags: "@managing_customer_groups&&@api"
diff --git a/src/Sylius/Component/Attribute/AttributeType/FloatAttributeType.php b/src/Sylius/Component/Attribute/AttributeType/FloatAttributeType.php
index 9390a7a2d99..f6c1b26d339 100644
--- a/src/Sylius/Component/Attribute/AttributeType/FloatAttributeType.php
+++ b/src/Sylius/Component/Attribute/AttributeType/FloatAttributeType.php
@@ -35,7 +35,7 @@ public function getType(): string
     public function validate(
         AttributeValueInterface $attributeValue,
         ExecutionContextInterface $context,
-        array $configuration
+        array $configuration,
     ): void {
         if (!isset($configuration['required'])) {
             return;
diff --git a/src/Sylius/Component/Attribute/spec/AttributeType/FloatAttributeTypeSpec.php b/src/Sylius/Component/Attribute/spec/AttributeType/FloatAttributeTypeSpec.php
index a2d55f2cf98..3ae14613476 100644
--- a/src/Sylius/Component/Attribute/spec/AttributeType/FloatAttributeTypeSpec.php
+++ b/src/Sylius/Component/Attribute/spec/AttributeType/FloatAttributeTypeSpec.php
@@ -17,7 +17,6 @@
 use Prophecy\Argument;
 use Sylius\Component\Attribute\AttributeType\AttributeTypeInterface;
 use Sylius\Component\Attribute\AttributeType\FloatAttributeType;
-use Sylius\Component\Attribute\AttributeType\PercentAttributeType;
 use Sylius\Component\Attribute\Model\AttributeInterface;
 use Sylius\Component\Attribute\Model\AttributeValueInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
@@ -56,7 +55,7 @@ function it_checks_if_attribute_value_is_valid(
         ConstraintViolationInterface $constraintViolation,
         ConstraintViolationListInterface $constraintViolationList,
         ExecutionContextInterface $context,
-        ValidatorInterface $validator
+        ValidatorInterface $validator,
     ): void {
         $attributeValue->getAttribute()->willReturn($attribute);