diff --git a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
index 1c520e0..fbd5b88 100644
--- a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
+++ b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
@@ -148,6 +148,38 @@ public function testExposedFormRender() {
   }
 
   /**
+   * Tests overriding the default render option with checkboxes.
+   */
+  public function testExposedFormRenderCheckboxes() {
+    // Make sure we have at least two options for node type.
+    $this->drupalCreateContentType(['type' => 'page']);
+    $this->drupalCreateNode(['type' => 'page']);
+
+    // Use a test theme to convert multi-select elements into checkboxes.
+    \Drupal::service('theme_handler')->install(array('views_test_checkboxes_theme'));
+    $this->config('system.theme')
+      ->set('default', 'views_test_checkboxes_theme')
+      ->save();
+
+    // Set the "type" filter to multi-select.
+    $view = Views::getView('test_exposed_form_buttons');
+    $filter = $view->getHandler('page_1', 'filter', 'type');
+    $filter['expose']['multiple'] = TRUE;
+    $view->setHandler('page_1', 'filter', 'type', $filter);
+    $view->save();
+    $this->drupalGet('test_exposed_form_buttons');
+
+    $actual = $this->xpath('//form//input[@type="checkbox" and @name="type[article]"]');
+    $this->assertEqual(count($actual), 1, 'Article option renders as a checkbox.');
+    $actual = $this->xpath('//form//input[@type="checkbox" and @name="type[page]"]');
+    $this->assertEqual(count($actual), 1, 'Page option renders as a checkbox');
+
+    // Ensure that all results are displayed.
+    $rows = $this->xpath("//div[contains(@class, 'views-row')]");
+    $this->assertEqual(count($rows), 6, 'All rows are displayed by default when no options are checked.');
+  }
+
+  /**
    * Tests the exposed block functionality.
    */
   public function testExposedBlock() {
diff --git a/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.info.yml b/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.info.yml
new file mode 100644
index 0000000..50bf73e
--- /dev/null
+++ b/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.info.yml
@@ -0,0 +1,5 @@
+name: Views test checkboxes theme
+type: theme
+description: Theme for testing Views rendering of checkboxes.
+version: VERSION
+core: 8.x
diff --git a/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.theme b/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.theme
new file mode 100644
index 0000000..4a038ae
--- /dev/null
+++ b/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.theme
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Changes an exposed "type" filter from a multi-select to checkboxes.
+ */
+function views_test_checkboxes_theme_form_views_exposed_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state) {
+  $form['type']['#type'] = 'checkboxes';
+}