diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 0fcc53cce4..65291a141a 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -197,7 +197,8 @@ function simpletest_run_phpunit_tests($test_id, array $unescaped_test_classnames
 
   $rows = [];
   if ($status == TestStatus::PASS) {
-    $rows = simpletest_phpunit_xml_to_rows($test_id, $phpunit_file);
+    $junit = new JUnitHelper($test_id, $phpunit_file);
+    $rows = $junit->getRecords();
   }
   else {
     $rows[] = [
@@ -218,7 +219,7 @@ function simpletest_run_phpunit_tests($test_id, array $unescaped_test_classnames
  * Inserts the parsed PHPUnit results into {simpletest}.
  *
  * @param array[] $phpunit_results
- *   An array of test results returned from simpletest_phpunit_xml_to_rows().
+ *   An array of test results returned from JUnitHelper::getRecords().
  */
 function simpletest_process_phpunit_results($phpunit_results) {
   // Insert the results of the PHPUnit test run into the database so the results