diff --git a/core/modules/views/tests/src/Routing/ViewPageControllerTest.php b/core/modules/views/tests/src/Routing/ViewPageControllerTest.php
index 27eea4e..1a64bce 100644
--- a/core/modules/views/tests/src/Routing/ViewPageControllerTest.php
+++ b/core/modules/views/tests/src/Routing/ViewPageControllerTest.php
@@ -72,6 +72,15 @@ public function testPageController() {
       ->with('default');
     $executable->expects($this->once())
       ->method('initHandlers');
+
+    $views_display = $this->getMockBuilder('Drupal\views\Plugin\views\display\DisplayPluginBase')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $views_display->expects($this->any())
+      ->method('getDefinition')
+      ->willReturn([]);
+    $executable->display_handler = $views_display;
+
     $build = [
       '#type' => 'view',
       '#name' => 'test_page_view',
@@ -79,7 +88,7 @@ public function testPageController() {
     ];
     $executable->expects($this->once())
       ->method('buildRenderForDisplay')
-      ->with('default', array())
+      ->with('default', [])
       ->will($this->returnValue($build));
 
     $this->executableFactory->expects($this->any())
@@ -117,6 +126,14 @@ public function testHandleWithArgumentsWithoutOverridden() {
     $executable->expects($this->once())
       ->method('initHandlers');
 
+    $views_display = $this->getMockBuilder('Drupal\views\Plugin\views\display\DisplayPluginBase')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $views_display->expects($this->any())
+      ->method('getDefinition')
+      ->willReturn([]);
+    $executable->display_handler = $views_display;
+
     // Manually setup a argument handler.
     $argument = $this->getMockBuilder('Drupal\views\Plugin\views\argument\ArgumentPluginBase')
       ->disableOriginalConstructor()
@@ -164,6 +181,14 @@ public function testHandleWithArgumentsOnOveriddenRoute() {
     $executable->expects($this->once())
       ->method('initHandlers');
 
+    $views_display = $this->getMockBuilder('Drupal\views\Plugin\views\display\DisplayPluginBase')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $views_display->expects($this->any())
+      ->method('getDefinition')
+      ->willReturn([]);
+    $executable->display_handler = $views_display;
+
     // Manually setup a argument handler.
     $argument = $this->getMockBuilder('Drupal\views\Plugin\views\argument\ArgumentPluginBase')
       ->disableOriginalConstructor()
@@ -214,6 +239,14 @@ public function testHandleWithArgumentsOnOveriddenRouteWithUpcasting() {
     $executable->expects($this->once())
       ->method('initHandlers');
 
+    $views_display = $this->getMockBuilder('Drupal\views\Plugin\views\display\DisplayPluginBase')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $views_display->expects($this->any())
+      ->method('getDefinition')
+      ->willReturn([]);
+    $executable->display_handler = $views_display;
+
     // Manually setup a argument handler.
     $argument = $this->getMockBuilder('Drupal\views\Plugin\views\argument\ArgumentPluginBase')
       ->disableOriginalConstructor()