diff --git a/.htaccess b/.htaccess
index 37b7783..b26c63b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,7 +32,7 @@ AddEncoding gzip svgz
 
 # PHP 5, Apache 1 and 2.
 <IfModule mod_php5.c>
-  php_value assert.active                   1
+  php_value assert.active                   0
   php_flag session.auto_start               off
   php_value mbstring.http_input             pass
   php_value mbstring.http_output            pass
diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/QueryArgsCacheContextTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/QueryArgsCacheContextTest.php
index 8e76480..059aa6f 100644
--- a/core/tests/Drupal/Tests/Core/Cache/Context/QueryArgsCacheContextTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/Context/QueryArgsCacheContextTest.php
@@ -43,22 +43,22 @@ public function testGetContext($uri, array $context_tokens, array $expected_keys
    */
   public function providerTestGetContext() {
     return [
-      ['/foo', ['url.query_args'], ['']],
-      ['/foo?', ['url.query_args'], ['']],
-      ['/foo?a', ['url.query_args'], ['a']],
-      ['/foo?a=', ['url.query_args'], ['a=']],
-      ['/foo?a=1', ['url.query_args'], ['a=1']],
-      ['/foo?b[value]=1&a=2', ['url.query_args'], ['a=2&b%5Bvalue%5D=1']],
-      ['/foo', ['url.query_args:a'], ['']],
-      ['/foo?', ['url.query_args:a'], ['']],
-      ['/foo?a', ['url.query_args:a'], ['a=']],
-      ['/foo?a=', ['url.query_args:a'], ['a=']],
-      ['/foo?a=1', ['url.query_args:a'], ['a=1']],
-      ['/foo?a=1', ['url.query_args:b'], ['']],
-      ['/foo?b[value]=1&a=2', ['url.query_args:a'], ['a=2']],
-      ['/foo?b[value]=1&a=2', ['url.query_args:b'], ['b%5Bvalue%5D=1']],
-      ['/foo?b[value]=1&a=2', ['url.query_args:a', 'url.query_args:b'], ['a=2', 'b%5Bvalue%5D=1']],
-      ['/foo?b[value]=1&a=2', ['url.query_args:b[value]'], ['b%5Bvalue%5D=1']],
+      ['/foo', ['url.query_args'], ['[url.query_args]=']],
+      ['/foo?', ['url.query_args'], ['[url.query_args]=']],
+      ['/foo?a', ['url.query_args'], ['[url.query_args]=a']],
+      ['/foo?a=', ['url.query_args'], ['[url.query_args]=a=']],
+      ['/foo?a=1', ['url.query_args'], ['[url.query_args]=a=1']],
+      ['/foo?b[value]=1&a=2', ['url.query_args'], ['[url.query_args]=a=2&b%5Bvalue%5D=1']],
+      ['/foo', ['url.query_args:a'], ['[url.query_args:a]=']],
+      ['/foo?', ['url.query_args:a'], ['[url.query_args:a]=']],
+      ['/foo?a', ['url.query_args:a'], ['[url.query_args:a]=a=']],
+      ['/foo?a=', ['url.query_args:a'], ['[url.query_args:a]=a=']],
+      ['/foo?a=1', ['url.query_args:a'], ['[url.query_args:a]=a=1']],
+      ['/foo?a=1', ['url.query_args:b'], ['[url.query_args:b]=']],
+      ['/foo?b[value]=1&a=2', ['url.query_args:a'], ['[url.query_args:a]=a=2']],
+      ['/foo?b[value]=1&a=2', ['url.query_args:b'], ['[url.query_args:b]=b%5Bvalue%5D=1']],
+      ['/foo?b[value]=1&a=2', ['url.query_args:a', 'url.query_args:b'], ['[url.query_args:a]=a=2', '[url.query_args:b]=b%5Bvalue%5D=1']],
+      ['/foo?b[value]=1&a=2', ['url.query_args:b[value]'], ['[url.query_args:b[value]]=b%5Bvalue%5D=1']],
     ];
   }
 }