diff --git a/core/modules/datetime/src/Plugin/Field/ConfigurableTimezoneInterface.php b/core/modules/datetime/src/Plugin/Field/ConfigurableTimezoneInterface.php
index 9991b57..47450c7 100644
--- a/core/modules/datetime/src/Plugin/Field/ConfigurableTimezoneInterface.php
+++ b/core/modules/datetime/src/Plugin/Field/ConfigurableTimezoneInterface.php
@@ -3,7 +3,7 @@
 namespace Drupal\datetime\Plugin\Field;
 
 /**
- * Interface definition for field formatters and widgets that allow configuring 
+ * Interface definition for field formatters and widgets that allow configuring
  * the timezone used.
  */
 interface ConfigurableTimezoneInterface {
diff --git a/core/modules/datetime/src/Plugin/Field/ConfigurableTimezoneTrait.php b/core/modules/datetime/src/Plugin/Field/ConfigurableTimezoneTrait.php
index 13e6e67..03930cf 100644
--- a/core/modules/datetime/src/Plugin/Field/ConfigurableTimezoneTrait.php
+++ b/core/modules/datetime/src/Plugin/Field/ConfigurableTimezoneTrait.php
@@ -10,7 +10,7 @@
  * Time zone settings common to datetime widgets and formatters.
  */
 trait ConfigurableTimezoneTrait {
-  
+
   /**
    * Add time zone settings to a widget or formatter settings form.
    *
@@ -24,9 +24,9 @@
    */
   protected function timezoneSettingsForm(array $form, FormStateInterface $form_state) {
     // Timezone display is only applicable to datetime items.
-    if ($this->fieldDefinition->getFieldStorageDefinition()
-        ->getSetting('datetime_type') === DateTimeItem::DATETIME_TYPE_DATETIME
-    ) {
+    $datetime_type = $this->fieldDefinition->getFieldStorageDefinition()
+      ->getSetting('datetime_type');
+    if ($datetime_type === DateTimeItem::DATETIME_TYPE_DATETIME) {
       $form['timezone_default'] = [
         '#type' => 'select',
         '#title' => $this->t('Default time zone'),
@@ -49,9 +49,9 @@ protected function timezoneSettingsForm(array $form, FormStateInterface $form_st
 
       // If this field is using per-date time zone storage, give the option of
       // allowing that to override the default.
-      if ($this->fieldDefinition->getFieldStorageDefinition()
-          ->getSetting('timezone_storage') === TRUE
-      ) {
+      $timezone_storage = $this->fieldDefinition->getFieldStorageDefinition()
+        ->getSetting('timezone_storage');
+      if ($timezone_storage === TRUE) {
         $form['timezone_per_date'] = [
           '#type' => 'checkbox',
           '#title' => 'Preferred time zone for each date',
@@ -59,7 +59,7 @@ protected function timezoneSettingsForm(array $form, FormStateInterface $form_st
         ];
       }
     }
-    
+
     return $form;
   }
 
@@ -75,9 +75,9 @@ protected function timezoneSettingsForm(array $form, FormStateInterface $form_st
    */
   protected function timezoneSettingsSummary($per_date_summary) {
     $summary = [];
-    if ($this->fieldDefinition->getFieldStorageDefinition()
-        ->getSetting('datetime_type') === DateTimeItem::DATETIME_TYPE_DATETIME
-    ) {
+    $datetime_type = $this->fieldDefinition->getFieldStorageDefinition()
+      ->getSetting('datetime_type');
+    if ($datetime_type === DateTimeItem::DATETIME_TYPE_DATETIME) {
       // Determine the default time zone summary text.
       $timezone_default = $this->getSetting('timezone_default');
       $timezone_override = $this->getSetting('timezone_override');
diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
index ccb7844..e021950 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
@@ -171,7 +171,7 @@ public function massageFormValues(array $values, array $form, FormStateInterface
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The form state.
    *
-   * @return boolean
+   * @return bool
    *   Whether the time zone should be stored.
    */
   protected function shouldStoreTimezone(DrupalDateTime $date, array $form, FormStateInterface $form_state) {
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
index 4b8520c..15a31ff 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\field\Kernel\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\datetime\Plugin\Field\FieldFormatter\DateTimeFormatterBase;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -159,7 +160,7 @@ public function testEntityDisplaySettings() {
     $this->assertIdentical($expected, $component);
 
     // Test date field.
-    $defaults = ['format_type' => 'fallback', 'timezone_override' => '', 'timezone_default' => DateTimeFormatterBase::TIMEZONE_USER];
+    $defaults = ['format_type' => 'fallback', 'timezone_override' => '', 'timezone_default' => DateTimeFormatterBase::TIMEZONE_USER, 'timezone_per_date' => FALSE];
     $expected['weight'] = 10;
     $expected['type'] = 'datetime_default';
     $expected['settings'] = ['format_type' => 'fallback'] + $defaults;
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
index 6c4e29c..625780c 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
@@ -107,7 +107,7 @@ public function testFieldInstanceMigration() {
     $this->assertInstanceOf(FieldConfig::class, $field);
     $this->assertSame('Date Field', $field->label());
     $this->assertSame('An example date field.', $field->getDescription());
-    $expected = ['datetime_type' => 'datetime'];
+    $expected = ['datetime_type' => 'datetime', 'timezone_storage' => FALSE];
     $this->assertSame($expected, $field->getSettings());
     $expected = [
       [
@@ -123,7 +123,7 @@ public function testFieldInstanceMigration() {
     $this->assertInstanceOf(FieldConfig::class, $field);
     $this->assertSame('Datetime Field', $field->label());
     $this->assertSame('An example datetime field.', $field->getDescription());
-    $expected = ['datetime_type' => 'datetime'];
+    $expected = ['datetime_type' => 'datetime', 'timezone_storage' => FALSE];
     $this->assertSame($expected, $field->getSettings());
     $expected = [];
     $this->assertSame($expected, $field->getDefaultValueLiteral());
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index 6e8e040..8a88795 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -91,7 +91,11 @@ public function testWidgetSettings() {
     $component = $form_display->getComponent('field_test_date');
     $expected['type'] = 'datetime_default';
     $expected['weight'] = 10;
-    $expected['settings'] = [];
+    $expected['settings'] = [
+      'timezone_default' => 'user',
+      'timezone_override' => '',
+      'timezone_per_date' => FALSE
+    ];
     $this->assertIdentical($expected, $component);
 
     $component = $form_display->getComponent('field_test_datestamp');