diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f44d1ce..318b895 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
             database_type: mysql
             database_image: "mariadb:12.3"
             coverage: false
-            experimental: true
+            experimental: false
 
     env:
       MW_VERSION: ${{ matrix.mediawiki_version }}
diff --git a/composer.json b/composer.json
index 85e50fc..2228651 100644
--- a/composer.json
+++ b/composer.json
@@ -38,8 +38,11 @@
 		"phpcs": "phpcs -ps",
 		"phpcs-fix": "phpcbf -p",
 		"phan": "phan --allow-polyfill-parser",
-		"phpunit": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist --testdox",
-		"phpunit-coverage": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist --testdox --coverage-text --coverage-html coverage/php --coverage-clover coverage/php/coverage.xml",
+		"phpunit": [
+			"Composer\\Config::disableProcessTimeout",
+			"cd ${MW_INSTALL_PATH:-../..} && { [ -f tests/phpunit/generatePHPUnitConfig.php ] && { php tests/phpunit/generatePHPUnitConfig.php >/dev/null 2>&1 || true; [ -f phpunit.xml ] || printf '%s' '<phpunit><!-- generatePHPUnitConfig --></phpunit>' > phpunit.xml; } || true; } && MEDIAWIKI_HAS_INTEGRATION_TESTS=1 vendor/bin/phpunit -c extensions/KnowledgeGraph/phpunit.xml.dist --bootstrap tests/phpunit/bootstrap.php"
+		],
+		"phpunit-coverage": "@phpunit --testdox --coverage-text --coverage-html coverage/php --coverage-clover extensions/KnowledgeGraph/coverage/php/coverage.xml",
 		"minus-x": "minus-x check ."
 	}
 }