diff --git a/composer.json b/composer.json
index a7e1226f..f2005b12 100644
--- a/composer.json
+++ b/composer.json
@@ -48,14 +48,14 @@
     "prefer-stable": true,
     "scripts": {
         "phpcs": "phpcs --standard=tests/phpcs.xml",
-        "phpcs-report": "phpcs --standard=tests/phpcs.xml --report=json --report-file=phpcs.report.json",
+        "phpcs-report": "phpcs --standard=tests/phpcs.xml --report=json --report-file=tests/Reports/phpcs.report.json",
         "phpcbf": "phpcbf --standard=tests/phpcs.xml",
 
         "phpstan": "phpstan -ctests/PhpStan/phpstan.neon analyse src/",
-        "phpstan-report": "phpstan -ctests/PhpStan/phpstan.neon analyse src/ --error-format=json > phpstan.report.json",
+        "phpstan-report": "phpstan -ctests/PhpStan/phpstan.neon analyse src/ --error-format=json > tests/Reports/phpstan.report.json",
 
         "phpmd": "phpmd src ansi tests/PhpMd/exclude-static-access-rule.xml --ignore-errors-on-exit --ignore-violations-on-exit",
-        "phpmd-report": "phpmd src json tests/PhpMd/exclude-static-access-rule.xml --ignore-errors-on-exit --ignore-violations-on-exit --reportfile phpmd.report.json",
+        "phpmd-report": "phpmd src json tests/PhpMd/exclude-static-access-rule.xml --ignore-errors-on-exit --ignore-violations-on-exit tests/Reports/phpmd.report.json",
 
         "static": [
             "@phpcs",
@@ -63,16 +63,12 @@
             "@phpmd"
         ],
 
-        "tests-unit": "vendor/bin/phpunit --bootstrap=/var/www/source/bootstrap.php --config=tests/ --testsuite=Unit",
+        "tests-unit": "vendor/bin/phpunit --bootstrap=/var/www/source/bootstrap.php --config=tests/ --testsuite=Unit --coverage-clover=tests/Reports/coverage_unit_graphql-base.xml",
         "phpunit-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --bootstrap=/var/www/source/bootstrap.php --config=tests/ --coverage-html=tests/reports/coverage",
-        "tests-integration": "vendor/bin/phpunit --bootstrap=/var/www/source/bootstrap.php --config=tests/ --testsuite=Integration",
+        "tests-integration": "vendor/bin/phpunit --bootstrap=/var/www/source/bootstrap.php --config=tests/ --testsuite=Integration --coverage-clover=tests/Reports/coverage_integration_graphql-base.xml",
         "tests-codeception": [
             "Composer\\Config::disableProcessTimeout",
-            "MODULE_IDS=oe_graphql_base /var/www/vendor/bin/codecept run Acceptance -c /var/www/vendor/oxid-esales/graphql-base/tests/codeception.yml --no-redirect"
-        ],
-        "codeception-coverage": [
-            "Composer\\Config::disableProcessTimeout",
-            "MODULE_IDS=oe_graphql_base /var/www/vendor/bin/codecept run Acceptance -c /var/www/vendor/oxid-esales/graphql-base/tests/codeception.yml --no-redirect --coverage"
+            "MODULE_IDS=oe_graphql_base SHOP_ROOT_PATH=/var/www vendor/bin/codecept run Acceptance -c tests/codeception.yml --no-redirect"
         ],
         "tests-all": [
             "@tests-unit",