diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php
index fbce2fb..801062b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php
@@ -53,16 +53,17 @@ function testTwigVariableDataTypes() {
   public function testTwigUrlGenerator() {
     $this->drupalGet('twig-theme-test/url-generator');
     // Find the absolute URL of the current site.
-    $absolute = $this->container->get('url_generator')->generate('<front>', array(), TRUE);
+    $url_generator = $this->container->get('url_generator');
+    $link_generator = $this->container->get('link_generator');
     $expected = array(
-      'url: /user/register',
-      'url: ' . $absolute . 'user/register',
-      'get_url: /user/register',
-      'get_url: ' . $absolute . 'user/register',
-      'get_url: ' . $absolute . 'user/register#bottom',
-      'get_link: <a href="/user/register">Register</a>',
-      'get_link: <a href="' . $absolute . 'user/register">Register</a>',
-      'get_link: <a href="' . $absolute . 'user/register#bottom">Register</a>',
+      'url: ' . $url_generator->generateFromPath('user/register'),
+      'url: ' . $url_generator->generateFromPath('user/register', array('absolute' => TRUE)),
+      'get_url: ' . $url_generator->generateFromRoute('user_register'),
+      'get_url: ' . $url_generator->generateFromRoute('user_register', array(), array('absolute' => TRUE)),
+      'get_url: ' . $url_generator->generateFromRoute('user_register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')),
+      'get_link: ' . $link_generator->generate('Register', 'user_register'),
+      'get_link: ' . $link_generator->generate('Register', 'user_register', array(), array('absolute' => TRUE)),
+      'get_link: ' . $link_generator->generate('Register', 'user_register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')),
     );
     foreach ($expected as $string) {
       $this->assertRaw('<div>' . $string . '</div>');