diff --git a/src/Tests/TokenFieldDatetimeTest.php b/src/Tests/TokenFieldDatetimeTest.php
index 37d5f87..8d07f54 100644
--- a/src/Tests/TokenFieldDatetimeTest.php
+++ b/src/Tests/TokenFieldDatetimeTest.php
@@ -49,7 +49,7 @@ class TokenFieldDatetimeTest extends TokenTestBase {
       'field_name' => 'field_date',
       'type' => 'datetime',
       'entity_type' => 'node',
-      'settings' => array('datetime_type' => DateTimeItem::DATETIME_TYPE_DATE),
+      'settings' => array('datetime_type' => DateTimeItem::DATETIME_TYPE_DATETIME),
     ));
     $field_date_storage->save();
 
@@ -65,7 +65,7 @@ class TokenFieldDatetimeTest extends TokenTestBase {
       'field_name' => 'field_date_range',
       'type' => 'daterange',
       'entity_type' => 'node',
-      'settings' => array('datetime_type' => DateRangeItem::DATETIME_TYPE_DATE),
+      'settings' => array('datetime_type' => DateRangeItem::DATETIME_TYPE_DATETIME),
     ));
 
     $field_date_range_storage->save();
@@ -75,10 +75,6 @@ class TokenFieldDatetimeTest extends TokenTestBase {
       'entity_type' => 'node',
       'bundle' => 'article',
       'label' => 'Test daterange field',
-      'default_date_type' => 'now',
-      'default_date' => 'now',
-      'default_end_date_type' => 'now',
-      'default_end_date' => 'now',
     ]);
     $field_date_range->save();
 
@@ -95,9 +91,9 @@ class TokenFieldDatetimeTest extends TokenTestBase {
   public function testDatetimeFieldTokens() {
 
     $data = [
-      ['value' => '1925-09-28',
+      ['value' => '1925-09-28T00:00:00',
         'tokens' => [
-          'field_date:date' => NULL,
+          'field_date:date' => strtotime('1925-09-28T00:00:00+00:00'),
           'field_date:date:html_month' => '1925-09',
           'field_date:date:custom:Y' => '1925',
         ]
@@ -124,12 +120,12 @@ class TokenFieldDatetimeTest extends TokenTestBase {
   public function testDatetimeRangeFieldTokens() {
 
     $data = [
-      ['value' => '1999-09-24',
-       'end_value' => '2000-09-24',
+      ['value' => '1999-09-09T00:00:00',
+       'end_value' => '2000-10-10T00:00:00',
         'tokens' => [
           'field_date_range:start_date:custom:Y' => '1999',
           'field_date_range:end_date:custom:Y' => '2000',
-          'field_date_range:start_date' => NULL,
+          'field_date_range:start_date' => strtotime('1999-09-09T00:00:00+00:00'),
           'field_date_range:start_date:html_month' => '1999-09',
         ]
       ],