diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0fe577d..a1c2d171 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -84,6 +84,10 @@ jobs:
                     composer analyse
                     (cd src/Component && composer validate --strict)
 
+            -
+                name: Run spec tests
+                run: vendor/bin/phpspec run
+
             -
                 name: Run component tests
                 run: (cd src/Component && vendor/bin/phpspec run)
diff --git a/composer.json b/composer.json
index 946bea89..4ef2a5af 100644
--- a/composer.json
+++ b/composer.json
@@ -98,11 +98,11 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "spec\\Sylius\\Bundle\\GridBundle\\": "src/Bundle/spec/",
-            "spec\\Sylius\\Component\\Grid\\": "src/Component/spec/",
             "App\\": "tests/Application/src/",
             "AppBundle\\": "src/Bundle/test/src/AppBundle/",
-            "App\\Tests\\Tmp\\": "tests/Application/tmp/"
+            "App\\Tests\\Tmp\\": "tests/Application/tmp/",
+            "spec\\Sylius\\Bundle\\GridBundle\\": "src/Bundle/spec/",
+            "spec\\Sylius\\Component\\Grid\\": "src/Component/spec/"
         }
     },
     "config": {
@@ -122,7 +122,6 @@
             "vendor/bin/ecs check --fix"
         ],
         "test-yaml-config": [
-            "vendor/bin/phpspec run --ansi --no-interaction",
             "APP_ENV=test_grids_with_yaml_config vendor/bin/phpunit --colors=always"
         ],
         "test-php-config": [