diff --git a/core/phpstan.neon.dist b/core/phpstan.neon.dist
index cf022ac13f9367ce53ad5a9171a0eac5d9ef1363..ca2787a16bdad683aafa341d0415a3e5399009da 100644
--- a/core/phpstan.neon.dist
+++ b/core/phpstan.neon.dist
@@ -8,6 +8,9 @@ parameters:
 
   level: 1
 
+  fileExtensions:
+    - sh
+
   paths:
     - .
     - ../composer
@@ -20,8 +23,8 @@ parameters:
     - */tests/fixtures/*.php
     - */tests/fixtures/*.php.gz
     # Skip Drupal 6 & 7 code.
-    - core/scripts/generate-d6-content.sh
-    - core/scripts/generate-d7-content.sh
+    - scripts/dump-database-d?.sh
+    - scripts/generate-d?-content.sh
     # Skip data files.
     - lib/Drupal/Component/Transliteration/data/*.php
     # Below extends on purpose a non existing class for testing.
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 32f021702f1de6944bf1919e75df8b41eff3832d..7cf7a856c6f1925b679438e4bd16f52306a14c24 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -1236,7 +1236,7 @@ function simpletest_script_format_result($result) {
 
   $message = trim(strip_tags($result->message));
   if ($args['non-html']) {
-    $message = Html::decodeEntities($message, ENT_QUOTES, 'UTF-8');
+    $message = Html::decodeEntities($message);
   }
   $lines = explode("\n", wordwrap($message), 76);
   foreach ($lines as $line) {