diff --git a/tests/plugins/views_plugin_display.test b/tests/plugins/views_plugin_display.test
new file mode 100644
index 0000000..0432d80
--- /dev/null
+++ b/tests/plugins/views_plugin_display.test
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * @file
+ * Definition of ViewsPluginDisplayTestCase.
+ */
+
+/**
+ *
+ */
+class ViewsPluginDisplayTestCase extends ViewsSqlTest {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Display plugin',
+      'description' => 'Tests the basic display plugin.',
+      'group' => 'Views Plugins',
+    );
+  }
+
+  /**
+   * Tests the overriding of filter_groups.
+   */
+  function testFilterGroupsOverriding() {
+    $view = $this->viewFilterGroupsUpdating();
+
+    $view->display['page']->handler->set_override('filter_groups', TRUE);
+    $this->assertFalse($view->display['page']->handler->is_defaulted('filter_groups'), "Take sure that 'filter_groups' is marked as overridden.");
+    $this->assertFalse($view->display['page']->handler->is_defaulted('filters'), "Take sure that 'filters'' is marked as overridden.");
+  }
+
+  /**
+   * Returns a test view for testFilterGroupsOverriding.
+   *
+   * @see testFilterGroupsOverriding
+   * @return view
+   */
+  function viewFilterGroupsOverriding() {
+    $view = new view();
+    $view->name = 'test_filter_group_override';
+    $view->description = '';
+    $view->tag = 'default';
+    $view->base_table = 'node';
+    $view->human_name = 'test_filter_group_override';
+    $view->core = 7;
+    $view->api_version = '3.0';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+    /* Display: Master */
+    $handler = $view->new_display('default', 'Master', 'default');
+    $handler->display->display_options['access']['type'] = 'perm';
+    $handler->display->display_options['cache']['type'] = 'none';
+    $handler->display->display_options['query']['type'] = 'views_query';
+    $handler->display->display_options['exposed_form']['type'] = 'basic';
+    $handler->display->display_options['pager']['type'] = 'full';
+    $handler->display->display_options['style_plugin'] = 'default';
+    $handler->display->display_options['row_plugin'] = 'fields';
+    /* Field: Content: Title */
+    $handler->display->display_options['fields']['title']['id'] = 'title';
+    $handler->display->display_options['fields']['title']['table'] = 'node';
+    $handler->display->display_options['fields']['title']['field'] = 'title';
+    $handler->display->display_options['fields']['title']['label'] = '';
+    $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+    $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+    /* Filter criterion: Content: Published */
+    $handler->display->display_options['filters']['status']['id'] = 'status';
+    $handler->display->display_options['filters']['status']['table'] = 'node';
+    $handler->display->display_options['filters']['status']['field'] = 'status';
+    $handler->display->display_options['filters']['status']['value'] = 1;
+    $handler->display->display_options['filters']['status']['group'] = 1;
+    $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+
+    /* Display: Page */
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->display->display_options['path'] = 'test';
+
+    return $view;
+  }
+
+  /**
+   * Based on a bug some filter_groups landed in the overridden display, even the filters weren't overridden.
+   * This caused multiple issues.
+   * Take sure that the value from the default display are used.
+   *
+   * @see http://drupal.org/node/1259608
+   * @see views_plugin_display::init()
+   */
+  function testFilterGroupsUpdating() {
+    $view = $this->viewFilterGroupsUpdating();
+    $view->init_display();
+
+    $this->assertTrue($this->display['oage']->handler->options['defaults']['filter_groups']);
+    $this->assertEqual($this->display['default']->handler->options['filter_groups'], $this->display['page']->handler->options['filter_groups'], 'Take sure the default options are used for the filter_groups');
+  }
+
+  /**
+   * Returns a test view for testFilterGroupUpdating.
+   *
+   * @see testFilterGroupUpdating
+   *
+   * @return view
+   */
+  function viewFilterGroupsUpdating() {
+    $view = new view();
+    $view->name = 'test_filter_groups';
+    $view->description = '';
+    $view->tag = 'default';
+    $view->base_table = 'node';
+    $view->human_name = 'test_filter_groups';
+    $view->core = 7;
+    $view->api_version = '3.0';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+    /* Display: Master */
+    $handler = $view->new_display('default', 'Master', 'default');
+    $handler->display->display_options['title'] = 'test_filter_groups';
+    $handler->display->display_options['access']['type'] = 'perm';
+    $handler->display->display_options['cache']['type'] = 'none';
+    $handler->display->display_options['query']['type'] = 'views_query';
+    $handler->display->display_options['exposed_form']['type'] = 'basic';
+    $handler->display->display_options['pager']['type'] = 'full';
+    $handler->display->display_options['pager']['options']['items_per_page'] = '10';
+    $handler->display->display_options['style_plugin'] = 'default';
+    $handler->display->display_options['row_plugin'] = 'node';
+    /* Field: Content: Title */
+    $handler->display->display_options['fields']['title']['id'] = 'title';
+    $handler->display->display_options['fields']['title']['table'] = 'node';
+    $handler->display->display_options['fields']['title']['field'] = 'title';
+    $handler->display->display_options['fields']['title']['label'] = '';
+    $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+    $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+    /* Sort criterion: Content: Post date */
+    $handler->display->display_options['sorts']['created']['id'] = 'created';
+    $handler->display->display_options['sorts']['created']['table'] = 'node';
+    $handler->display->display_options['sorts']['created']['field'] = 'created';
+    $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+    $handler->display->display_options['filter_groups']['groups'] = array(
+      1 => 'AND',
+      2 => 'AND',
+    );
+    /* Filter criterion: Content: Published */
+    $handler->display->display_options['filters']['status']['id'] = 'status';
+    $handler->display->display_options['filters']['status']['table'] = 'node';
+    $handler->display->display_options['filters']['status']['field'] = 'status';
+    $handler->display->display_options['filters']['status']['value'] = 1;
+    $handler->display->display_options['filters']['status']['group'] = 1;
+    $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+    /* Filter criterion: Content: Nid */
+    $handler->display->display_options['filters']['nid']['id'] = 'nid';
+    $handler->display->display_options['filters']['nid']['table'] = 'node';
+    $handler->display->display_options['filters']['nid']['field'] = 'nid';
+    $handler->display->display_options['filters']['nid']['value']['value'] = '1';
+    $handler->display->display_options['filters']['nid']['group'] = 2;
+    /* Filter criterion: Content: Nid */
+    $handler->display->display_options['filters']['nid_1']['id'] = 'nid_1';
+    $handler->display->display_options['filters']['nid_1']['table'] = 'node';
+    $handler->display->display_options['filters']['nid_1']['field'] = 'nid';
+    $handler->display->display_options['filters']['nid_1']['value']['value'] = '2';
+    $handler->display->display_options['filters']['nid_1']['group'] = 2;
+
+    /* Display: Page */
+    $handler = $view->new_display('page', 'Page', 'page');
+    $handler->display->display_options['filter_groups']['operator'] = 'OR';
+    $handler->display->display_options['filter_groups']['groups'] = array(
+      1 => 'OR',
+      2 => 'OR',
+    );
+    $handler->display->display_options['defaults']['filters'] = FALSE;
+    /* Filter criterion: Content: Published */
+    $handler->display->display_options['filters']['status']['id'] = 'status';
+    $handler->display->display_options['filters']['status']['table'] = 'node';
+    $handler->display->display_options['filters']['status']['field'] = 'status';
+    $handler->display->display_options['filters']['status']['value'] = 1;
+    $handler->display->display_options['filters']['status']['group'] = 1;
+    $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+    /* Filter criterion: Content: Nid */
+    $handler->display->display_options['filters']['nid']['id'] = 'nid';
+    $handler->display->display_options['filters']['nid']['table'] = 'node';
+    $handler->display->display_options['filters']['nid']['field'] = 'nid';
+    $handler->display->display_options['filters']['nid']['value']['value'] = '1';
+    $handler->display->display_options['filters']['nid']['group'] = 2;
+    /* Filter criterion: Content: Nid */
+    $handler->display->display_options['filters']['nid_1']['id'] = 'nid_1';
+    $handler->display->display_options['filters']['nid_1']['table'] = 'node';
+    $handler->display->display_options['filters']['nid_1']['field'] = 'nid';
+    $handler->display->display_options['filters']['nid_1']['value']['value'] = '2';
+    $handler->display->display_options['filters']['nid_1']['group'] = 2;
+    $handler->display->display_options['path'] = 'test-filter-groups';
+
+    return $view;
+  }
+}
diff --git a/views.info b/views.info
index 1526813..4a2c66d 100644
--- a/views.info
+++ b/views.info
@@ -271,6 +271,7 @@ files[] = tests/handlers/views_handler_sort_date.test
 files[] = tests/handlers/views_handler_sort.test
 files[] = tests/test_plugins/views_test_plugin_access_test_dynamic.inc
 files[] = tests/test_plugins/views_test_plugin_access_test_static.inc
+files[] = tests/plugins/views_plugin_display.test
 files[] = tests/styles/views_plugin_style_jump_menu.test
 files[] = tests/styles/views_plugin_style.test
 files[] = tests/styles/views_plugin_style_unformatted.test