diff --git a/src/Sylius/Behat/Context/Setup/OrderContext.php b/src/Sylius/Behat/Context/Setup/OrderContext.php
index 79967e7f00..3d5c11db78 100644
--- a/src/Sylius/Behat/Context/Setup/OrderContext.php
+++ b/src/Sylius/Behat/Context/Setup/OrderContext.php
@@ -17,7 +17,6 @@ use Behat\Behat\Context\Context;
 use Doctrine\Persistence\ObjectManager;
 use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
 use Sylius\Behat\Service\SharedStorageInterface;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\ChannelPricingInterface;
@@ -45,6 +44,7 @@ use Sylius\Component\Resource\Factory\FactoryInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\Component\Shipping\Repository\ShippingMethodRepositoryInterface;
 use Sylius\Component\Shipping\ShipmentTransitions;
+use Symfony\Component\Clock\ClockInterface;
 use Webmozart\Assert\Assert;
 
 final class OrderContext implements Context
@@ -65,7 +65,7 @@ final class OrderContext implements Context
         private ProductVariantResolverInterface $variantResolver,
         private OrderItemQuantityModifierInterface $itemQuantityModifier,
         private ObjectManager $objectManager,
-        private DateTimeProviderInterface $dateTimeProvider,
+        private ClockInterface $clock,
     ) {
     }
 
@@ -920,7 +920,7 @@ final class OrderContext implements Context
             $customer->setFirstname('John');
             $customer->setLastname('Doe' . $i);
 
-            $customer->setCreatedAt($this->dateTimeProvider->now());
+            $customer->setCreatedAt($this->clock->now());
 
             $customers[] = $customer;
 
@@ -1024,7 +1024,7 @@ final class OrderContext implements Context
                 $this->shipOrder($order);
             }
 
-            $order->setCheckoutCompletedAt($this->dateTimeProvider->now());
+            $order->setCheckoutCompletedAt($this->clock->now());
 
             $this->objectManager->persist($order);
             $this->sharedStorage->set('order', $order);
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
index b06f40e1f4..7f203f4a0c 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
@@ -123,7 +123,7 @@
             <argument type="service" id="Sylius\Component\Product\Resolver\ProductVariantResolverInterface" />
             <argument type="service" id="sylius.order_item_quantity_modifier" />
             <argument type="service" id="doctrine.orm.entity_manager" />
-            <argument type="service" id="Sylius\Calendar\Provider\DateTimeProviderInterface" />
+            <argument type="service" id="sylius.behat.clock" />
         </service>
 
         <service id="sylius.behat.context.setup.payment" class="Sylius\Behat\Context\Setup\PaymentContext">
diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/viewing_product_in_admin_panel.yaml b/src/Sylius/Behat/Resources/config/suites/api/product/viewing_product_in_admin_panel.yaml
index 0d795243ba..b34f82f408 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/product/viewing_product_in_admin_panel.yaml
+++ b/src/Sylius/Behat/Resources/config/suites/api/product/viewing_product_in_admin_panel.yaml
@@ -24,6 +24,7 @@ default:
                 - Sylius\Behat\Context\Transform\CatalogPromotionContext
 
                 - sylius.behat.context.setup.admin_api_security
+                - sylius.behat.context.setup.calendar
                 - sylius.behat.context.setup.channel
                 - sylius.behat.context.setup.locale
                 - sylius.behat.context.setup.product
@@ -36,7 +37,6 @@ default:
                 - sylius.behat.context.setup.taxonomy
                 - Sylius\Behat\Context\Setup\CatalogPromotionContext
                 - Sylius\Behat\Context\Setup\PriceHistoryContext
-                - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
 
                 - sylius.behat.context.api.admin.managing_products
                 - Sylius\Behat\Context\Api\Admin\BrowsingCatalogPromotionProductVariantsContext
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/admin/dashboard.yaml b/src/Sylius/Behat/Resources/config/suites/ui/admin/dashboard.yaml
index e83a16d9a4..f24dee2d6c 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/admin/dashboard.yaml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/admin/dashboard.yaml
@@ -8,6 +8,7 @@ default:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.session
 
+                - sylius.behat.context.setup.calendar
                 - sylius.behat.context.setup.channel
                 - sylius.behat.context.setup.currency
                 - sylius.behat.context.setup.geographical
@@ -18,7 +19,6 @@ default:
                 - sylius.behat.context.setup.admin_security
                 - sylius.behat.context.setup.shipping
                 - sylius.behat.context.setup.zone
-                - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
 
                 - sylius.behat.context.transform.channel
                 - sylius.behat.context.transform.customer
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_product_in_admin_panel.yaml b/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_product_in_admin_panel.yaml
index 71fb8bc930..efc10aea49 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_product_in_admin_panel.yaml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_product_in_admin_panel.yaml
@@ -24,6 +24,7 @@ default:
                 - Sylius\Behat\Context\Transform\CatalogPromotionContext
 
                 - sylius.behat.context.setup.admin_security
+                - sylius.behat.context.setup.calendar
                 - sylius.behat.context.setup.channel
                 - sylius.behat.context.setup.locale
                 - sylius.behat.context.setup.product
@@ -36,7 +37,6 @@ default:
                 - sylius.behat.context.setup.taxonomy
                 - Sylius\Behat\Context\Setup\CatalogPromotionContext
                 - Sylius\Behat\Context\Setup\PriceHistoryContext
-                - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
 
                 - sylius.behat.context.ui.admin.managing_product_attributes
                 - sylius.behat.context.ui.admin.product_showpage