diff --git a/core/modules/field/src/Tests/Views/FieldUITest.php b/core/modules/field/src/Tests/Views/FieldUITest.php
index 884f82d..e27732b 100644
--- a/core/modules/field/src/Tests/Views/FieldUITest.php
+++ b/core/modules/field/src/Tests/Views/FieldUITest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\field\Tests\Views;
 
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\views\Views;
 
 /**
@@ -112,4 +114,55 @@ public function testHandlerUIAggregation() {
     $this->assertEqual($options, array('format', 'value'), 'The expected sort field options were found.');
   }
 
+  /**
+   * Test that the correct filter plugin is used for specific fields.
+   */
+  public function testFilterHandlers() {
+    $this->_testTextFilterHandler();
+    $this->_testBooleanFilterHandler();
+  }
+
+  /**
+   * Tests adding a text field filter handler.
+   */
+  public function _testTextFilterHandler() {
+    $field_name = 'field_name_0';
+    $url = "admin/structure/views/nojs/add-handler/test_view_fieldapi/default/filter";
+    $this->drupalPostForm($url, ['name[node__' . $field_name . '.' . $field_name . '_value]' => TRUE], t('Add and configure @handler', array('@handler' => t('filter criteria'))));
+    $this->assertResponse(200);
+
+    $this->xpath('//input[@type=:type and @id=:id]', array(':type' => 'text', ':id' => 'edit-options-value'));
+
+    $this->drupalPostForm(NULL, [], t('Apply'));
+
+  }
+
+  /**
+   * Tests adding a boolean field filter handler.
+   */
+  public function _testBooleanFilterHandler() {
+    // Create a boolean field.
+    $field_name = 'field_boolean';
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'node',
+      'type' => 'boolean',
+    ]);
+    $field_storage->save();
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => 'page',
+    ]);
+    $field->save();
+
+    $url = "admin/structure/views/nojs/add-handler/test_view_fieldapi/default/filter";
+    $this->drupalPostForm($url, ['name[node__' . $field_name . '.' . $field_name . '_value]' => TRUE], t('Add and configure @handler', array('@handler' => t('filter criteria'))));
+    $this->assertResponse(200);
+    // Verify that using a boolean field as a filter also results in using the
+    // boolean plugin.
+    $option = $this->xpath('//label[@for="edit-options-value-1"]');
+    $this->assertEqual(t('True'), (string) $option[0]);
+    $option = $this->xpath('//label[@for="edit-options-value-0"]');
+    $this->assertEqual(t('False'), (string) $option[0]);
+  }
 }
diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc
index 2efc08c..dcca986 100644
--- a/core/modules/views/views.views.inc
+++ b/core/modules/views/views.views.inc
@@ -501,6 +501,9 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
         $filter = 'numeric';
         $argument = 'numeric';
         $sort = 'standard';
+        if ($field_storage->getType() == 'boolean') {
+          $filter = 'boolean';
+        }
         break;
       case 'text':
       case 'blob':