diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index d8b653e..936a88d 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -181,7 +181,7 @@ function simpletest_run_tests($test_list) {
  */
 function simpletest_run_phpunit_tests($test_id, array $unescaped_test_classnames, &$status = NULL) {
   $phpunit_file = simpletest_phpunit_xml_filepath($test_id);
-  simpletest_phpunit_run_command($unescaped_test_classnames, $phpunit_file, $status);
+  $command_return = simpletest_phpunit_run_command($unescaped_test_classnames, $phpunit_file, $status);
 
   $rows = simpletest_phpunit_xml_to_rows($test_id, $phpunit_file);
   // A $status of 0 = passed test, 1 = failed test, > 1 indicates segfault
@@ -189,16 +189,18 @@ function simpletest_run_phpunit_tests($test_id, array $unescaped_test_classnames
   if ($status > 1) {
     // Something broke during the execution of phpunit.
     // Return an error record of all failed classes.
-    $rows[] = [
-      'test_id' => '1',
-      'test_class' => implode(",", $unescaped_test_classnames),
-      'status' => 'fail',
-      'message' => 'PHPunit Test failed to complete',
-      'message_group' => 'Other',
-      'function' => implode(",", $unescaped_test_classnames),
-      'line' => '0',
-      'file' => $phpunit_file,
-    ];
+    foreach($unescaped_test_classnames as $unescaped_test_classname) {
+      $rows[] = [
+        'test_id' => $test_id,
+        'test_class' => $unescaped_test_classname,
+        'status' => 'fail',
+        'message' => $command_return,
+        'message_group' => 'SimpleTest PHPUnit Runner',
+        'function' => $unescaped_test_classname,
+        'line' => '0',
+        'file' => $phpunit_file,
+      ];
+    }
   }
   return $rows;
 }