diff --git a/core/lib/Drupal/Core/Link.php b/core/lib/Drupal/Core/Link.php
index 35dddee..58959e1 100644
--- a/core/lib/Drupal/Core/Link.php
+++ b/core/lib/Drupal/Core/Link.php
@@ -124,7 +124,7 @@ public function setUrl(Url $url) {
    * Generates the HTML for this Link object.
    */
   public function toString() {
-    return $this->getLinkGenerator()->generateFromLink($this);
+    return $this->getLinkGenerator()->generateFromUrl($this->getText(), $this->getUrl());
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php
index 361a7ea..bb29ca8 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Link;
+use Drupal\Core\Url;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -82,16 +82,14 @@ public function testLink($entity_label, $link_text, $expected_text, $link_rel =
       $entity_type_id
     ]);
 
-    $expected_link = Link::createFromRoute(
-      $expected_text,
-      $route_name,
+    $expected_url = new Url($route_name,
       [$entity_type_id => $entity_id],
       ['entity_type' => $entity_type_id, 'entity' => $entity] + $link_options
-    )->setLinkGenerator($this->linkGenerator);
+    );
 
     $this->linkGenerator->expects($this->once())
-      ->method('generateFromLink')
-      ->with($this->equalTo($expected_link))
+      ->method('generateFromUrl')
+      ->with($expected_text, $expected_url)
       ->willReturn($expected);
 
     $this->assertSame($expected, $entity->link($link_text, $link_rel, $link_options));