diff -u b/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php b/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
--- b/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
+++ b/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
@@ -41,8 +41,8 @@
     $middleware = new ReverseProxyMiddleware($this->mockHttpKernel, $settings);
     // Mock a request object.
     $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(
-       'setTrustedHeaderName',
-       'setTrustedProxies'
+      'setTrustedHeaderName',
+      'setTrustedProxies'
     ));
     // setTrustedHeaderName() should never fire.
     $request->expects($this->never())
@@ -57,13 +57,13 @@
    * @dataProvider reverseProxyEnabledProvider
    */
   public function testReverseProxyEnabled($provided_settings) {
-      // Enable reverse proxy and add test values.
-      $settings = new Settings(array('reverse_proxy' => 1) + $provided_settings);
-      $this->trustedHeadersAreSet($settings);
+    // Enable reverse proxy and add test values.
+    $settings = new Settings(array('reverse_proxy' => 1) + $provided_settings);
+    $this->trustedHeadersAreSet($settings);
   }
 
   /**
-    * Tests the ability of the http kernel to recognize that it is behind a
+   * Tests the ability of the http kernel to recognize that it is behind a
    * crypto offloader.
    */
   public function testCryptoOffload() {
@@ -76,10 +76,8 @@
     $request->server->set('REMOTE_ADDR', '127.0.0.2');
     $request->headers->set('X_FORWARDED_PROTO', 'https');
 
-    $subscriber = new ReverseProxySubscriber($settings);
-
-    $event = $this->getMockedEvent($request);
-    $subscriber->onKernelRequestReverseProxyCheck($event);
+    $subscriber = new ReverseProxyMiddleware($this->mockHttpKernel, $settings);
+    $subscriber->handle($request);
 
     $this->assertTrue($request->isSecure());
   }
@@ -104,10 +102,8 @@
     $GLOBALS['base_url'] = 'http://test.base.url.and.path.rewrite.test';
     $GLOBALS['base_root'] = 'http://test.base.url.and.path.rewrite.test';
 
-    $subscriber = new ReverseProxySubscriber($settings);
-
-    $event = $this->getMockedEvent($request);
-    $subscriber->onKernelRequestReverseProxyCheck($event);
+    $subscriber = new ReverseProxyMiddleware($this->mockHttpKernel, $settings);
+    $subscriber->handle($request);
 
     $this->assertTrue($request->isSecure());
     $this->assertEquals('https://test.base.url.and.path.rewrite.test', $GLOBALS['base_url']);
@@ -124,14 +120,14 @@
       array(
         array(
           'reverse_proxy_header' => 'HTTP_X_FORWARDED_FOR',
-          'reverse_proxy_proto_header' => 'HTTP_X_FORWARDED_PROTO',  
+          'reverse_proxy_proto_header' => 'HTTP_X_FORWARDED_PROTO',
           'reverse_proxy_addresses' => array(),
         ),
       ),
       array(
         array(
           'reverse_proxy_header' => 'X_FORWARDED_HOST',
-          'reverse_proxy_proto_header' => 'X_FORWARDED_PROTO',  
+          'reverse_proxy_proto_header' => 'X_FORWARDED_PROTO',
           'reverse_proxy_addresses' => array('127.0.0.2', '127.0.0.3'),
         ),
       ),
diff -u b/sites/default/default.settings.php b/sites/default/default.settings.php
--- b/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -362,7 +362,7 @@
  */
 # $settings['reverse_proxy_proto_change'] = TRUE;
 
-/**  
+/**
  * Page caching:
  *
  * By default, Drupal sends a "Vary: Cookie" HTTP header for anonymous page