diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php
index c7d0345..65a2d90 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php
@@ -47,8 +47,7 @@ public function testTable() {
 
     // Test the buildSort() method.
     $request = new Request();
-    $this->container->enterScope('request');
-    $this->container->set('request', $request);
+    $view->setRequest($request);
 
     $style_plugin->options['override'] = FALSE;
 
@@ -70,8 +69,7 @@ public function testTable() {
 
     // Test the buildSortPost() method.
     $request = new Request();
-    $this->container->enterScope('request');
-    $this->container->set('request', $request);
+    $view->setRequest($request);
 
     // Setup no valid default.
     $this->prepareView($view);
@@ -130,7 +128,6 @@ public function testTable() {
 
     // Excluded field to make sure its wrapping td doesn't show.
     $this->prepareView($view);
-    $style_plugin = $view->style_plugin;
     $view->field['name']->options['exclude'] = TRUE;
     $output = $view->preview();
     $output = drupal_render($output);
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
index c0228ba..74787f1 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
@@ -366,8 +366,7 @@ protected function assertViewDestroy($view) {
     $reflection = new \ReflectionClass($view);
     $defaults = $reflection->getDefaultProperties();
     // The storage and user should remain.
-    unset($defaults['storage']);
-    unset($defaults['user']);
+    unset($defaults['storage'], $defaults['user'], $defaults['request']);
 
     foreach ($defaults as $property => $default) {
       $this->assertIdentical($this->getProtectedProperty($view, $property), $default);