diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index eadd129..ccf75bc 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -84,7 +84,6 @@ public function testFieldBoolean() {
     $view->field['age']->options['type'] = 'test';
     $this->assertEqual(t('Test-False'), $view->field['age']->advanced_render($view->result[0]));
     $this->assertEqual(t('Test-True'), $view->field['age']->advanced_render($view->result[1]));
-
   }
 
 }
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php
new file mode 100644
index 0000000..ef71889
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Tests\UI\CustomBooleanTest.
+ */
+
+namespace Drupal\views\Tests\UI;
+
+/**
+ * Tests the UI and functionality for the Custom boolean field handler options.
+ *
+ * @see \Drupal\views\Plugin\views\field\Boolean
+ */
+class CustomBooleanTest extends UITestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Boolean custom options: UI',
+      'description' => 'Tests the UI and functionality for the Custom boolean field handler options',
+      'group' => 'Views UI',
+    );
+  }
+
+  /**
+   * \Drupal\views\Tests\ViewTestBase::viewsData().
+   */
+  public function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['age']['field']['id'] = 'boolean';
+    return $data;
+  }
+
+  /**
+   * Overrides \Drupal\views\Tests\ViewTestBase::dataSet().
+   */
+  public function dataSet() {
+    $data = parent::dataSet();
+    $data[0]['age'] = 0;
+    $data[3]['age'] = 0;
+    return $data;
+  }
+
+  /**
+   * Tests the setting and output of custom labels for boolean values.
+   */
+  public function testCustomOption() {
+    // Add the boolean field handler to the test view.
+    $view = views_get_view('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers['default']->overrideOption('fields', array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+      ),
+    ));
+
+    $this->executeView($view);
+
+    $custom_true = 'Yay';
+    $custom_false = 'Nay';
+
+    // Set up some custom value mappings for different types.
+    $custom_values = array(
+      'plain' => array(
+        'true' => $custom_true,
+        'false' => $custom_false,
+        'test' => 'assertTrue',
+      ),
+      'allowed tag' => array(
+        'true' => '<p>' . $custom_true . '</p>',
+        'false' => '<p>' . $custom_false . '</p>',
+        'test' => 'assertTrue',
+      ),
+      'disallowed tag' => array(
+        'true' => '<script>' . $custom_true . '</script>',
+        'false' => '<script>' . $custom_false . '</script>',
+        'test' => 'assertFalse',
+      ),
+    );
+
+    // Run the same tests on each type.
+    foreach ($custom_values as $type => $values) {
+      $options = array(
+        'options[type]' => 'custom',
+        'options[type_custom_true]' => $values['true'],
+        'options[type_custom_false]' => $values['false'],
+      );
+      $this->drupalPost('admin/structure/views/nojs/config-item/test_view/default/field/age', $options, 'Apply');
+
+      // Save the view.
+      $this->drupalPost('admin/structure/views/view/test_view', array(), 'Save');
+
+      $view = views_get_view('test_view');
+      $output = $view->preview();
+
+      $replacements = array('%type' => $type);
+      $this->{$values['test']}(strpos($output, $values['true']), format_string('Expected custom boolean TRUE value in output for %type.', $replacements));
+      $this->{$values['test']}(strpos($output, $values['false']), format_string('Expected custom boolean FALSE value in output for %type', $replacements));
+    }
+  }
+
+}
+