diff --git a/core/modules/config/config.test b/core/modules/config/config.test
index 257ab0f..b8517c7 100644
--- a/core/modules/config/config.test
+++ b/core/modules/config/config.test
@@ -251,7 +251,7 @@ class ConfigFileContentTestCase extends WebTestBase {
         // Unicode in keys and values.
         'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ' => 'αβγδεζηθικλμνξοσὠ',
       ),
-      'invalid xml' => '</title><script type="text/javascript">alert("Title XSS!");</script> & < > " \' ',
+      'xml escaping madness' => '</title><script type="text/javascript">alert("Title XSS!");</script> & < > " \' ',
     );
 
     // Attempt to read non-existing configuration.
@@ -281,7 +281,7 @@ class ConfigFileContentTestCase extends WebTestBase {
     $key = 'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ';
     $this->assertIdentical($config_data['nested keys'][$key], $config_parsed['nested keys'][$key]);
 
-    $key = 'invalid xml';
+    $key = 'xml escaping madness';
     $this->assertIdentical($config_data[$key], $config_parsed[$key]);
   }
 }
diff --git a/core/modules/system/system.test b/core/modules/system/system.test
index 40f590e..ec1a9a6 100644
--- a/core/modules/system/system.test
+++ b/core/modules/system/system.test
@@ -1,6 +1,7 @@
 <?php
 
 use Drupal\Core\Database\Database;
+use Drupal\Core\Config\FileStorage;
 use Drupal\Component\Graph\Graph;
 use Drupal\simpletest\WebTestBase;
 use Drupal\simpletest\UnitTestBase;
@@ -90,7 +91,8 @@ class ModuleTestCase extends WebTestBase {
     // Get the path to the module's config dir.
     $module_config_dir = drupal_get_path('module', $module) . '/config';
     if (is_dir($module_config_dir)) {
-      $files = glob($module_config_dir . '/' . '*.xml');
+      $files = glob($module_config_dir . '/*.' . FileStorage::getFileExtension());
+      $this->assertTrue($files);
       $config_dir = config_get_config_directory();
       // Get the filename of each config file.
       foreach ($files as $file) {
@@ -120,7 +122,8 @@ class ModuleTestCase extends WebTestBase {
     // Get the path to the module's config dir.
     $module_config_dir = drupal_get_path('module', $module) . '/config';
     if (is_dir($module_config_dir)) {
-      $files = glob($module_config_dir . '/' . '*.xml');
+      $files = glob($module_config_dir . '/*.' . FileStorage::getFileExtension());
+      $this->assertTrue($files);
       $config_dir = config_get_config_directory();
       // Get the filename of each config file.
       foreach ($files as $file) {