diff --git a/.phpunit-watcher.yml b/.phpunit-watcher.yml
deleted file mode 100644
index 035a80a..0000000
--- a/.phpunit-watcher.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-watch:
-  directories:
-    - src
-    - tests
-  fileMask: '*.php'
-notifications:
-  passingTests: false
-  failingTests: false
-phpunit:
-  binaryPath: vendor/bin/phpunit
-  timeout: 180
diff --git a/composer.json b/composer.json
index addb593..8948df7 100644
--- a/composer.json
+++ b/composer.json
@@ -39,13 +39,12 @@
         "yiisoft/strings": "^2.0"
     },
     "require-dev": {
+        "bamarni/composer-bin-plugin": "^1.9.1",
         "friendsofphp/php-cs-fixer": "^3.92.5",
         "httpsoft/http-message": "^1.1.6",
-        "maglnet/composer-require-checker": "^4.7.1",
         "phpunit/phpunit": "^10.5.52",
         "rector/rector": "^2.1.4",
         "roave/infection-static-analysis-plugin": "^1.35",
-        "spatie/phpunit-watcher": "^1.24",
         "vimeo/psalm": "^5.26.1 || ^6.8.0",
         "yiisoft/di": "^1.4"
     },
@@ -60,6 +59,11 @@
         }
     },
     "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "forward-command": true,
+            "target-directory": "tools"
+        },
         "config-plugin-options": {
             "source-directory": "config"
         },
@@ -71,12 +75,13 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
+            "bamarni/composer-bin-plugin": true,
             "infection/extension-installer": true,
             "composer/package-versions-deprecated": true
         }
     },
     "scripts": {
-        "test": "phpunit --testdox --no-interaction",
-        "test-watch": "phpunit-watcher watch"
+        "require-checker": "composer-require-checker",
+        "test": "phpunit --testdox --no-interaction"
     }
 }
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 0000000..cf452dc
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,2 @@
+/*/vendor
+/*/composer.lock
diff --git a/tools/composer-require-checker/composer.json b/tools/composer-require-checker/composer.json
new file mode 100644
index 0000000..0992a90
--- /dev/null
+++ b/tools/composer-require-checker/composer.json
@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "maglnet/composer-require-checker": "^4.7.1"
+    }
+}