diff --git a/config/services_test.yaml b/config/services_test.yaml
index 1b52a65b780..e05418aed32 100644
--- a/config/services_test.yaml
+++ b/config/services_test.yaml
@@ -1,5 +1,4 @@
 imports:
-    - { resource: "../vendor/sylius/calendar/tests/Behat/Resources/services.yaml" }
     - { resource: "../src/Sylius/Behat/Resources/config/services.xml" }
 
 # workaround needed for strange "test.client.history" problem
diff --git a/src/Sylius/Behat/Resources/config/services.xml b/src/Sylius/Behat/Resources/config/services.xml
index b7615551794..7068be76df4 100644
--- a/src/Sylius/Behat/Resources/config/services.xml
+++ b/src/Sylius/Behat/Resources/config/services.xml
@@ -13,6 +13,7 @@
 
 <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">
     <imports>
+        <import resource="services/_calendar_services.php" />
         <import resource="services/api.xml" />
         <import resource="services/contexts.xml" />
         <import resource="services/elements.xml" />
diff --git a/src/Sylius/Behat/Resources/config/services/_calendar_services.php b/src/Sylius/Behat/Resources/config/services/_calendar_services.php
new file mode 100644
index 00000000000..b6a04698065
--- /dev/null
+++ b/src/Sylius/Behat/Resources/config/services/_calendar_services.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+// Calendar ^0.5 changed the location of behat services
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $baseSyliusCalendarDir = __DIR__ . '/../../../../../../vendor/sylius/calendar/tests/Behat/Resources/services.yaml';
+    if (file_exists($baseSyliusCalendarDir)) {
+        $containerConfigurator->import($baseSyliusCalendarDir);
+
+        return;
+    }
+
+    $appSyliusCalendarDir = __DIR__ . '/../../../../../../../../sylius/calendar/tests/Behat/Resources/services.yaml';
+    if (file_exists($appSyliusCalendarDir)) {
+        $containerConfigurator->import($appSyliusCalendarDir);
+    }
+};