diff --git a/core/includes/schema.inc b/core/includes/schema.inc
index 448ce84..7b0c690 100644
--- a/core/includes/schema.inc
+++ b/core/includes/schema.inc
@@ -73,7 +73,7 @@ function drupal_get_complete_schema($rebuild = FALSE) {
         // we force the system_list() static cache to be refreshed to ensure
         // that it contains the complete list of modules before we go on to call
         // module_load_all_includes().
-        drupal_static_reset('system_list');
+        system_list_reset();
         module_load_all_includes('install');
       }
 
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 3cdc3e9..8ca1615 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -789,7 +789,7 @@ abstract class WebTestBase extends TestBase {
 
     // Reload module list and implementations to ensure that test module hooks
     // aren't called after tests.
-    drupal_static_reset('system_list');
+    system_list_reset();
     module_list_reset();
     module_implements_reset();
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
index ea71fe7..1eeba4e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
@@ -132,7 +132,7 @@ class ModuleTestBase extends WebTestBase {
    *   Expected module state.
    */
   function assertModules(array $modules, $enabled) {
-    drupal_static_reset('system_list');
+    system_list_reset();
     foreach ($modules as $module) {
       if ($enabled) {
         $message = 'Module "@module" is enabled.';
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php b/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
index 4709cdc..7fd3090 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
@@ -48,7 +48,7 @@ class MainContentFallbackTest extends WebTestBase {
     $edit['modules[Core][block][enable]'] = FALSE;
     $this->drupalPost('admin/modules', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
-    drupal_static_reset('system_list');
+    system_list_reset();
     $this->assertFalse(module_exists('block'), t('Block module disabled.'));
 
     // At this point, no region is filled and fallback should be triggered.
@@ -82,7 +82,7 @@ class MainContentFallbackTest extends WebTestBase {
     $edit['modules[Core][block][enable]'] = 'block';
     $this->drupalPost('admin/modules', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
-    drupal_static_reset('system_list');
+    system_list_reset();
     $this->assertTrue(module_exists('block'), t('Block module re-enabled.'));
   }
 }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
index 4d0d002..d97d7ae 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
@@ -253,7 +253,8 @@ abstract class UpgradePathTestBase extends WebTestBase {
 
     // Reload module list. For modules that are enabled in the test database,
     // but not on the test client, we need to load the code here.
-    $new_modules = array_diff(module_list(TRUE), $this->loadedModules);
+    system_list_reset();
+    $new_modules = array_diff(module_list(), $this->loadedModules);
     foreach ($new_modules as $module) {
       drupal_load('module', $module);
     }
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 656b5b2..20bc79b 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -514,7 +514,7 @@ function system_install() {
 
   // Clear out module list and hook implementation statics before calling
   // system_rebuild_theme_data().
-  drupal_static_reset('system_list');
+  system_list_reset();
   module_list_reset();
   module_implements_reset();