diff --git a/composer.json b/composer.json
index 06a1bd8bb..21f43a3ae 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,8 @@
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
 		"psalm": "psalm.phar --no-cache",
+		"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
+		"psalm:update-baseline:force": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
 		"test:unit": "phpunit --config tests/phpunit.xml"
 	},
 	"require-dev": {
diff --git a/phpunit.xml b/tests/phpunit.xml
similarity index 100%
rename from phpunit.xml
rename to tests/phpunit.xml