diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index d2db127..0ecc6eb 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -335,10 +335,10 @@ function locale_modules_installed($modules) {
 }
 
 /**
- * Implements hook_modules_uninstalled().
+ * Implements hook__module_preuninstall().
  */
-function locale_modules_uninstalled($modules) {
-  $components['module'] = $modules;
+function locale_module_preuninstall($module) {
+  $components['module'] = array($module);
   locale_system_remove($components);
 }
 
diff --git a/core/modules/locale/src/Tests/LocaleConfigManagerTest.php b/core/modules/locale/src/Tests/LocaleConfigManagerTest.php
index 5e44225..f87ced5 100644
--- a/core/modules/locale/src/Tests/LocaleConfigManagerTest.php
+++ b/core/modules/locale/src/Tests/LocaleConfigManagerTest.php
@@ -9,13 +9,14 @@
 
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\simpletest\DrupalUnitTestBase;
+use Drupal\simpletest\KernelTestBase;
 
 /**
  * Tests that the locale config manager operates correctly.
  *
  * @group locale
  */
-class LocaleConfigManagerTest extends DrupalUnitTestBase {
+class LocaleConfigManagerTest extends KernelTestBase {
 
   /**
    * A list of modules to install for this test.
@@ -28,6 +29,7 @@ class LocaleConfigManagerTest extends DrupalUnitTestBase {
    * Tests hasTranslation().
    */
   public function testHasTranslation() {
+    $this->installSchema('locale', array('locales_location'));
     $this->installConfig(array('locale_test'));
     $locale_config_manager = \Drupal::service('locale.config.typed');