diff --git a/core/modules/datetime/src/Tests/DateTestBase.php b/core/modules/datetime/src/Tests/DateTestBase.php
index 55c5e85..4c9d01c 100644
--- a/core/modules/datetime/src/Tests/DateTestBase.php
+++ b/core/modules/datetime/src/Tests/DateTestBase.php
@@ -24,13 +24,6 @@
   public static $modules = ['node', 'entity_test', 'datetime', 'field_ui'];
 
   /**
-   * The default display settings to use for the formatters.
-   *
-   * @var array
-   */
-  protected $defaultSettings = ['timezone_override' => ''];
-
-  /**
    * An array of display options to pass to entity_get_display()
    *
    * @var array
@@ -52,6 +45,13 @@
   protected $field;
 
   /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
    * An array of timezone extremes to test.
    *
    * @var string[]
@@ -98,6 +98,8 @@ protected function setUp() {
 
     // Create a field with settings to validate.
     $this->createField();
+
+    $this->dateFormatter = $this->container->get('date.formatter');
   }
 
   /**
@@ -173,7 +175,6 @@ protected function setSiteTimezone($timezone) {
     // Set an explicit site timezone, and disallow per-user timezones.
     $this->config('system.date')
       ->set('timezone.user.configurable', 0)
-      // A timezone with an offset greater than UTC+12 is used.
       ->set('timezone.default', $timezone)
       ->save();
   }
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index 4ed5305..a1c5573 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -19,6 +19,13 @@
 class DateTimeFieldTest extends DateTestBase {
 
   /**
+   * The default display settings to use for the formatters.
+   *
+   * @var array
+   */
+  protected $defaultSettings = ['timezone_override' => ''];
+
+  /**
    * {@inheritdoc}
    */
   protected function getTestFieldType() {
@@ -154,7 +161,7 @@ function testDateField() {
         ->setComponent($field_name, $this->displayOptions)
         ->save();
       $expected = SafeMarkup::format($this->displayOptions['settings']['past_format'], [
-        '@interval' => \Drupal::service('date.formatter')->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
+        '@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
       ]);
       $this->renderTestEntity($id);
       $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
@@ -175,7 +182,7 @@ function testDateField() {
         ->setComponent($field_name, $this->displayOptions)
         ->save();
       $expected = SafeMarkup::format($this->displayOptions['settings']['future_format'], [
-        '@interval' => \Drupal::service('date.formatter')->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
+        '@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
       ]);
       $this->renderTestEntity($id);
       $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
@@ -295,7 +302,7 @@ function testDatetimeField() {
       ->setComponent($field_name, $this->displayOptions)
       ->save();
     $expected = SafeMarkup::format($this->displayOptions['settings']['past_format'], [
-      '@interval' => \Drupal::service('date.formatter')->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
+      '@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
     ]);
     $this->renderTestEntity($id);
     $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
@@ -316,7 +323,7 @@ function testDatetimeField() {
       ->setComponent($field_name, $this->displayOptions)
       ->save();
     $expected = SafeMarkup::format($this->displayOptions['settings']['future_format'], [
-      '@interval' => \Drupal::service('date.formatter')->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
+      '@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
     ]);
     $this->renderTestEntity($id);
     $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
diff --git a/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php b/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
index 7074686..2afb5f5 100644
--- a/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
+++ b/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
@@ -28,11 +28,11 @@ class DateRangeFieldTest extends DateTestBase {
   public static $modules = ['datetime_range'];
 
   /**
-   * The date formatter service.
+   * The default display settings to use for the formatters.
    *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   * @var array
    */
-  protected $dateFormatter;
+  protected $defaultSettings = ['timezone_override' => '', 'separator' => '-'];
 
   /**
    * {@inheritdoc}
@@ -42,15 +42,6 @@ protected function getTestFieldType() {
   }
 
   /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->defaultSettings += ['separator' => '-'];
-    $this->dateFormatter = $this->container->get('date.formatter');
-  }
-
-  /**
    * Tests date field functionality.
    */
   public function testDateRangeField() {