diff --git a/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php b/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
index 5f47cb3..e9430b0 100644
--- a/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
+++ b/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
@@ -62,7 +62,7 @@ function testContentRouting() {
     $path_alias_storage->save('conneg/html?_format=json', 'alias.json');
 
     $tests = [
-      // ['path', 'accept', 'content-type', 'vary'],
+      // ['path', 'accept', 'content-type'],
 
       // Extension is part of the route path. Constant Content-type.
       ['conneg/simple.json', '', 'application/json'],
@@ -85,27 +85,16 @@ function testContentRouting() {
       ['conneg/html?_format=xml', 'application/xml', 'application/xml'],
 
       // Path with a variable. Variable contains a period.
-      ['conneg/plugin/plugin.id', '', 'text/html', FALSE],
-      ['conneg/plugin/plugin.id', '*/*', 'text/html', FALSE],
-      ['conneg/plugin/plugin.id', 'text/xml', 'text/html', FALSE],
-      ['conneg/plugin/plugin.id', 'text/html', 'text/html', FALSE],
+      ['conneg/plugin/plugin.id', '', 'text/html'],
+      ['conneg/plugin/plugin.id', '*/*', 'text/html'],
+      ['conneg/plugin/plugin.id', 'text/xml', 'text/html'],
+      ['conneg/plugin/plugin.id', 'text/html', 'text/html'],
 
       // Alias with extension pointing to no extension/constant content-type.
-      ['alias.html', '', 'text/html', FALSE],
-      ['alias.html', '*/*', 'text/html', FALSE],
-      ['alias.html', 'text/xml', 'text/html', FALSE],
-      ['alias.html', 'text/html', 'text/html', FALSE],
-
-      // Alias with extension pointing to dynamic extension/linked content-type.
-      // @todo Path aliases with query strings aren't supported at the moment.
-      // ['alias.json', '', 'application/json', FALSE],
-      // ['alias.json', '*/*', 'application/json', FALSE],
-      // ['alias.json', 'application/xml', 'application/json', FALSE],
-      // ['alias.json', 'application/json', 'application/json', FALSE],
-
-      // Alias with extension pointing to dynamic extension/linked content-type.
-      // @todo how to test aliasing? Can we just assume aliasing does its thing?
-      // this might not even work :(
+      ['alias.html', '', 'text/html'],
+      ['alias.html', '*/*', 'text/html'],
+      ['alias.html', 'text/xml', 'text/html'],
+      ['alias.html', 'text/html', 'text/html'],
     ];
 
     foreach ($tests as $test) {