diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c773537..e17fc4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,11 +40,14 @@ jobs:
         env:
           SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
+      - name: Install phpspec
+        run: composer bin phpspec install
+
       - name: Run tests
-        run: bin/phpunit -v
+        run: vendor/bin/simple-phpunit -v
 
       - name: Run phpspec
-        run: bin/phpspec run --format=pretty
+        run: vendor/bin/phpspec run --format=pretty
 
   code-coverage:
     name: Code Coverage
@@ -65,7 +68,7 @@ jobs:
           composer-options: --prefer-dist
 
       - name: Run code coverage
-        run: bin/phpunit -v --coverage-text
+        run: vendor/bin/simple-phpunit -v --coverage-text
 
   composer-validate:
     name: Validate composer.json
diff --git a/.gitignore b/.gitignore
index d326b01..b095974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-bin
-composer.lock
-vendor
-tests/fixtures/app/cache
-tests/fixtures/app/logs
-.php_cs.cache
-var
+/composer.lock
+/vendor
+/tests/fixtures/app/cache
+/tests/fixtures/app/logs
+/.php_cs.cache
+/var
+/bin/tools/*/vendor/
+/bin/tools/*/composer.lock
diff --git a/bin/tools/phpspec/composer.json b/bin/tools/phpspec/composer.json
new file mode 100644
index 0000000..15e475a
--- /dev/null
+++ b/bin/tools/phpspec/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "phpspec/phpspec": "^7.1"
+    }
+}
diff --git a/composer.json b/composer.json
index 1181582..17e6906 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,9 @@
         "symfony/framework-bundle": "^4.4|^5.0|^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5",
-        "phpspec/phpspec": "^6.3|^7.0",
         "symfony/var-dumper": "^4.4|^5.0|^6.0",
-        "symfony/phpunit-bridge": "^5.3"
+        "symfony/phpunit-bridge": "^5.3",
+        "bamarni/composer-bin-plugin": "^1.4"
     },
     "autoload": {
         "psr-4": { "Umpirsky\\I18nRoutingBundle\\": "src/" }
@@ -26,12 +25,12 @@
     "autoload-dev": {
         "files": ["tests/fixtures/app/AppKernel.php"]
     },
-    "config": {
-        "bin-dir": "bin"
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.0.1-dev"
+        },
+        "bamarni-bin": {
+            "target-directory": "bin/tools"
         }
     },
     "minimum-stability": "dev",