diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 0e0ea2a..9a7bc4e 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -334,8 +334,6 @@ function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpun
     $phpunit_bin,
     '--log-junit',
     escapeshellarg($phpunit_file),
-    '--printer',
-    escapeshellarg(SimpletestUiPrinter::class),
   ];
 
   // Optimized for running a single test.
diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist
index 963d921..30ea1e0 100644
--- a/core/phpunit.xml.dist
+++ b/core/phpunit.xml.dist
@@ -8,14 +8,21 @@
 <phpunit bootstrap="tests/bootstrap.php" colors="true"
          beStrictAboutTestsThatDoNotTestAnything="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutChangesToGlobalState="true">
-<!-- TODO set printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter" once
- https://youtrack.jetbrains.com/issue/WI-24808 is resolved. Drupal provides a
- result printer that links to the html output results for functional tests.
- Unfortunately, this breaks the output of PHPStorm's PHPUnit runner. However, if
- using the command line you can add
- - -printer="\Drupal\Tests\Listeners\HtmlOutputPrinter" to use it (note there
- should be no spaces between the hyphens).
+         beStrictAboutChangesToGlobalState="true"
+         printerClass="\Drupal\Tests\Listeners\SimpletestUiPrinter">
+<!--
+ Drupal ships with several PHPUnit output printers.
+ SimpletestUiPrinter (used by default) links to the html results for functional tests.
+ Set printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter" if you don't need automatic HTML links in output.
+ If you use older PHPStorm versions (prior to 2016.2.2), and use built-in PHPUnit runner,
+ you need to remove printerClass line from this file, because of a bug with custom printerClass
+ breaking the output of PHPStorm's PHPUnit runner.
+ See https://youtrack.jetbrains.com/issue/WI-24808 for details.
+ To use custom printer class only in CLI tests, remove printerClass line from this file,
+ and add these 2 lines to $commands array in simpletest_phpunit_run_command() function:
+   '- -printer',
+   escapeshellarg(SimpletestUiPrinter::class),
+ (note there should be no spaces between the hyphens).
 -->
   <php>
     <!-- Set error reporting to E_ALL. -->