diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index 4bf3196..27afb5b 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -36,6 +36,14 @@ class DateTimeFieldTest extends WebTestBase {
   public static $modules = array('node', 'entity_test', 'datetime', 'field_ui');
 
   /**
+   * An array of display options to pass to entity_get_display()
+   *
+   * @var array
+   */
+  protected $displayOptions;
+
+
+  /**
    * A field storage to use in this test class.
    *
    * @var \Drupal\field\Entity\FieldStorageConfig
@@ -83,13 +91,13 @@ protected function setUp() {
       ))
       ->save();
 
-    $this->display_options = array(
+    $this->displayOptions = array(
       'type' => 'datetime_default',
       'label' => 'hidden',
       'settings' => array('format_type' => 'medium'),
     );
     entity_get_display($this->field->entity_type, $this->field->bundle, 'full')
-      ->setComponent($field_name, $this->display_options)
+      ->setComponent($field_name, $this->displayOptions)
       ->save();
   }
 
@@ -131,9 +139,9 @@ function testDateField() {
     foreach ($options as $setting => $values) {
       foreach ($values as $new_value) {
         // Update the entity display settings.
-        $this->display_options['settings'] = array($setting => $new_value);
+        $this->displayOptions['settings'] = array($setting => $new_value);
         entity_get_display($this->field->entity_type, $this->field->bundle, 'full')
-          ->setComponent($field_name, $this->display_options)
+          ->setComponent($field_name, $this->displayOptions)
           ->save();
 
         $this->renderTestEntity($id);
@@ -149,10 +157,10 @@ function testDateField() {
     }
 
     // Verify that the plain formatter works.
-    $this->display_options['type'] = 'datetime_plain';
-    $this->display_options['settings'] = array();
+    $this->displayOptions['type'] = 'datetime_plain';
+    $this->displayOptions['settings'] = array();
     entity_get_display($this->field->entity_type, $this->field->bundle, 'full')
-      ->setComponent($field_name, $this->display_options)
+      ->setComponent($field_name, $this->displayOptions)
       ->save();
     $expected = $date->format(DATETIME_DATE_STORAGE_FORMAT);
     $this->renderTestEntity($id);
@@ -197,9 +205,9 @@ function testDatetimeField() {
     foreach ($options as $setting => $values) {
       foreach ($values as $new_value) {
         // Update the entity display settings.
-        $this->display_options['settings'] = array($setting => $new_value);
+        $this->displayOptions['settings'] = array($setting => $new_value);
         entity_get_display($this->field->entity_type, $this->field->bundle, 'full')
-          ->setComponent($field_name, $this->display_options)
+          ->setComponent($field_name, $this->displayOptions)
           ->save();
 
         $this->renderTestEntity($id);
@@ -215,10 +223,10 @@ function testDatetimeField() {
     }
 
     // Verify that the plain formatter works.
-    $this->display_options['type'] = 'datetime_plain';
-    $this->display_options['settings'] = array();
+    $this->displayOptions['type'] = 'datetime_plain';
+    $this->displayOptions['settings'] = array();
     entity_get_display($this->field->entity_type, $this->field->bundle, 'full')
-      ->setComponent($field_name, $this->display_options)
+      ->setComponent($field_name, $this->displayOptions)
       ->save();
     $expected = $date->format(DATETIME_DATETIME_STORAGE_FORMAT);
     $this->renderTestEntity($id);
