diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index 9f1f3ec0648..5188a1062e1 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -53,6 +53,7 @@ $wgAutoloadClasses += [
 	'EmptyResourceLoader' => "$testDir/phpunit/ResourceLoaderTestCase.php",
 	'HamcrestPHPUnitIntegration' => "$testDir/phpunit/HamcrestPHPUnitIntegration.php",
 	'LessFileCompilationTest' => "$testDir/phpunit/LessFileCompilationTest.php",
+	'MediaWikiCliOptions' => "$testDir/phpunit/MediaWikiCliOptions.php",
 	'MediaWikiCoversValidator' => "$testDir/phpunit/MediaWikiCoversValidator.php",
 	'MediaWikiGroupValidator' => "$testDir/phpunit/MediaWikiGroupValidator.php",
 	'MediaWikiLangTestCase' => "$testDir/phpunit/MediaWikiLangTestCase.php",
diff --git a/tests/phpunit/MediaWikiCliOptions.php b/tests/phpunit/MediaWikiCliOptions.php
new file mode 100644
index 00000000000..1cb716b15b9
--- /dev/null
+++ b/tests/phpunit/MediaWikiCliOptions.php
@@ -0,0 +1,14 @@
+<?php
+
+final class MediaWikiCliOptions {
+	/**
+	 * @fixme This is an awful hack.
+	 */
+	public static $additionalOptions = [
+		'use-filebackend' => false,
+		'use-bagostuff' => false,
+		'use-jobqueue' => false,
+		'use-normal-tables' => false,
+		'reuse-db' => false,
+	];
+}
diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php
index 23c8c695248..e6056ef6427 100644
--- a/tests/phpunit/MediaWikiIntegrationTestCase.php
+++ b/tests/phpunit/MediaWikiIntegrationTestCase.php
@@ -1931,7 +1931,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
 	 * @return mixed
 	 */
 	public function getCliArg( $offset ) {
-		return PHPUnitMaintClass::$additionalOptions[$offset] ?? null;
+		return MediaWikiCliOptions::$additionalOptions[$offset] ?? null;
 	}
 
 	/**
@@ -1940,7 +1940,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
 	 * @param mixed $value
 	 */
 	public function setCliArg( $offset, $value ) {
-		PHPUnitMaintClass::$additionalOptions[$offset] = $value;
+		MediaWikiCliOptions::$additionalOptions[$offset] = $value;
 	}
 
 	/**
diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 382bca7bc84..cb94c48331a 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -14,17 +14,6 @@ define( 'MW_PHPUNIT_TEST', true );
 require_once dirname( dirname( __DIR__ ) ) . "/maintenance/Maintenance.php";
 
 class PHPUnitMaintClass extends Maintenance {
-	/**
-	 * @fixme This is an awful hack.
-	 */
-	public static $additionalOptions = [
-		'use-filebackend' => false,
-		'use-bagostuff' => false,
-		'use-jobqueue' => false,
-		'use-normal-tables' => false,
-		'reuse-db' => false,
-	];
-
 	public function __construct() {
 		parent::__construct();
 		$this->setAllowUnregisteredOptions( true );
@@ -78,8 +67,8 @@ class PHPUnitMaintClass extends Maintenance {
 
 		fwrite( STDERR, 'Using PHP ' . PHP_VERSION . "\n" );
 
-		foreach ( self::$additionalOptions as $option => $default ) {
-			self::$additionalOptions[$option] = $this->getOption( $option );
+		foreach ( MediaWikiCliOptions::$additionalOptions as $option => $default ) {
+			MediaWikiCliOptions::$additionalOptions[$option] = $this->getOption( $option );
 		}
 
 		$command = new MediaWikiPHPUnitCommand();