diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventListenersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventListenersPass.php
index d9e8242..0be2165 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventListenersPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventListenersPass.php
@@ -92,6 +92,8 @@ public function process(ContainerBuilder $container) {
       krsort($event_subscriber_info[$event_name]);
     }
 
+    file_put_contents('/tmp/foo-debug.txt', print_r($event_subscriber_info, TRUE));
+
     $definition->addArgument($event_subscriber_info);
   }
 }
diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php
index f26c5d4..2e36162 100644
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -453,7 +453,7 @@ protected function enableModules(array $modules) {
 
     // Update the kernel to make their services available.
     $module_filenames = $module_handler->getModuleList();
-    $this->kernel->updateModules($module_filenames, $module_filenames);
+    $this->kernel->updateModules($extensions['module'], $module_filenames);
 
     // Ensure isLoaded() is TRUE in order to make _theme() work.
     // Note that the kernel has rebuilt the container; this $module_handler is
@@ -486,7 +486,7 @@ protected function disableModules(array $modules) {
     $module_handler->setModuleList($module_filenames);
     $module_handler->resetImplementations();
     // Update the kernel to remove their services.
-    $this->kernel->updateModules($module_filenames, $module_filenames);
+    $this->kernel->updateModules($extension_config->get('module'), $module_filenames);
 
     // Ensure isLoaded() is TRUE in order to make _theme() work.
     // Note that the kernel has rebuilt the container; this $module_handler is
diff --git a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
index 3c43f18..9724cf9 100644
--- a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
+++ b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
@@ -74,8 +74,8 @@ protected function getTestKernel(Request $request, array $modules_enabled = NULL
   public function testCompileDIC() {
     // @todo: write a memory based storage backend for testing.
     $modules_enabled = array(
-      'system' => 'system',
-      'user' => 'user',
+      'system' => 0,
+      'user' => 0,
     );
 
     $request = Request::createFromGlobals();
@@ -150,6 +150,7 @@ public function testCompileDIC() {
       'type' => 'module',
       'pathname' => drupal_get_filename('module', 'service_provider_test'),
       'filename' => NULL,
+      'weight' => 0,
     ));
   }