diff --git a/core/modules/filter/tests/src/Kernel/FilterAPITest.php b/core/modules/filter/tests/src/Kernel/FilterAPITest.php
index 5d7b272..1a8f709 100644
--- a/core/modules/filter/tests/src/Kernel/FilterAPITest.php
+++ b/core/modules/filter/tests/src/Kernel/FilterAPITest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\KernelTests\filter\FilterAPITest.
+ * Contains \Drupal\Tests\filter\Kernel\FilterAPITest.
  */
 
-namespace Drupal\KernelTests\filter;
+namespace Drupal\Tests\filter\Kernel;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Session\AnonymousUserSession;
diff --git a/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php b/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php
index 1af3b7e..9b10ccf 100644
--- a/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php
@@ -113,7 +113,10 @@ public function testUninstallingModule() {
    *   The module to install and uninstall.
    */
   protected function assertModuleInstallUninstall($module_name) {
-    $this->enableModules([$module_name]);
+    // Install the module if it is not installed yet.
+    if (!\Drupal::moduleHandler()->moduleExists($module_name)) {
+      $this->enableModules([$module_name]);
+    }
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertTrue($this->getModuleHandler()->moduleExists($module_name), $module_name .' module is enabled.');
     $this->getModuleInstaller()->uninstall([$module_name]);
diff --git a/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php b/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php
index 1236402..7234e61 100644
--- a/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php
@@ -88,7 +88,6 @@ public function testConfigurableFieldSettings() {
       'entity_type' => 'entity_test',
       'type' => 'test_field'
     ]);
-    $field_storage->save();
     $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test'
@@ -97,7 +96,6 @@ public function testConfigurableFieldSettings() {
     // is saved.
     // @todo Remove once https://www.drupal.org/node/2327883 is fixed.
     $field->save();
-    $field = FieldConfig::load($field->id());
 
     // Check that the default settings have been populated. Note: getSettings()
     // returns both storage and field settings.
@@ -108,8 +106,7 @@ public function testConfigurableFieldSettings() {
       'translatable_storage_setting' => 'a translatable field storage setting',
       'test_field_setting' => 'dummy test string',
       'translatable_field_setting' => 'a translatable field setting',
-      'field_setting_from_config_data' => TRUE,
-      'field_storage_setting_from_config_data' => TRUE,
+      'field_setting_from_config_data' => 'TRUE',
     ];
     $this->assertEqual($field->getSettings(), $expected_settings);