diff --git a/core/modules/rest/tests/src/Unit/CollectRoutesTest.php b/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
index e171e04..3ef46d2 100644
--- a/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
+++ b/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
@@ -86,6 +86,12 @@ protected function setUp() {
 
     $container->setParameter('serializer.format_providers', ['json']);
 
+    $entity_manager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
+    $container->set('entity.manager', $entity_manager);
+    $entity_manager->expects($this->any())
+      ->method('getStorage')
+      ->will($this->returnValue($this->getMock('\Drupal\Core\Entity\EntityStorageInterface')));
+
     \Drupal::setContainer($container);
 
     $this->restExport = RestExport::create($container, [], "test_routes", []);
diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php
index 116e85c..7f4a3b2 100644
--- a/core/modules/views/src/Plugin/views/display/Page.php
+++ b/core/modules/views/src/Plugin/views/display/Page.php
@@ -4,7 +4,6 @@
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;