diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_plugin_base.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_plugin_base.yml
new file mode 100644
index 0000000..9bfcd21
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_plugin_base.yml
@@ -0,0 +1,36 @@
+langcode: und
+status: true
+dependencies: {  }
+id: test_filter_plugin_base
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: views_test_data
+base_field: nid
+core: '8'
+display:
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      pager:
+        type: none
+      style:
+        type: default
+      row:
+        type: fields
+      fields:
+        id:
+          field: id
+          table: views_test_data
+          id: id
+          plugin_id: numeric
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0
diff --git a/core/modules/views_ui/src/Tests/FilterPluginBaseTest.php b/core/modules/views_ui/src/Tests/FilterPluginBaseTest.php
new file mode 100644
index 0000000..43fb90c
--- /dev/null
+++ b/core/modules/views_ui/src/Tests/FilterPluginBaseTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views_ui\Tests\FilterPluginBaseTest.
+ */
+
+namespace Drupal\views_ui\Tests;
+
+/**
+ * Tests the FilterPluginBase class.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\filter\FilterPluginBase
+ */
+class FilterPluginBaseTest extends UITestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_filter_plugin_base');
+
+  /**
+   * Tests whether the FilterPluginTest::groupForm() function works as expected.
+   */
+  public function testGroupForm() {
+    $this->drupalGet('admin/structure/views/view/test_filter_plugin_base/edit');
+
+    $edit_filter_url = 'admin/structure/views/nojs/add-handler/test_filter_plugin_base/default/filter';
+    $edit = array(
+      'name[views_test_data.created]' => TRUE,
+      'name[views_test_data.status]' => TRUE
+    );
+    $this->drupalPostForm($edit_filter_url, $edit, t('Add and configure @handler', array('@handler' => t('filter criteria'))));
+
+    $edit = array(
+      'options[operator]' => '>',
+      'options[value][value]' => '1990-01-01 00:00:00',
+    );
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+
+    $this->assertTrue(true);
+
+    $edit = array(
+      'options[value]' => TRUE,
+    );
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+
+    // make sure the filters where added properly
+    $this->assertLink(t('Views test: Created (> 1990-01-01 00:00:00)'));
+    $this->assertLink(t('Views test: Status (True)'));
+
+    $rearrange_filter_url = 'http://drupal.xio.local/admin/structure/views/nojs/rearrange-filter/test_filter_plugin_base/default';
+    $this->drupalGet($rearrange_filter_url);
+
+    // @todo create filter group
+    $edit = array(
+      'filter_groups[groups][1]' => 'OR',
+    );
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+
+    // make sure the filters still have the same text
+    $this->assertLink(t('Views test: Created (> 1990-01-01 00:00:00)'));
+    $this->assertLink(t('Views test: Status (True)'));
+  }
+
+}