diff --git a/core/modules/views_ui/src/Tests/ExposedFormUITest.php b/core/modules/views_ui/src/Tests/ExposedFormUITest.php
index e42b822..a21d6ac 100644
--- a/core/modules/views_ui/src/Tests/ExposedFormUITest.php
+++ b/core/modules/views_ui/src/Tests/ExposedFormUITest.php
@@ -23,6 +23,11 @@ class ExposedFormUITest extends UITestBase {
    */
   public static $testViews = array('test_exposed_admin_ui');
 
+  /**
+   * @inheritdoc
+   */
+  public static $modules = array('node', 'views_ui', 'block', 'taxonomy', 'field_ui', 'datetime');
+
   protected function setUp() {
     parent::setUp();
 
@@ -173,5 +178,40 @@ function testExposedAdminUi() {
     $this->assertTrue($display['display_options']['sorts']['created']['exposed']);
     $this->assertEqual($display['display_options']['sorts']['created']['expose'], ['label' => $edit['options[expose][label]']]);
     $this->assertEqual($display['display_options']['sorts']['created']['order'], 'DESC');
+
+    // Validate an "is empty" filter for a date field. First we have to add a
+    // non-required dates field to a content type.
+    // First we need a user with the correct permissions -- this is essentially
+    // the permissions list for $this->fullAdminUser plus admin content.
+    $content_admin = $this->drupalCreateUser([
+      'administer views',
+      'administer blocks',
+      'bypass node access',
+      'access user profiles',
+      'view all revisions',
+      'administer permissions',
+      'administer content types',
+      'administer node fields',
+    ]);
+    $this->drupalLogin($content_admin);
+
+    $edit = [
+      'new_storage_type' => 'datetime',
+      'label' => 'Optional datetime field',
+      'field_name' => 'optional_datetime_field',
+    ];
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/add-field', $edit, t('Save and continue'));
+    $this->drupalPostForm(NULL, [], t('Save field settings'));
+    $this->drupalPostForm(NULL, ['required' => 0], t('Save settings'));
+
+    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_exposed_admin_ui/default/filter', ['name[node__field_optional_datetime_field.field_optional_datetime_field_value]' => TRUE], t('Add and configure @handler', array('@handler' => t ('filter criteria'))));
+    $this->drupalPostForm(NULL, [], t('Expose filter'));
+    $this->drupalPostForm(NULL, [], t('Grouped filters'));
+    $edit =[
+      'options[group_info][group_items][1][title]' => 'Has a date',
+      'options[group_info][group_items][1][operator]' => 'empty',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', array(), 'The "empty" filter validates with date filters correctly.');
   }
 }