diff --git a/modules/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSource.php b/modules/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSource.php
index 143be1e..c6812ee 100644
--- a/modules/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSource.php
+++ b/modules/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSource.php
@@ -193,7 +193,7 @@ protected function getQueryTypesForFieldType($field_type) {
 
       case 'created':
       case 'changed':
-        $query_types['string'] = 'core_node_search_date';
+        $query_types['date'] = 'core_node_search_date';
         break;
 
     }
diff --git a/modules/core_search_facets/tests/src/Functional/HooksTest.php b/modules/core_search_facets/tests/src/Functional/HooksTest.php
index d2cee23..9fdeeb7 100644
--- a/modules/core_search_facets/tests/src/Functional/HooksTest.php
+++ b/modules/core_search_facets/tests/src/Functional/HooksTest.php
@@ -10,7 +10,7 @@
  *
  * @group facets
  */
-class TestCoreSearchBase extends CoreSearchFacetsTestBase {
+class HooksTest extends CoreSearchFacetsTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/core_search_facets/tests/src/Functional/IntegrationTest.php b/modules/core_search_facets/tests/src/Functional/IntegrationTest.php
index 790e46b..7f29a5b 100644
--- a/modules/core_search_facets/tests/src/Functional/IntegrationTest.php
+++ b/modules/core_search_facets/tests/src/Functional/IntegrationTest.php
@@ -10,7 +10,7 @@
  *
  * @group facets
  */
-class IntegrationTestCoreSearchBase extends CoreSearchFacetsTestBase {
+class IntegrationTest extends CoreSearchFacetsTestBase {
 
   use BlockTestTrait;
 
@@ -107,6 +107,9 @@ public function testPostDate() {
     $this->blocks[$facet_id] = $this->createBlock($facet_id);
     $this->setShowAmountOfResults($facet_id, TRUE);
 
+    $this->drupalGet("admin/config/search/facets/$facet_id/edit");
+    $this->drupalPostForm(NULL, ['widget' => 'datebasic'], 'Save');
+
     // Assert date facets.
     $this->drupalGet('search/node', ['query' => ['keys' => 'test']]);
     $this->assertFacetLabel('February 2016 (9)');
@@ -143,6 +146,9 @@ public function testUpdatedDate() {
     $this->blocks[$facet_id] = $this->createBlock($facet_id);
     $this->setShowAmountOfResults($facet_id, TRUE);
 
+    $this->drupalGet("admin/config/search/facets/$facet_id/edit");
+    $this->drupalPostForm(NULL, ['widget' => 'datebasic'], 'Save');
+
     // Update the changed date. The nodes were created on February/March 2016
     // and the changed date is June 3, 2016.
     $node = Node::load(1);
