diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
index 6b3793e..a52d1ad 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
@@ -195,11 +195,11 @@ public function sortAll() {
   }
 
   /**
-   * Sorts the dependency graph by reverse weight and alphabetically.
+   * Sorts the dependency graph by reverse weight.
    *
    * @param array $a
    *   First item for comparison. The compared items should be associative
-   *   arrays that include a 'weight' and a 'component' key.
+   *   arrays that include a 'weight' key.
    * @param array $b
    *   Second item for comparison.
    *
@@ -207,12 +207,7 @@ public function sortAll() {
    *   The comparison result for uasort().
    */
   public function sortGraph(array $a, array $b) {
-    $weight_cmp = SortArray::sortByKeyInt($a, $b, 'weight') * -1;
-
-    if ($weight_cmp === 0) {
-      return SortArray::sortByKeyString($a, $b, 'component');
-    }
-    return $weight_cmp;
+    return SortArray::sortByKeyInt($a, $b, 'weight') * -1;
   }
 
   /**
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 15e6e80..32203ae 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -104,6 +104,13 @@
 
 $test_list = simpletest_script_get_test_list();
 
+if (in_array('Drupal\comment\Tests\CommentFieldsTest', $test_list)) {
+  $test_list = ['Drupal\comment\Tests\CommentFieldsTest'];
+}
+else {
+  $test_list = [];
+}
+
 // Try to allocate unlimited time to run the tests.
 drupal_set_time_limit(0);
 simpletest_script_reporter_init();