diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 165a3866e..101c3517c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
             -
                 name: Restrict twig/twig version
                 if: matrix.twig-version != ''
-                run: composer require "twig/twig:${{ matrix.twig-version }}" --no-update --no-scripts
+                run: composer require --dev "twig/twig:${{ matrix.twig-version }}" --no-update --no-scripts
 
             -
                 name: Install dependencies
@@ -104,9 +104,18 @@ jobs:
                 run: |
                     composer remove friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --dev --no-scripts
                     (cd src/Bundle/test && app/console cache:clear --env=test_without_fosrest)
+                    composer require friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --dev --no-scripts
 
             -
-                name: Run smoke tests without winzou/state-machine-bundle packages
+                name: Run smoke tests without winzou/state-machine-bundle package
                 run: |
                     composer remove winzou/state-machine-bundle --dev --no-scripts
                     (cd src/Bundle/test && app/console cache:clear --env=test_without_state_machine)
+                    composer require winzou/state-machine-bundle --dev --no-scripts
+
+            -
+                name: Run smoke tests without twig/twig package
+                run: |
+                    composer remove symfony/twig-bundle --dev --no-scripts
+                    (cd src/Bundle/test && app/console cache:clear --env=test_without_twig)
+                    composer require symfony/twig-bundle --dev --no-scripts
diff --git a/composer.json b/composer.json
index f1ba1396f..7b178b788 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,6 @@
         "symfony/framework-bundle": "^4.4 || ^5.1",
         "symfony/security-csrf": "^4.4 || ^5.1",
         "symfony/translation": "^4.4 || ^5.1",
-        "symfony/twig-bundle": "^4.4 || ^5.1",
         "symfony/validator": "^4.4 || ^5.1",
         "symfony/yaml": "^4.4 || ^5.1",
         "webmozart/assert": "^1.8"
@@ -46,10 +45,11 @@
         "sylius/resource": "self.version"
     },
     "conflict": {
-        "friendsofsymfony/rest-bundle": "<3.0 >=4.0",
-        "jms/serializer-bundle": "<3.5 >=4.0",
-        "willdurand/hateoas-bundle": "<2.0 >=3.0",
-        "winzou/state-machine-bundle": "<0.3.2 || >=0.4.0 <0.4.3"
+        "friendsofsymfony/rest-bundle": "<3.0 || >=4.0",
+        "jms/serializer-bundle": "<3.5 || >=4.0",
+        "willdurand/hateoas-bundle": "<2.0 || >=3.0",
+        "winzou/state-machine-bundle": "<0.3.2 || >=0.4 <0.4.3 || >=0.6",
+        "symfony/twig-bundle": "<4.4 || >=5.0 <5.1 || >=6.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.5",
@@ -68,6 +68,7 @@
         "sylius-labs/coding-standard": "^3.0",
         "sylius/grid-bundle": "^1.2",
         "symfony/dependency-injection": "^4.4 || ^5.1",
+        "symfony/twig-bundle": "^4.4 || ^5.1",
         "twig/twig": "^2.12 || ^3.0",
         "vimeo/psalm": "3.17.1",
         "willdurand/hateoas-bundle": "^2.0",
diff --git a/src/Bundle/test/app/config/config.yml b/src/Bundle/test/app/config/config.yml
index 07124fe7a..d5958e965 100644
--- a/src/Bundle/test/app/config/config.yml
+++ b/src/Bundle/test/app/config/config.yml
@@ -17,10 +17,6 @@ framework:
     http_method_override: true
     test: ~
 
-twig:
-    debug: "%kernel.debug%"
-    strict_variables: "%kernel.debug%"
-
 doctrine:
     dbal:
         driver: "%database_driver%"
diff --git a/src/Bundle/test/app/config/config_test.yml b/src/Bundle/test/app/config/config_test.yml
index 14ade9925..8feabeabb 100644
--- a/src/Bundle/test/app/config/config_test.yml
+++ b/src/Bundle/test/app/config/config_test.yml
@@ -8,3 +8,7 @@ fos_rest:
             - { path: '^/', priorities: ['json'], fallback_format: json, prefer_extension: true }
     exception:
         enabled: false
+
+twig:
+    debug: "%kernel.debug%"
+    strict_variables: "%kernel.debug%"
diff --git a/src/Bundle/test/app/config/config_test_without_fosrest.yml b/src/Bundle/test/app/config/config_test_without_fosrest.yml
new file mode 100644
index 000000000..fa8824da2
--- /dev/null
+++ b/src/Bundle/test/app/config/config_test_without_fosrest.yml
@@ -0,0 +1,3 @@
+twig:
+    debug: "%kernel.debug%"
+    strict_variables: "%kernel.debug%"
diff --git a/src/Bundle/test/config/bundles.php b/src/Bundle/test/config/bundles.php
index fb6da6ce8..9791421dd 100644
--- a/src/Bundle/test/config/bundles.php
+++ b/src/Bundle/test/config/bundles.php
@@ -16,7 +16,7 @@
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true],
     BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
-    Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
+    Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true, 'test_without_twig' => false],
     Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
     AppBundle\AppBundle::class => ['all' => true],
     FOS\RestBundle\FOSRestBundle::class => ['test' => true],
@@ -24,5 +24,5 @@
     Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['test' => true],
     Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['test' => true],
     Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['test' => true],
-    winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['test' => true, 'test_without_fosrest' => true],
+    winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true, 'test_without_state_machine' => false],
 ];